Merge branch 'R74nCom:main' into main

This commit is contained in:
JustAGenericUsername 2024-03-17 19:13:27 +00:00 committed by GitHub
commit 956f163243
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 843 additions and 249 deletions

View File

@ -109,7 +109,133 @@
<p>The original <a href="https://sandboxels.r74n.com/changelog.txt">plain text version</a> of this is still maintained.</p>
</div>
<h2 id="1.9.4">[Version 1.9.4 - March 17, 2024 - Natural Disasters]</h2>
<ul>
<li>+ Tornado</li>
<li>+ Earthquake</li>
<li>+ Tsunami</li>
<li>+ Blaster</li>
<li>+ Sandstorm (Hidden)</li>
<li>[Changes]</li>
<li>+ Scrolling resizes in correct direction on Windows</li>
<li>+ Invert Scroll setting</li>
<li>~ Humans no longer trample Grass</li>
<li>~ Milk no longer turns to Yogurt when heated</li>
<li>+ Milk turns to Yogurt in Primordial Soup</li>
<li>+ Cells can ferment Milk into Yogurt</li>
<li>+ Cells boil and freeze into some Sugar</li>
<li>+ Cheese can be made from Nut Milk</li>
<li>+ Hives show Bee count when hovered</li>
<li>+ Flies, Fireflies, and Rats get trapped in Glue</li>
<li>+ Worms can compost Charcoal and Straw</li>
<li>+ Snails eat Pickles and Grapes</li>
<li>+ Slugs eat Grapes</li>
<li>+ Evergreen trees drop Pinecones when burned</li>
<li>~ Pinecones can withstand high temperatures</li>
<li>+ Wheat dries and freezes into Straw</li>
<li>+ Straw breaks into Flour</li>
<li>+ Potato can be deep-fried</li>
<li>+ Water can explode in hot Nut Oil</li>
<li>+ Soda can disolve Eggs</li>
<li>+ Yeast ferments Mashed Potato</li>
<li>+ Potatoes can charge Zinc or Copper</li>
<li>+ Batteries explode when melted</li>
<li>+ Ammonia can spawn Algae in Water</li>
<li>+ Broth can extinguish small fires</li>
<li>+ Salt slowly dissolves in Caramel</li>
<li>+ Ketchup and Baking Soda reaction</li>
<li>+ Acid kills Plant and Tree Branch before dissolving it</li>
<li>+ Copper Sulfate kills Termites, Plant, Grass, Algae, and Mushrooms</li>
<li>+ Caustic Potash and Acid reaction</li>
<li>+ Nickel can resist Acid</li>
<li>+ Aluminum breaks into Metal Scrap</li>
<li>+ Thermite can be made from Metal Scrap</li>
<li>+ Gallium stains solids</li>
<li>+ Gold can alloy with AlGa</li>
<li>+ Electrum breaks into Gold Coins</li>
<li>+ Electrolysis on Salt Water produces Chlorine</li>
<li>+ Alcohol can purify Infection</li>
<li>+ Vaccine and Antibody can cure Rotten Meat and Cheese</li>
<li>+ Soap releases Fragrance when burned</li>
<li>+ Soap can be made from Milk</li>
<li>+ Paper is yellowed by Light and Oxygen</li>
<li>+ Plant is yellowed by Chlorine</li>
<li>+ Skin is darkened and reddened by Light</li>
<li>+ Skin will rash when exposed to irritants</li>
<li>+ Neutrons can react with Plant, Gunpowder, Yeast, and Firework</li>
<li>+ Positrons react violently with Electric</li>
<li>+ Light can kill Plague and Virus</li>
<li>~ Virus no longer eats Light or Loopy</li>
<li>~ Loopy ignores Cloners</li>
<li>~ Cancer is killed by Radiation faster</li>
<li>+ Cancer can be killed by Laser</li>
<li>~ Diamond is no longer indestructible, but still very strong</li>
<li>~ Diamonds will no longer form if Charcoal is too hot</li>
<li>~ Moved Bubble to Gases</li>
<li>+ Bubbles pop when cooled or heated</li>
<li>~ Tweaked Bleach and Vinegar reaction</li>
<li>~ Randomized Egg hatching rate</li>
<li>~ Cacti no longer grow arms at their base</li>
<li>+ Bamboo burns into Embers</li>
<li>+ Malware can hijack Loopy</li>
<li>+ Malware can misalign Lattice</li>
<li>+ Malware can break down Border</li>
<li>+ Rainbow breaks into Static</li>
<li>+ Bless revives Tree Branches from Saplings</li>
<li>+ Bless purifies Pilk</li>
<li>+ Bless removes Color Smoke and Spray Paint</li>
<li>+ Packed Snow breaks into Snow</li>
<li>+ Water can put out Antifire</li>
<li>~ Antifire ignores air density</li>
<li>~ Holding Shift can force mix dense ingredients into Batter</li>
<li>~ Gave unique colors to Supernova, NExplosion, and Pop</li>
<li>~ Recolored Molten Potassium and Molten Magnesium</li>
<li>~ Tweaked charged Hydrogen and Helium colors</li>
<li>~ Moved Ball to Special (For real this time)</li>
<li>~ Moved Perfume to Liquids</li>
<li>~ Moved Amber to Solids</li>
<li>~ Save names are truncated in save menu</li>
<li>+ Humans always save skin and shirt color in saves</li>
<li>+ Shift can be held when pressing -/+ buttons</li>
<li>+ Unpaint tool downgrades colorful element variants</li>
<li>+ Earthquakes and Tornadoes in random events</li>
<li>+ Magma alias 'Lava'</li>
<li>- Removed Smooth View (Try moreViews.js!)</li>
<li>[Bug Fixes]</li>
<li>~ Fixed: Evergreen and Lattice can be dragged</li>
<li>~ Fixed: Cellulose isn't considered a liquid</li>
<li>~ Fixed: Cellulose density too low</li>
<li>~ Fixed: Ketchup could result from recipes with Butter</li>
<li>~ Fixed: Accented element names capitalize incorrectly</li>
<li>~ Fixed: Virus can destroy invincible pixels</li>
<li>~ Fixed: E-cloner doesn't copy temperature</li>
<li>~ Fixed: Middle click begins scrolling on Windows</li>
<li>~ Fixed: Swapping to secondary element doesn't focus category</li>
<li>~ Fixed: Alcohol Gas has 110% flammability</li>
<li>~ Fixed: Acid Gas can destroy some Acid-resistant elements</li>
<li>~ Fixed: Certain Cactus pixel grows instantly</li>
<li>~ Fixed: Typo in Hydrogen and Sulfur reaction</li>
<li>~ Fixed: Antigas places at room temperature</li>
<li>~ Fixed: Hot Antifire burns indefinitely</li>
<li>~ Fixed: Melted Wax viscosity defined twice</li>
<li>~ Fixed: Flash lower state defined twice</li>
<li>~ Fixed: Ketchup boils into Vinegar, which immediately boils</li>
<li>~ Fixed: F11 doesn't toggle fullscreen (May need Shift)</li>
<li>~ Fixed: Water causes Ember to stop burning, etc.</li>
<li>~ Fixed: Bless can create everlasting Fire</li>
<li>~ Fixed: Spawning Liquid Propane causes pulse effect</li>
<li>~ Fixed: Stained Glass and Color Sand can't be painted</li>
<li>[Technical]</li>
<li>+ Prop tool accepts lowercase "-infinity"</li>
<li>~ Prop tool deselects on invalid input</li>
<li>+ onMouseDown() element property</li>
<li>+ hoverStat(pixel) element property for hover info, return string</li>
<li>+ stain1 and stain2 reaction property, accepts hex color code</li>
<li>+ Shift + W?</li>
</ul>
<h2 id="1.9.3">[Version 1.9.3 - February 2, 2024 - Mix & Munch]</h2>
<p><a href="https://news.r74n.com/p/sandboxels-v193-mix-and-munch-out">Read More on the Newsletter!</a></p>
<ul>
<li>+ Potassium</li>
<li>+ Magnesium</li>

