Merge branch 'R74nCom:main' into main

lang/fr.json

@@ -553,5 +553,7 @@
 "soul": "Âme",
 "spider": "Araignée",
 "ectoplasm": "Ectoplasme",
-"tombstone": "Pierre tombale"
+"tombstone": "Pierre tombale",
+"cheese_powder":"Poudre de fromage",
+"chocolate_powder":"Poudre de chocolat"
 }

lang/hu.json

@@ -120,6 +120,8 @@
 "freezer":"fagyasztó",
 "pipe":"cső",
 "pipe_wall":"csőfal",
+"mixer": "keverő",
+"grinder": "daráló",
 "ewall":"áramvezető_fal",
 "torch":"fáklya",
 "spout":"csap",
@@ -173,6 +175,7 @@
 "pinecone":"toboz",
 "evergreen":"örökzöld",
 "cactus":"kaktusz",
+"kelp": "hínár",
 "seeds":"magvak",
 "grass_seed":"fűmag",
 "wheat_seed":"búzamag",
@@ -216,6 +219,7 @@
 "antimatter":"antianyag",
 "plastic":"műanyag",
 "molten_plastic":"olvadt_műanyag",
+"cloth":"ruha",
 "cellulose":"cellulóz",
 "wax":"viasz",
 "melted_wax":"olavasztott_viasz",
@@ -229,6 +233,7 @@
 "copper":"réz",
 "gold":"arany",
 "steel":"acél",
+"galvanized_steel":"horganyzott_acél"
 "nickel":"nikkel",
 "zinc":"cink",
 "silver":"ezüst",
@@ -275,7 +280,9 @@
 "butter":"vaj",
 "cheese":"sajt",
 "rotten_cheese":"romlott_sajt",
+"cheese_powder":"sajtpor",
 "chocolate":"csokoládé",
+"chocolate_powder":"csokoládépor",
 "grape":"szőlő",
 "vinegar":"ecet",
 "herb":"gyógynövény",
@@ -301,6 +308,7 @@
 "crumb":"morzsa",
 "baked_batter":"palacsinta",
 "wheat":"búza",
+"rice":"rizs",
 "candy":"cukorka",
 "coffee_bean":"kávébab",
 "coffee_ground":"őrölt_kávé",
@@ -427,7 +435,7 @@
 "color_sand":"színes_homok",
 "borax":"bórax",
 "epsom_salt":"keserűsó",
-"potassium_salt":"kálium_só",
+"potassium_salt":"kálisó",
 "sodium_acetate":"nátrium-acetát",
 "lightning":"villámcsapás",
 "bless":"áldás",
@@ -518,9 +526,9 @@
 "molten_copper_sulfate":"olvadt_rézgálic",
 "molten_alga":"olvadt_alumínium-gallim_ötvözet",
 "molten_metal_scrap":"olvadt_fémtörmelék",
-"molten_borax":"olvadt_borax",
+"molten_borax":"olvadt_bórax",
 "molten_epsom_salt":"olvadt_keserűsó",
-"molten_potassium_salt":"olvadt_kálium_só",
+"molten_potassium_salt":"olvadt_kálisó",
 "molten_sodium_acetate":"olvadt_nátrium-acetát",
 "frozen_nitro":"fagyott_nitroglicerin",
 "cured_meat": "sózott_hús",
@@ -529,6 +537,7 @@
 "fat": "zsír",
 "potassium": "kálium",
 "molten_potassium": "olvadt_kálium",
+"potassium_gas":"káliumgőz",
 "magnesium": "magnézium",
 "molten_magnesium": "olvadt_magnézium",
 "sandstorm": "homokvihar",
@@ -540,4 +549,16 @@
 "blaster": "plazmavető",
 "propane_ice": "fagyott_propán",
 "molten_caustic_potash": "olvadt_kálium-hidroxid"
+"ectoplasm":"ektoplazma",
+"soul":"lélek",
+"tombstone":"sírkő",
+"spider":"pók",
+"web":"pókháló",
+"pause":"megállítás",
+"reset":"visszaállítás",
+"replace":"kicserélés",
+"info":"infó",
+"saves":"mentett_fájlok",
+"mods":"modok",
+"settings":"beállítások"
 }

lang/vi.json

