Merge branch 'R74nCom:main' into main

This commit is contained in:
JustAGenericUsername 2024-08-06 15:28:38 -04:00 committed by GitHub
commit eb9f4dbb4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 157 additions and 2 deletions

View File

@ -161,7 +161,6 @@
<tr><td>moretools.js</td><td>Adds more temperature-modifying tools (±10/tick, ±50/tick, and absolute zero tools)</td><td>Sightnado</td></tr>
<tr><td>move_tools.js</td><td>Adds tools that move pixels</td><td>Alice</td></tr>
<tr><td>noconfirm.js</td><td>Removes all confirmation pop ups</td><td>mollthecoder</td></tr>
<tr><td>nopixellimit.js</td><td>Removes the pixel limit</td><td>Jayd</td></tr>
<tr><td>page_color.js</td><td>Allows changing the background color outside of the canvas with the “pageColor” query parameter</td><td>Alice</td></tr>
<tr><td>pixelResizeTool.js</td><td>Adds a button to change pixel scale</td><td>feeshmaster</td></tr>
<tr><td>prompt.js</td><td>Adds a primitive command console</td><td>Alice</td></tr>
@ -334,13 +333,14 @@
<tr><td>heatglow.js</td><td>Red glowing effect for hot metals</td><td>nousernamefound</td></tr>
<tr><td>invisible_dye.js</td><td>Adds elements like Dye and Spray Paint that take the color of the background</td><td>Alice</td></tr>
<tr><td>invisible_wall.js</td><td>Adds an element like Wall that takes the color of the background</td><td>Alice</td></tr>
<tr><td>lightmap.js</td><td>Makes light sources glow</td><td>RedBirdly</td></tr>
<tr><td>moreViews.js</td><td>Many new rendering modes</td><td>ggod</td></tr>
<tr><td>onecolor.js</td><td>Makes all placed pixels single-colored</td><td>nousernamefound</td></tr>
<tr><td>paint_event.js</td><td>Adds a random event that randomly paints a circle</td><td>Alice</td></tr>
<tr><td>rainbow_tests.js</td><td>Adds variants of the rainbow element with different maths</td><td>Alice</td></tr>
<tr><td>shader_by_jayd.js</td><td>Adds a glow around light elements</td><td>Jayd</td></tr>
<tr><td>Shroomboxels.js</td><td>A variant of acid_and_shapes.js that uses a different trigonometric function</td><td>Alice</td></tr>
<tr><td>singleColor.js</td><td>Makes all elements pick one color each time they're drawn</td><td>stefanblox</td></tr>
<tr><td>lightmap.js</td><td>Makes light sources glow</td><td>RedBirdly</td></tr>
<!----><tr><td class="modCat" colspan="3">Compilations</td></tr><!---->
<tr><td>a_mod_by_alice.js</td><td>A mod combining most of Alices mods, and some other things</td><td>Alice</td></tr>
@ -382,6 +382,7 @@
<tr class="deprecated"><td>humans.js</td><td>Adds humans. Now part of the base game</td><td><a href="https://R74n.com" class="R74nLink">R74n</a></td></tr>
<tr class="deprecated"><td>unhide.js</td><td>Unhides all elements except molten ones. (This functionality now exists as a vanilla setting)</td><td><a href="https://R74n.com" class="R74nLink">R74n</a></td></tr>
<tr class="deprecated"><td>wheel_fix.js</td><td>Attempts to fix the brush scaling too much with the mouse wheel for some people. Deprecated</td><td>Nubo318</td></tr>
<tr class="deprecated"><td>nopixellimit.js</td><td>Removes the pixel limit. (now a setting)</td><td>Jayd</td></tr>
</tbody>
</table>

154
mods/shader_by_jayd.js Normal file
View File

@ -0,0 +1,154 @@
elements.shader_test = {
color: "#FFFFFF",
category: "special",
renderer: function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,"#ffffff",x,y,1,0.25)
}
}
}
elements.fire.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.25)
}
}
elements.cold_fire.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.25)
}
}
elements.light.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 2);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.75)
}
}
elements.laser.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 2);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.75)
}
}
elements.plasma.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.5)
}
}
elements.electric.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 2);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.25)
}
}
elements.heat_ray.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.25)
}
}
elements.freeze_ray.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.25)
}
}
elements.flash.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.7)
}
}
elements.smoke.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 2);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.25)
}
}
elements.radiation.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 2);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
drawSquare(ctx,pixel.color,x,y,1,0.25)
}
}
elements.led_r.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
if (pixel.charge) {
drawSquare(ctx,pixel.color,x,y,1,0.5)
}
else {
drawSquare(ctx,pixel.color,pixel.x,pixel.y,1,1)
}
}
}
elements.led_g.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
if (pixel.charge) {
drawSquare(ctx,pixel.color,x,y,1,0.5)
}
else {
drawSquare(ctx,pixel.color,pixel.x,pixel.y,1,1)
}
}
}
elements.led_b.renderer = function(pixel,ctx) {
var circlec = circleCoords(pixel.x, pixel.y, 3);
for (var i = 0; i < circlec.length; i++){
var coord = circlec[i];
var x = coord.x;
var y = coord.y;
if (pixel.charge) {
drawSquare(ctx,pixel.color,x,y,1,0.5)
}
else {
drawSquare(ctx,pixel.color,pixel.x,pixel.y,1,1)
}
}
}