View File

@ -7,6 +7,129 @@ See sneak peaks for upcoming updates on the Discord: https://discord.gg/ejUc6YPQ
A fancier version of this changelog can be found here: https://sandboxels.R74n.com/changelog
[Version 1.9.4 - March 17, 2024 - Natural Disasters]
+ Tornado
+ Earthquake
+ Tsunami
+ Blaster
+ Sandstorm (Hidden)
[Changes]
+ Scrolling resizes in correct direction on Windows
+ Invert Scroll setting
~ Humans no longer trample Grass
~ Milk no longer turns to Yogurt when heated
+ Milk turns to Yogurt in Primordial Soup
+ Cells can ferment Milk into Yogurt
+ Cells boil and freeze into some Sugar
+ Cheese can be made from Nut Milk
+ Hives show Bee count when hovered
+ Flies, Fireflies, and Rats get trapped in Glue
+ Worms can compost Charcoal and Straw
+ Snails eat Pickles and Grapes
+ Slugs eat Grapes
+ Evergreen trees drop Pinecones when burned
~ Pinecones can withstand high temperatures
+ Wheat dries and freezes into Straw
+ Straw breaks into Flour
+ Potato can be deep-fried
+ Water can explode in hot Nut Oil
+ Soda can disolve Eggs
+ Yeast ferments Mashed Potato
+ Potatoes can charge Zinc or Copper
+ Batteries explode when melted
+ Ammonia can spawn Algae in Water
+ Broth can extinguish small fires
+ Salt slowly dissolves in Caramel
+ Ketchup and Baking Soda reaction
+ Acid kills Plant and Tree Branch before dissolving it
+ Copper Sulfate kills Termites, Plant, Grass, Algae, and Mushrooms
+ Caustic Potash and Acid reaction
+ Nickel can resist Acid
+ Aluminum breaks into Metal Scrap
+ Thermite can be made from Metal Scrap
+ Gallium stains solids
+ Gold can alloy with AlGa
+ Electrum breaks into Gold Coins
+ Electrolysis on Salt Water produces Chlorine
+ Alcohol can purify Infection
+ Vaccine and Antibody can cure Rotten Meat and Cheese
+ Soap releases Fragrance when burned
+ Soap can be made from Milk
+ Paper is yellowed by Light and Oxygen
+ Plant is yellowed by Chlorine
+ Skin is darkened and reddened by Light
+ Skin will rash when exposed to irritants
+ Neutrons can react with Plant, Gunpowder, Yeast, and Firework
+ Positrons react violently with Electric
+ Light can kill Plague and Virus
~ Virus no longer eats Light or Loopy
~ Loopy ignores Cloners
~ Cancer is killed by Radiation faster
+ Cancer can be killed by Laser
~ Diamond is no longer indestructible, but still very strong
~ Diamonds will no longer form if Charcoal is too hot
~ Moved Bubble to Gases
+ Bubbles pop when cooled or heated
~ Tweaked Bleach and Vinegar reaction
~ Randomized Egg hatching rate
~ Cacti no longer grow arms at their base
+ Bamboo burns into Embers
+ Malware can hijack Loopy
+ Malware can misalign Lattice
+ Malware can break down Border
+ Rainbow breaks into Static
+ Bless revives Tree Branches from Saplings
+ Bless purifies Pilk
+ Bless removes Color Smoke and Spray Paint
+ Packed Snow breaks into Snow
+ Water can put out Antifire
~ Antifire ignores air density
~ Holding Shift can force mix dense ingredients into Batter
~ Gave unique colors to Supernova, NExplosion, and Pop
~ Recolored Molten Potassium and Molten Magnesium
~ Tweaked charged Hydrogen and Helium colors
~ Moved Ball to Special (For real this time)
~ Moved Perfume to Liquids
~ Moved Amber to Solids
~ Save names are truncated in save menu
+ Humans always save skin and shirt color in saves
+ Shift can be held when pressing -/+ buttons
+ Unpaint tool downgrades colorful element variants
+ Earthquakes and Tornadoes in random events
+ Magma alias 'Lava'
- Removed Smooth View (Try moreViews.js!)
[Bug Fixes]
~ Fixed: Evergreen and Lattice can be dragged
~ Fixed: Cellulose isn't considered a liquid
~ Fixed: Cellulose density too low
~ Fixed: Ketchup could result from recipes with Butter
~ Fixed: Accented element names capitalize incorrectly
~ Fixed: Virus can destroy invincible pixels
~ Fixed: E-cloner doesn't copy temperature
~ Fixed: Middle click begins scrolling on Windows
~ Fixed: Swapping to secondary element doesn't focus category
~ Fixed: Alcohol Gas has 110% flammability
~ Fixed: Acid Gas can destroy some Acid-resistant elements
~ Fixed: Certain Cactus pixel grows instantly
~ Fixed: Typo in Hydrogen and Sulfur reaction
~ Fixed: Antigas places at room temperature
~ Fixed: Hot Antifire burns indefinitely
~ Fixed: Melted Wax viscosity defined twice
~ Fixed: Flash lower state defined twice
~ Fixed: Ketchup boils into Vinegar, which immediately boils
~ Fixed: F11 doesn't toggle fullscreen (May need Shift)
~ Fixed: Water causes Ember to stop burning, etc.
~ Fixed: Bless can create everlasting Fire
~ Fixed: Spawning Liquid Propane causes pulse effect
~ Fixed: Stained Glass and Color Sand can't be painted
[Technical]
+ Prop tool accepts lowercase "-infinity"
~ Prop tool deselects on invalid input
+ onMouseDown() element property
+ hoverStat(pixel) element property for hover info, return string
+ stain1 and stain2 reaction property, accepts hex color code
+ Shift + W?
[Version 1.9.3 - February 2, 2024 - Mix & Munch]
+ Potassium
+ Magnesium

