Skip to content

Commit

Permalink
Merge branch 'R74nCom:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
NecroticPhantom authored Jan 27, 2025
2 parents a945b58 + 5914ea9 commit 2403a6c
Show file tree
Hide file tree
Showing 11 changed files with 1,080 additions and 372 deletions.
14 changes: 9 additions & 5 deletions lang/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"shock":"Šok",
"paint":"Malovat",
"sand":"Písek",
"water":"Voda",
"water":"Voda",
"salt_water":"Slaná_Voda",
"sugar_water":"Sladká_Voda",
"seltzer":"Minerální_Voda",
Expand Down Expand Up @@ -305,7 +305,7 @@
"crumb":"Drobek",
"baked_batter":"Dort",
"wheat":"Pšenice",
"candy":"Sladkosti",
"candy":"Sladkost",
"coffee_bean":"Kávové_Zrna",
"coffee_ground":"Mletá_Káva",
"nut":"Ořech",
Expand Down Expand Up @@ -444,7 +444,7 @@
"supernova":"Supernova",
"cook":"Vařit",
"incinerate":"Spálit",
"room_temp":"Teplota_Pokoje",
"room_temp":"Pokojová_Teplota",
"positron":"Pozitron",
"tnt":"TNT",
"c4":"C-4",
Expand Down Expand Up @@ -541,7 +541,11 @@
"tornado":"Tornádo",
"earthquake":"Zemětřesení",
"tsunami":"Tsunami",
"blaster":"Blaster",
"blaster":"Lazerová_Pistole",
"propane_ice":"Zrmzlý_Propan",
"molten_caustic_potash":"Rozteklý_Potaš"
"molten_caustic_potash":"Rozteklý_Potaš",
"spider": "Pavouk",
"web": "Pavučina",
"rice": "Rýže",
"midas_touch": "Midasův_Dotek"
}
4 changes: 2 additions & 2 deletions lang/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
"copper":"réz",
"gold":"arany",
"steel":"acél",
"galvanized_steel":"horganyzott_acél"
"galvanized_steel":"horganyzott_acél",
"nickel":"nikkel",
"zinc":"cink",
"silver":"ezüst",
Expand Down Expand Up @@ -548,7 +548,7 @@
"tsunami": "cunami",
"blaster": "plazmavető",
"propane_ice": "fagyott_propán",
"molten_caustic_potash": "olvadt_kálium-hidroxid"
"molten_caustic_potash": "olvadt_kálium-hidroxid",
"ectoplasm":"ektoplazma",
"soul":"lélek",
"tombstone":"sírkő",
Expand Down
2 changes: 1 addition & 1 deletion lang/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@
"prop":"реквизит",
"salt_ice":"солёный лёд",
"sugar_ice":"сладкий лёд",
"seltzer_ice":"селтизерный лёд",
"seltzer_ice":"минеральный лёд",
"dirty_ice":"грязный лёд",
"pool_ice":"лёд в бассейне",
"blood_ice":"кровяной лёд",
Expand Down
11 changes: 10 additions & 1 deletion mod-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ <h2>Sandboxels Mod List</h2>
<tr><td>velocity.js</td><td>Beta for explosion velocity, and later wind, which may come to the base game in the future</td><td><a href="https://R74n.com" class="R74nLink">R74n</a></td></tr>

