diff --git a/mod-list.html b/mod-list.html index 5f844ebe..d9a16647 100644 --- a/mod-list.html +++ b/mod-list.html @@ -196,9 +196,10 @@ stripe_paint.jsTool to paint with stripesAlice text.jsTools to write textRedBirdly texturepack.jsTools that let you create and share custom texture packsnousernamefound - the_ground.jsSeveral rock types, worldgen settings, and gemstonesAlice + the_ground_og.jsSeveral rock types and gemstonesAlice worldEdit.jsSelection and editing toolsRedBirdly worldgenlibrary.jsWorld generation libraryOrchid + zoom.jsButtons to zoom into and move the canvasmnem Science & Chemistry alcohol.jsMethanol, (iso-)propanol, and butanolAlice @@ -225,7 +226,7 @@ glenn_gases.jsMost gases from the Glenn's Gases mod into SandboxelsAlice grav_mudstones.jsVarious forms of mudstone with different gravitiesAlice halogen.jsThe missing halogensnousernamefound - hidden_ground.jsHides most rock variants from the_ground.js excluding the base rocks and wallsMelecie + hidden_ground.jsHides most rock variants from the_ground_og.js excluding the base rocks and wallsMelecie iocalfaeus_clones.jsIorefrius, Iolucius, and Ioradius gasAlice jaydstuff.jsVarious chemicals and compoundsJayd laetium.jsSeveral fictional elementsAlice @@ -245,10 +246,10 @@ radioactive.jsRadioactive elements on the periodic table [WIP]kaeud random_rocks.jsRandomly generates rocks on game loadAlice roseyiede.jsSeveral variants of a substance called roseyiedeAlice - solubility.jsAdds solubility and a simple-to-use format for other mods to use with itOrchid + solubility.jsSolubility and a simple-to-use format for other mods to use with itOrchid some_tf_liquids.jsVarious liquids from the Thermal Foundation Minecraft modAlice stickystuff.jsSlime, Honey, and others can stick to other elementsSuss - the_ground.jsSeveral rocks, worldgen types, and gemstonesAlice + the_ground_og.jsSeveral rock types and gemstonesAlice Machines & Technology circuitcore.jsExtension for logicgates.js that adds advanced circuits [More Info]RedBirdly @@ -256,7 +257,7 @@ colored_lightbulbs.jsLight bulb that can be paintedguzzo86, ggod combustion.jsComponents necessary for combustion enginesuptzik conveyance.jsConveyors, operated with and without electricityMelecie - coresbyp.jsAdds several cores to fuel your reactors and a reactor fluidsuspasha111 + coresbyp.jsSeveral cores to fuel your reactors and a reactor fluidsuspasha111 datawire.jsWire that transfers data and other operators and machines for itOrchid drill.jsDrills made out of several materialsSuss ExtraMachines.jsSensors, energy resources, materials, and moreMecoolnotcool @@ -364,13 +365,12 @@ primordial_birthpool.jsCross between Primordial Soup and Birthpool. Requires fey_and_more.jsAlice scp.jsCreatures and items from the SCP WikiNekonico spring.jsMany nature elements, like sakura trees, butterflies, beehives, and moreR74n - the_ground_og.jsSimplified and more stable version of the_ground.jsAlice - the_ground.jsSeveral rock types, worldgen settings, and gemstonesAlice + the_ground_og.jsSeveral rock types and gemstonesAlice toothpaste.jsTeeth and pasteAlice volcanic_expansion.jsObsidian, Pumice, and Andesite rocksJayd Fun & Games - 3pms_mod.jsAdds random stuff and tools3pm + 3pms_mod.jsRandom stuff and tools3pm 10kelements.jsCustomizable amount of randomly generated elementsnousernamefound all_around_fillers.jsDirectional Filler variantsidk73248 allliquids.jsMade all elements liquidsOrchid @@ -484,18 +484,19 @@ Broken or Deprecated a_mod_by_alice.jsCombination of most of Alice's mods, and some other thingsAlice - haseulite.jsLoona-related materials with various propertiesAlice adjustablepixelsize.jsSet the pixelSize with a URL parameterAlice advanced_colonies.jsDavlers, creatures with complex coloniesDaviStudios background_changer.jsPress 'B' to change canvas background to a URLR74n borders.jsBlack borders around pixels (Use bright background)R74n fast_lightmap.jsLight sources glow, but fasterRedBirdly + haseulite.jsLoona-related materials with various propertiesAlice humans.jsHumans. Now part of the base gameR74n invertscroll.jsInverts the scroll wheel for adjusting brush size (now a setting)SquareScreamYT mobile_shift.jsButton for shift on mobile (Now in the base game)SquareScreamYT nicer_flame.jsFire is visually pleasingRedBirdly nopixellimit.jsRemoves the pixel limit. (now a setting)Jayd pizzasstuff.jsNew animals, foods, and plants_ilikepizza_ + the_ground.jsSeveral rock types, worldgen settings, and gemstonesAlice unhide.jsUnhides all elements except molten ones. (This functionality now exists as a vanilla setting)R74n wheel_fix.jsAttempts to fix the brush scaling too much with the mouse wheel for some people. DeprecatedNubo318 diff --git a/mods/PRNGworldgenlib.js b/mods/PRNGworldgenlib.js index 0fcad410..48d5d0e8 100644 --- a/mods/PRNGworldgenlib.js +++ b/mods/PRNGworldgenlib.js @@ -1,4 +1,4 @@ -/*Version 1.2.0 Pseudorandom world generator*/ +/*Version 1.2.1 Pseudorandom world generator*/ function pseudorandom(key, num, max = 1){ return (Math.log(key)*(num*Math.log(1625.4986772154357))) % max; }; diff --git a/mods/hidden_ground.js b/mods/hidden_ground.js index 0eb59ac1..5922b252 100644 --- a/mods/hidden_ground.js +++ b/mods/hidden_ground.js @@ -2,7 +2,7 @@ // Author: Melecie runAfterLoad(function() { - if (enabledMods.includes("mods/the_ground.js")) { + if (enabledModNames.includes("mods/the_ground_og.js")) { let regexRocks = /(granite)|(rhyolite)|(pumice)|(obsidian)|(dacite)|(dacidian)|(andesite)|(diorite)|(scoria)|(andesidian)|(gabbro)|(basalt)|(basalidian)|(peridotite)|(komatiite)|(komatidian)/ let regexType = /(_gravel)|(_sand)|(_sandstone)|(_dust)|(_shard)|(hot_)/ let toHide = ["dry_permafrost", "hot_sand", "hot_dirt", "hot_rock", "hot_rock_wall", "hot_gravel", "hot_limestone", "hot_calcium_carbonate_dust", "sandy_water", "clay_water", "dry_clay_loam"] @@ -33,10 +33,10 @@ runAfterLoad(function() { //elements.sandstone.color = "#dbbe80"; } - else { - enabledMods.splice(enabledMods.indexOf("mods/hidden_ground.js"), 1); - localStorage.setItem("enabledMods", JSON.stringify(enabledMods)); - alert("Hidden Ground: This mod requires The Ground mod. Removing mod and reloading."); - window.location.reload(); - } + // else { + // enabledMods.splice(enabledMods.indexOf("mods/hidden_ground.js"), 1); + // localStorage.setItem("enabledMods", JSON.stringify(enabledMods)); + // alert("Hidden Ground: This mod requires The Ground mod. Removing mod and reloading."); + // window.location.reload(); + // } }) \ No newline at end of file diff --git a/mods/junction.js b/mods/junction.js new file mode 100644 index 00000000..35cf40a7 --- /dev/null +++ b/mods/junction.js @@ -0,0 +1,50 @@ +// Junction.js + +const connectedPairs = [ + [[-1, 0], [1, 0]], // Horizontal + [[0, -1], [0, 1]] // Vertical +]; + +let isRisingEdge = (current, prev) => current === 2 && prev !== 2; +let isFallingEdge = (current, prev) => current !== 2 && prev === 2; + +elements.junction = { + color: "#9db8b5", + category: "logic", + state: "solid", + behavior: behaviors.WALL, + tick: function (pixel) { + if (pixel.start === pixelTicks) + pixel.prevStateMap = {}; + + for (const pair of connectedPairs) { + let pixelA = pixelMap[pixel.x + pair[0][0]]?.[pixel.y + pair[0][1]]; + let pixelB = pixelMap[pixel.x + pair[1][0]]?.[pixel.y + pair[1][1]]; + + if (!pixelA) continue; + if (!pixelB) continue; + if (pixelA.element !== "logic_wire") continue; + if (pixelB.element !== "logic_wire") continue; + + let stateA = pixelA.lstate; + let stateB = pixelB.lstate; + let prevStateA = pixel.prevStateMap[[pixelA.x, pixelA.y]]; + let prevStateB = pixel.prevStateMap[[pixelB.x, pixelB.y]]; + + // console.log("A:", stateA, "->", prevStateA); + // console.log("B:", stateB, "->", prevStateB); + + // Set previous lstate to current lstate + pixel.prevStateMap[[pixelA.x, pixelA.y]] = pixelA.lstate; + pixel.prevStateMap[[pixelB.x, pixelB.y]] = pixelB.lstate; + + // Rising edge + if (isRisingEdge(stateA, prevStateA)) pixelB.lstate = 2; + if (isRisingEdge(stateB, prevStateB)) pixelA.lstate = 2; + + // Falling edge + if (isFallingEdge(stateA, prevStateA)) pixelB.lstate = -2; + if (isFallingEdge(stateB, prevStateB)) pixelA.lstate = -2; + } + } +};