View File

@ -99,7 +99,6 @@
<tr><td>Normal view</td> <td><kbd>1</kbd></td></tr>
<tr><td>Thermal view</td> <td><kbd>2</kbd></td></tr>
<tr><td>Basic view (No effects)</td> <td><kbd>3</kbd></td></tr>
<tr><td>Smooth view (Low performance)</td> <td><kbd>4</kbd></td></tr>
<tr><td>Hide canvas</td> <td><kbd>H</kbd></td></tr>
<tr><td>Toggle GUI</td> <td><kbd>F1</kbd></td></tr>
<tr><td>Capture screenshot</td> <td><kbd>C</kbd> or <kbd>F2</kbd></td></tr>

View File

@ -28,7 +28,6 @@ F or F11 = Toggle Fullscreen
1 or 0 = Normal View
2 = Thermal View
3 = Basic View (No Effects)
4 = Smooth View
H = Hide Canvas
F1 = Toggle GUI / HUD
F2 or C = Capture Screenshot

File diff suppressed because it is too large Load Diff

View File

@ -13,5 +13,6 @@
"molten_sulfur": "molten_sulphur",
"sulfur_gas": "sulphur_gas",
"color_sand": "colour_sand",
"yogurt": "yoghurt"
"yogurt": "yoghurt",
"frozen_yogurt": "frozen_yoghurt"
}