<!----><tr><td class="modCat" colspan="3">Tools & Settings</td></tr><!---->
<!-- <tr><td>adjustablepixelsize.js</td><td>Allows you to set the pixelSize with a URL parameter</td><td>Alice</td></tr> -->
<!--<tr><td>adjustablepixelsize.js</td><td>Allows you to set the pixelSize with a URL parameter</td><td>Alice</td></tr>-->
<tr><td>betaworldgen.js</td><td>adds a more advanced world generation to the game</td><td>Adora</td></tr>
<tr><td>betterModManager.js</td><td>Improvements to the Mod Manager</td><td>ggod</td></tr>
<tr><td>betterSettings.js</td><td>Adds additional settings and functionality</td><td>ggod</td></tr>
Expand Down Expand Up @@ -174,6 +174,7 @@ <h2>Sandboxels Mod List</h2>
<tr><td>selective_paint.js</td><td>Adds a tool to paint only selected elements</td><td>SquareScreamYT</td></tr>
<tr><td>stripe_paint.js</td><td>Adds a tool to paint with stripes</td><td>Alice</td></tr>
<tr><td>texturepack.js</td><td>Adds tools that let you create and share custom texture packs</td><td>nousernamefound</td></tr>
<tr><td>text.js</td><td>Adds tools to write text</td><td>RedBirdly</td></tr>
<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">Science & Chemistry</td></tr><!---->
Expand Down Expand Up @@ -230,6 +231,7 @@ <h2>Sandboxels Mod List</h2>
<tr><td>flipflop.js</td><td>Toggleable switches; <a href="https://github.com/R74nCom/sandboxels/pull/134">Explanation</a></td><td>Flix</td></tr>
<tr><td>fueled_generators.js</td><td>Fuel powered generators.</td></tr>
<tr><td>gameOfLife.js</td><td>Conway's Game of Life on a screen</td><td>ggod</td></tr>
<tr><td>heatshield.js</td><td>adds heatshields, makes plasma cooler</td></td><td>Taterbob</td></tr>
<tr><td>logicgates.js</td><td>Adds predictable electricity and logic gates</td><td>nousernamefound</td></tr>
<tr><td>note_block.js</td><td>Adds musical Note Blocks</td><td>Alice</td></tr>
<tr><td>nousersthings.js</td><td>Destroyable machines, pipe variants, filters, and more</td><td>nousernamefound</td></tr>
Expand All @@ -244,6 +246,7 @@ <h2>Sandboxels Mod List</h2>
<tr><td>video.js</td><td>Adds a video player</td><td>ggod</td></tr>
<tr><td>waterspout.js</td><td>Adds back the old Water Spout</td><td>mollthecoder</td></tr>
<tr><td>WhisperingTheory.js</td><td>Adds many more variants of heater and cooler</td><td>kaeud</td></tr>
<tr><td>wifi_draw.js</td><td>Draws connections between WiFi in wifi.js and logicgates.js</td><td>RedBirdly</td></tr>