@@ -554,5 +554,7 @@
 "soul": "Linh hồn",
 "spider": "Nhện",
 "ectoplasm": "Ngoại chất",
-"tombstone": "Bia mộ"
+"tombstone": "Bia mộ",
+  "cheese_powder":"Bột phô mai",
+"chocolate_powder":"Bột Sô-cô-la"
 }

mods/UAMM.js

@@ -406,10 +406,72 @@ elements.lithium_carbonate = {
 	density: 2110
 };
 
+elements.sodium = {
+	color: ["#e8e8e8", "#f5f5f5", "#c9c9c9", "#d4d4d4"],
+	behavior: behaviors.POWDER,
+	category: "powders",
+	state: "solid",
+	tempHigh: 98,
+	stateHigh: "liquid_sodium",
+	density: 968,
+	tick: function (pixel){
+        var otherPixel;
+        for (var i = 0; i < squareCoords.length; i++) {
+            var coord = squareCoords[i];
+            var x = pixel.x+coord[0];
+            var y = pixel.y+coord[1];
+            if (isEmpty(x, y, true)){
+                if(Math.random()<0.003) {
+                    changePixel(pixel, "sodium_hydroxide")
+                }
+            }
+            if (!isEmpty(x, y, true)) {
+                otherPixel = pixelMap[x][y];
+                if (otherPixel.element != "mineral_oil") {
+					if (otherPixel.element != "sodium" && otherPixel.element != "sodium_hydroxide") {
+						if(Math.random()<0.001) {
+							changePixel(pixel, "sodium_hydroxide")
+						}
+					}
+                }
+            }
+        }
+    },
+	reactions: {
+		"water": {elem1: "sodium_hydroxide", elem2: "hydrogen", temp1: 200, chance: 0.1},
+		"salt_water": {elem1: "sodium_hydroxide", elem2: "hydrogen", temp1: 200, chance: 0.1},
+	}
+};
+
+elements.liquid_sodium = {
+    color: ["#e8e8e8", "#f5f5f5", "#c9c9c9", "#d4d4d4"],
+	behavior: behaviors.LIQUID,
+    hidden: true,
+	state: "liquid",
+	density: 951,
+	reactions: {
+		"water": {elem1: "sodium_hydroxide", elem2: "hydrogen", temp1: 200, chance: 0.001},
+		"salt_water": {elem1: "sodium_hydroxide", elem2: "hydrogen", temp1: 200, chance: 0.001},
+	}
+};
+
+elements.sodium_hydroxide = {
+	color: ["#cccccc", "#c1c1c1", "#b7b7b7", "#bbbbbb"],
+	behavior: behaviors.POWDER,
+	hidden: true,
+	state: "solid",
+	density: 2100,
+    reactions: {
+		"water": {elem1: "salt_water", elem2: null, chance: 0.1},
+		"salt_water": {elem1: "salt_water", elem2: null, chance: 0.1},
+	}
+};
+
+
 elements.mineral_oil = {
 	color: ["#cdf6fa", "#e6fdff", "#bff9ff", "#f5feff"],
 	behavior: behaviors.LIQUID,
 	state: "liquid",
 	category: "liquids",
 	density: 870,
-};
+};

mods/bromine.js

@@ -0,0 +1,40 @@
+// coded by suss, so the code probably sucks
+// lmao it only adds three elements, actually this is my first mod that even ADDS elements
+// wait, nobody even reads the mod code, so im essentially talking to myself
+// oh well :(
+
+elements.bromine = {
+    color: "#4e0e00",
+    behavior: [
+        "XX|CR:bromine_vapor%5|XX",
+        "M2|XX|M2",
+        "XX|M1|XX",
+    ],
+    category: "liquids",
+    viscosity: 1.5,
+    state: "liquid",
+    density: 3102,
+    tempLow: -7,
+    stateLow: "bromine_ice",
+};
+
+elements.bromine_ice = {
+    color: "#350900",
+    behavior: behaviors.WALL,
+    category: "states",
+    state: "solid",
+    density: 3102,
+    tempHigh: -7,
+    stateHigh: "bromine",
+    temp: -10,
+    hidden: true,
+};
+
+elements.bromine_vapor = {
+    color: "#d48846",
+    behavior: behaviors.GAS,
+    category: "gases",
+    state: "gas",
+    density: 7.59,
+    hidden: true,
+}