View File

@ -147,4 +147,9 @@ if (elements.gold_coin) {elements.gold_coin.color = ["#fff0b5","#986a1a","#f0bb6
if (elements.rocket) {elements.rocket.color = "#ff0000";}
if (elements.rose_gold) {elements.rose_gold.color = ["#b76e79","#a1334d","#f06283"];}
if (elements.calcium) {elements.calcium.color = ["#515053","#7a787d","#748193","#fef9ff","#748193","#7a787d","#515053"];}
if (elements.electrum) {elements.electrum.color = ["#ffdd63","#ad9532","#bda853","#bdb38e","#fff5d1"];}
if (elements.electrum) {elements.electrum.color = ["#ffdd63","#ad9532","#bda853","#bdb38e","#fff5d1"];}
if (elements.molten_potassium) {delete elements.molten_potassium.color;}
if (elements.molten_magnesium) {delete elements.molten_magnesium.color;}
if (elements.n_explosion) {elements.n_explosion.color = ["#ffb48f","#ffd991","#ffad91"];}
if (elements.supernova) {elements.supernova.color = ["#ffb48f","#ffd991","#ffad91"];}
if (elements.pop) {elements.pop.color = ["#ffb48f","#ffd991","#ffad91"];}

View File

@ -1,57 +1,3 @@
elements.earthquake = {
color: ["#bda791","#997756","#613d19"],
tick: function(pixel) {
if (pixel.stage) {
var coords = circleCoords(pixel.x,pixel.y,pixel.stage);
if (pixel.stage >= pixel.mag) {
deletePixel(pixel.x,pixel.y);
return;
}
coords.forEach(function(coord){
var x = coord.x;
var y = coord.y;
if (!isEmpty(x,y,true)) {
var p = pixelMap[x][y];
if (p.element === "earthquake") { return }
if (elements[p.element].breakInto) {
// times 0.25 if not shiftDown else 1
if (Math.random() < (elements[p.element].hardness || 1) * (shiftDown ? 1 : 0.25)) {
var breakInto = elements[p.element].breakInto;
// if breakInto is an array, pick one
if (Array.isArray(breakInto)) {
breakInto = breakInto[Math.floor(Math.random() * breakInto.length)];
}
if (breakInto === null) {
deletePixel(p.x,p.y);
return;
}
var oldelement = p.element;
changePixel(p,breakInto);
if (elements[oldelement].breakIntoColor) {
p.color = pixelColorPick(p, elements[oldelement].breakIntoColor);
}
}
}
if (!elements[p.element].movable) { return }
tryMove(p,p.x,p.y-1);
}
})
pixel.stage++;
}
else if (!tryMove(pixel,pixel.x,pixel.y+1)) {
// random 10 to 20
pixel.mag = Math.floor(Math.random() * 10) + 20;
pixel.stage = 1;
}
},
category: "weapons",
state: "solid",
density: 100000000,
maxSize: 1,
cooldown: defaultCooldown,
excludeRandom: true,
}
elements.rad_fluid = {
behavior: behaviors.LIQUID,
category: "liquids",