<!----><tr><td class="modCat" colspan="3">Weapons</td></tr><!---->
<tr><td>aircrafts.js</td><td>Adds aircraft and aircraft part pixels</td><td>Jayd</td></tr>
Expand Down Expand Up @@ -284,6 +287,7 @@ <h2>Sandboxels Mod List</h2>
<tr><td>biology.js</td><td>Adds various elements and functions that let you build your own organism.</td><td>Nekonico</td></tr>
<tr><td>cat.js</td><td>Adds cats and cat food</td><td>SquareScreamYT</td></tr>
<tr><td>cells.js</td><td>Adds several experimental edits of the Cell element</td><td>Alice</td></tr>
<tr><td>children.js</td><td>Adds pesky little gremlins</td><td>Taterbob</td></tr>
<tr><td>colonies.js</td><td>Adds rockets that contain settlers to terraform a planet.</td><td>Nekonico</td></tr>
<tr><td>crimson.js</td><td>Adds elements relating to the Crimson from Terraria</td><td>Alice</td></tr>
<tr><td>dogs.js</td><td>Adds a simple dog and dog food</td><td>hedera-ivy</td></tr>
Expand Down Expand Up @@ -322,6 +326,7 @@ <h2>Sandboxels Mod List</h2>
<tr><td>all_around_fillers.js</td><td>Adds directional Filler variants</td><td>idk73248</td></tr>
<tr><td>allliquids.js</td><td>Made all elements liquids</td><td>Adora</td></tr>
<tr><td>amogus.js</td><td>Adds a small amogus structure</td><td>Alice</td></tr>
<tr><td>bfdi.js</td><td>Adds several references to bfdi</td><td>Taterbob</td></tr>
<tr><td>citybuilding.js</td><td>Adds seeds that create miniature buildings and other city-related items</td><td>SquareScreamYT</td></tr>
<tr><td>collab_mod.js</td><td>Created by multiple people, adds random things</td><td>mrapple, ilikepizza, stefanblox</td></tr>
<tr><td>doom.js</td><td>As seen on TikTok - Select the Doom element to start, WASD</td><td>ggod</td></tr>
Expand Down Expand Up @@ -354,12 +359,16 @@ <h2>Sandboxels Mod List</h2>
<!----><tr><td class="modCat" colspan="3">Visual Effects</td></tr><!---->
<tr><td>acid_and_shapes.js</td><td>Weird visual effects. Enable in Settings</td><td>Alice</td></tr>
<tr><td>customBackground.js</td><td>Set your background to an image link</td><td>Jayd</td></tr>
<tr><td>fast_lightmap.js</td><td>Makes light sources glow, but the fast version</td><td>RedBirdly</td></tr>
<tr><td>fractals.js</td><td>Adds an element and tools to render fractals in game</td><td>nousernamefound</td></tr>
<tr><td>hexagon_test.js</td><td>Makes pixels look like hexagons</td><td>RedBirdly</td></tr>
<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>nicer_flame.js</td><td>Makes fire visually pleasing</td><td>RedBirdly</td></tr>
<tr><td>occlusion.js</td><td>Adds realistic shadows (similar to Terraria's lighting)</td><td>RedBirdly</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>
Expand Down
145 changes: 145 additions & 0 deletions mods/bfdi.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
elements.abcdefghijklmon = {
color: "#c86b8f",
name: "myblueberryseed",
behavior: behaviors.POWDER,
reactions: {
"porcelain": { elem1: "grower", elem2: "porcelain"},
},
state: "solid",
category: "bfdi",
};
elements.grower = {
color: "#00ff00",
name: "blueberry_plant",
behavior: [
"XX|CL AND CH:shower%10|XX",
"CR:blueberry%1|XX|CR:blueberry%1",
"XX|XX|XX"
],
category: "bfdi",
};
elements.blueberry = {
color: "#5500aa",
behavior: [
"XX|XX|XX",
"XX|EX:20%1|XX",
"XX|XX|XX"
],
category: "bfdi",
};
elements.shower = {
color: "#00aa00",
name: "blueberry_plant",
category: "bfdi"
};
elements.steel.breakInto = "fork"
;
elements.fork = {
color: "#999999",
ignore: "abcd",
behavior: [
"XX|XX|XX",
"XX|XX|XX",
"M2|DL AND M1|M2"
],
state: "solid",
category: "bfdi",
};
elements.abcd = {
state: "gas",
name: "forkrepellent",
category: "bfdi",
stain: 0,
alpha: 0.4,
behavior: [
"XX|M1 AND ST|XX",
"M1 AND ST|XX|M1 AND ST",
"XX|M1 AND ST|XX"
],
};
elements.cheesecake = {
state: "solid",
behavior: behaviors.POWDER,
color: "#ccbb77",
category: "bfdi",
reactions: {
"glass_shard": { elem1: "shardcake", elem2: null }
},
};
elements.baked_batter.reactions = {}
elements.baked_batter.reactions.cheese_powder = { elem1: "cheesecake", elem2: null };
elements.shardcake = {
state: "solid",
name: "cheesecake_with_shards",
behavior: [
"XX|XX|XX",
"XX|XX|XX",
"XX|DL%5 AND M1|XX"
],
color: Array ("#ccbb77","#5e807d"),
category: "bfdi",
};
elements.rocky = {
color: "#777777",
behavior: [
"XX|CR:barf|XX",
"CR:barf|XX|CR:barf",
"XX|CR:barf|XX"
],
category: "bfdi",
reactions: {
"lava_barf": { elem1: null, elem2: "zombie_rocky" }
},
};
elements.barf = {
color: "#008800",
category: "bfdi",
ignore: Array("rocky", "zombie_rocky","cured_rocky"),
state: "liquid",
behavior: [
"XX|XX|XX",
"M2|XX|M2",
"M2|DL%30 AND M1|M2"
],
tempHigh: 800,
stateHigh: "lava_barf",
reactions: {
"lava": { elem1: "lava_barf", elem2: null }
},
};
elements.lava_barf = {
color: "#ffaa00",
glow: 1,
state: "liquid",
ignore: Array("zombie_rocky","rocky","cured_rocky"),
behavior: [
"XX|CH:rocky>zombie_rocky AND CH:barf>lava_barf%5|XX",
"M2 AND CH:rocky>zombie_rocky AND CH:barf>lava_barf%5|XX|M2 AND CH:rocky>zombie_rocky AND CH:barf>lavabarf%5",
"XX|CH:rocky>zombie_rocky AND CH:barf>lava_barf%5 AND M1|XX"
],
category: "bfb",
};
elements.zombie_rocky = {
color: "#005500",
category: "bfdi",
behavior: [
"XX|CH:rocky>zombie_rocky AND CR:lava_barf|XX",
"CH:rocky>zombie_rocky AND CR:lava_barf|XX|CH:rocky>zombie_rocky AND CR:lava_barf",
"XX|CH:rocky>zombie_rocky AND CR:lava_barf|XX"
],
reactions: {
"water": { elem1: null, elem2: "cured_rocky" }
},
};
elements.cured_rocky = {
color: "#777777",
category: "bfdi",
behavior: [
"XX|CR:barf AND CH:zombie_rocky>cured_rocky|XX",
"CR:barf AND CH:zombie_rocky>cured_rocky|XX|CR:barf AND CH:zombie_rocky>cured_rocky",
"XX|CR:barf AND CH:zombie_rocky>cured_rocky|XX"
],
reactions: {
"zombie_rocky": { elem1: "cured_rocky", elem2: "cured_rocky" }
},
};
Loading

0 comments on commit 2403a6c

Please sign in to comment.