From 6bb9f4dcc0d18d0905a77a0ffa303d6cb1d13f71 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:31:11 +0800 Subject: [PATCH 01/13] Update citybuilding.js --- mods/citybuilding.js | 113 +++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 69 deletions(-) diff --git a/mods/citybuilding.js b/mods/citybuilding.js index e99a655a..dd04d166 100644 --- a/mods/citybuilding.js +++ b/mods/citybuilding.js @@ -1,3 +1,4 @@ + function building_1_segment() { if (pixel.foundation = true && pixel.height < pixel.limit) { if (isEmpty(pixel.x+1,pixel.y-pixel.height) && @@ -24,6 +25,25 @@ function building_1_segment() { } } } +function clearbase3x5() { + if (pixel.clearbase = false && pixel.height < pixel.limit) { + pixel.clearbase = true + deletePixel(pixel.x-1,pixel.y) + deletePixel(pixel.x+1,pixel.y) + deletePixel(pixel.x-2,pixel.y) + deletePixel(pixel.x+2,pixel.y) + deletePixel(pixel.x,pixel.y-1) + deletePixel(pixel.x-1,pixel.y-1) + deletePixel(pixel.x+1,pixel.y-1) + deletePixel(pixel.x-2,pixel.y-1) + deletePixel(pixel.x+2,pixel.y-1) + deletePixel(pixel.x,pixel.y-2) + deletePixel(pixel.x-1,pixel.y-2) + deletePixel(pixel.x+1,pixel.y-2) + deletePixel(pixel.x-2,pixel.y-2) + deletePixel(pixel.x+2,pixel.y-2) + } +} function filldirt2x5() { var dirtPixelElem = pixelMap[pixel.x][pixel.y+1]; if (!isEmpty(pixel.x,pixel.y+1) && !outOfBounds(pixel.x,pixel.y+1)) { @@ -47,11 +67,21 @@ function filldirt2x5() { if (isEmpty(pixel.x-2,pixel.y+2)) { createPixel(dirtPixelElem,pixel.x-2,pixel.y+2); } + if (isEmpty(pixel.x+1,pixel.y+2)) { + createPixel(dirtPixelElem,pixel.x+2,pixel.y+2); + } + if (isEmpty(pixel.x-1,pixel.y+2)) { + createPixel(dirtPixelElem,pixel.x-2,pixel.y+2); + } + if (isEmpty(pixel.x,pixel.y+2)) { + createPixel(dirtPixelElem,pixel.x-2,pixel.y+2); + } } elements.building_1 = { - color: "#a78d38", + color: "#ffc800", tick: function(pixel) { if (!isEmpty(pixel.x,pixel.y+1)) { + clearbase3x5(); if (isEmpty(pixel.x+1,pixel.y) && isEmpty(pixel.x-1,pixel.y) && isEmpty(pixel.x+2,pixel.y) && @@ -73,7 +103,7 @@ elements.building_1 = { createPixel("concrete",pixel.x+2,pixel.y+1); createPixel("concrete",pixel.x-2,pixel.y+1); createPixel("wood",pixel.x,pixel.y+1); - pixel.limit = 10 + Math.floor(Math.random() * 5)*2; + pixel.limit = 5 + Math.floor(Math.random() * 25)*2; createPixel("concrete",pixel.x+1,pixel.y); createPixel("concrete",pixel.x-1,pixel.y); createPixel("concrete",pixel.x+2,pixel.y); @@ -93,81 +123,19 @@ elements.building_1 = { else if (pixel.foundation == true && pixel.height >= pixel.limit) { pixel.built = true; } - if (pixel.built == true) { + if (pixel.built == true || pixel.age > 100) { changePixel(pixel,"wood"); } + pixel.age++ doDefaults(pixel); }, properties: { height:0, limit:0, foundation:false, - built:false - }, - category: "citybuilding", - state: "solid", - density: 1500, - cooldown: defaultCooldown, - seed: true, - maxSize: 1, - excludeRandom: true, - behavior: behaviors.STURDYPOWDER, -}; -elements.building_1_tall = { - color: "#d9c243", - tick: function(pixel) { - if (!isEmpty(pixel.x,pixel.y+1)) { - if (isEmpty(pixel.x+1,pixel.y) && - isEmpty(pixel.x-1,pixel.y) && - isEmpty(pixel.x+2,pixel.y) && - isEmpty(pixel.x-2,pixel.y) && - isEmpty(pixel.x+2,pixel.y-1) && - isEmpty(pixel.x-2,pixel.y-1) && - isEmpty(pixel.x+1,pixel.y-1) && - isEmpty(pixel.x-1,pixel.y-1) && - isEmpty(pixel.x,pixel.y-1) && - isEmpty(pixel.x+2,pixel.y-2) && - isEmpty(pixel.x-2,pixel.y-2) && - isEmpty(pixel.x+1,pixel.y-2) && - isEmpty(pixel.x-1,pixel.y-2) && - isEmpty(pixel.x,pixel.y-2)) { - filldirt2x5(); - movePixel(pixel,pixel.x,pixel.y-1); - createPixel("concrete",pixel.x+1,pixel.y+1); - createPixel("concrete",pixel.x-1,pixel.y+1); - createPixel("concrete",pixel.x+2,pixel.y+1); - createPixel("concrete",pixel.x-2,pixel.y+1); - createPixel("wood",pixel.x,pixel.y+1); - pixel.limit = 15 + Math.floor(Math.random() * 10)*2; - createPixel("concrete",pixel.x+1,pixel.y); - createPixel("concrete",pixel.x-1,pixel.y); - createPixel("concrete",pixel.x+2,pixel.y); - createPixel("concrete",pixel.x-2,pixel.y); - createPixel("concrete",pixel.x+1,pixel.y-1); - createPixel("concrete",pixel.x-1,pixel.y-1); - createPixel("concrete",pixel.x+2,pixel.y-1); - createPixel("concrete",pixel.x-2,pixel.y-1); - createPixel("concrete",pixel.x,pixel.y-1); - pixel.foundation = true; - pixel.height = pixel.height+2 - } - } - if (pixel.foundation == true && pixel.height < pixel.limit) { - building_1_segment(); - } - else if (pixel.foundation == true && pixel.height >= pixel.limit) { - pixel.built = true; - } - if (pixel.built == true) { - changePixel(pixel,"wood"); - } - doDefaults(pixel); - }, - properties: { - height:0, - limit:0, - foundation:false, - built:false + built:false, + clearbase:false, + age:0 }, category: "citybuilding", state: "solid", @@ -203,8 +171,15 @@ elements.small_tree_1 = { changePixel(pixel,"wood"); } } + if (pixel.age > 50) { + changePixel(pixel,"wood"); + } + pixel.age++ doDefaults(pixel); }, + properties: { + age:0 + }, category: "citybuilding", state: "solid", density: 1500, From dce9b426b576dc3ab57fb8fb688bb06d25930801 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 19 Mar 2024 09:13:49 +0800 Subject: [PATCH 02/13] Update citybuilding.js --- mods/citybuilding.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/citybuilding.js b/mods/citybuilding.js index dd04d166..e3f7fac9 100644 --- a/mods/citybuilding.js +++ b/mods/citybuilding.js @@ -1,3 +1,5 @@ +// created by sqec +// coming soon: apartments, small houses function building_1_segment() { if (pixel.foundation = true && pixel.height < pixel.limit) { From 8ca89622df3d3f30a4a8037b1498c26c65f304b2 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 19 Mar 2024 17:57:47 +0800 Subject: [PATCH 03/13] invertscroll --- mods/invertscroll.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 mods/invertscroll.js diff --git a/mods/invertscroll.js b/mods/invertscroll.js new file mode 100644 index 00000000..941389f5 --- /dev/null +++ b/mods/invertscroll.js @@ -0,0 +1,8 @@ +runAfterLoad(function() { + if (settings.invertscroll = true) { + settings.invertscroll = false; + } + else { + settings.invertscroll = true; + } +}) From 756c223337c4e2b208dc5137ec2b8a5b31d65349 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 19 Mar 2024 17:59:22 +0800 Subject: [PATCH 04/13] Update mod-list.html --- mod-list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/mod-list.html b/mod-list.html index f5b2b470..4eeae5c2 100644 --- a/mod-list.html +++ b/mod-list.html @@ -135,6 +135,7 @@ extra_element_info.jsAdds descriptions to various vanilla elements. Used to provide the functionality that desc now does before it was added to vanillaMelecie find.jsAdds a find mode that highlights a chosen element as pulsating red and yellow (read commit description)Alice insane_random_events.jsMassively buffs random eventsAlice +invertscroll.jsInverts the scroll wheel for adjusting brush sizeSquareScreamYT moretools.jsAdds more temperature-modifying tools (±10/tick, ±50/tick, and absolute zero tools)Sightnado move_tools.jsAdds tools that move pixelsAlice noconfirm.jsRemoves all confirmation pop upsmollthecoder From a17f3123f4e79843c1dff98b4e4e794d08088386 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 19 Mar 2024 18:05:15 +0800 Subject: [PATCH 05/13] cn thing --- lang/zh_cn.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lang/zh_cn.json b/lang/zh_cn.json index 45c363d8..ce084154 100644 --- a/lang/zh_cn.json +++ b/lang/zh_cn.json @@ -70,7 +70,7 @@ "flour":"面粉", "wire":"电线", "battery":"电瓶", -"cloner":"", +"cloner":"克隆机", "sensor":"", "heater":"", "cooler":"", @@ -408,7 +408,7 @@ "electric":"电", "uranium":"", "molten_uranium":"", -"diamond":"", +"diamond":"钻石", "gold_coin":"硬币", "rust":"", "oxidized_copper":"", @@ -508,7 +508,7 @@ "broth_ice":"", "frozen_vinegar":"", "sauce_ice":"", -"alcohol_ice":"", +"alcohol_ice":"酒冰", "bleach_ice":"", "chlorine_ice":"", "frozen_ink":"", @@ -538,10 +538,10 @@ "sandstorm": "", "caustic_potash": "", "antibomb": "", -"tornado": "", -"earthquake": "", -"tsunami": "", +"tornado": "龙卷风", +"earthquake": "地震", +"tsunami": "海啸", "blaster": "", "propane_ice": "", "molten_caustic_potash": "" -} \ No newline at end of file +} From 7b4472139af3094ce439a2b3d55b44b37e2757bd Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 19 Mar 2024 18:21:27 +0800 Subject: [PATCH 06/13] toki pona updat --- lang/tok.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lang/tok.json b/lang/tok.json index fe6b9257..c71be441 100644 --- a/lang/tok.json +++ b/lang/tok.json @@ -146,10 +146,10 @@ "sawdust":"", "hail":"", "hydrogen":"kon_pi_tawa_kon_mute", -"oxygen":"kon_pi_wile_soweli_ale", +"oxygen":"kon_pi_suli_tawa_soweli_ale", "nitrogen":"", -"helium":"", -"anesthesia":"", +"helium":"kon_pi_tawa_kon", +"anesthesia":"kon_lape", "ammonia":"", "liquid_ammonia":"", "carbon_dioxide":"kon_pi_tan_soweli_ale", @@ -161,7 +161,7 @@ "stained_glass":"", "molten_stained_glass":"", "art":"", -"rainbow":"", +"rainbow":"kiwen_pi_kule_mute", "static":"", "border":"poka", "clay":"", @@ -257,10 +257,10 @@ "molten_tin":"", "molten_lead":"", "molten_solder":"", -"juice":"", -"juice_ice":"", +"juice":"telo_kili", +"juice_ice":"kiwen_lete_pi_telo_kili", "broth":"", -"milk":"", +"milk":"telo_walo_pi_soweli_walo_pimeja", "chocolate_milk":"", "fruit_milk":"", "pilk":"", @@ -276,13 +276,13 @@ "cheese":"", "rotten_cheese":"", "chocolate":"", -"grape":"", +"grape":"kili_suwi_pi_laso_loje", "vinegar":"", "herb":"kasi_moku_lili", "lettuce":"", "pickle":"", -"tomato":"", -"sauce":"", +"tomato":"kili_pi_suli_loje", +"sauce":"telo_pi_kili_loje", "pumpkin":"", "pumpkin_seed":"", "corn":"", @@ -424,7 +424,7 @@ "confetti":"", "glitter":"", "bead":"", -"color_sand":"", +"color_sand":"ko_pi_kule_mute", "borax":"", "epsom_salt":"", "potassium_salt":"", @@ -544,4 +544,4 @@ "blaster": "", "propane_ice": "", "molten_caustic_potash": "" -} \ No newline at end of file +} From e5a4394e9f0189250e0c297e7e92d5917e3e649c Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 19 Mar 2024 20:24:21 +0800 Subject: [PATCH 07/13] invertscroll fix --- mods/invertscroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/invertscroll.js b/mods/invertscroll.js index 941389f5..4cebc6fb 100644 --- a/mods/invertscroll.js +++ b/mods/invertscroll.js @@ -1,5 +1,5 @@ runAfterLoad(function() { - if (settings.invertscroll = true) { + if (settings.invertscroll === undefined && navigator.platform.toUpperCase().indexOf('MAC')>=0) { settings.invertscroll = false; } else { From 001e20c30297d89c172b3644fe26cedba9b974b7 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 19 Mar 2024 20:25:35 +0800 Subject: [PATCH 08/13] idk what this does but works --- mods/invertscroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/invertscroll.js b/mods/invertscroll.js index 4cebc6fb..ee426b90 100644 --- a/mods/invertscroll.js +++ b/mods/invertscroll.js @@ -1,5 +1,5 @@ runAfterLoad(function() { - if (settings.invertscroll === undefined && navigator.platform.toUpperCase().indexOf('MAC')>=0) { + if (navigator.platform.toUpperCase().indexOf('MAC')>=0) { settings.invertscroll = false; } else { From 454629dd51632e9c43adf16d6f6fc14697506635 Mon Sep 17 00:00:00 2001 From: slweeb <91897291+slweeb@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:27:57 -0400 Subject: [PATCH 09/13] Delete purple_guys_mod.js --- purple_guys_mod.js | 173 --------------------------------------------- 1 file changed, 173 deletions(-) delete mode 100644 purple_guys_mod.js diff --git a/purple_guys_mod.js b/purple_guys_mod.js deleted file mode 100644 index 78f4257f..00000000 --- a/purple_guys_mod.js +++ /dev/null @@ -1,173 +0,0 @@ -elements.super_bomb = { - color: "#551c41", - behavior: [ - "XX|EX:125|XX", - "XX|XX|XX", - "M2|M1 AND EX:125|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - -elements.mega_bomb = { - color: "#736e7e", - behavior: [ - "XX|EX:350|XX", - "XX|XX|XX", - "M2|M1 AND EX:350|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - -elements.ultra_bomb = { - color: "#79910a", - behavior: [ - "XX|EX:500>plasma2|XX", - "XX|XX|XX", - "M2|M1 AND EX:500>plasma2|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - -elements.ice_cream_bomb = { - color: "#ffffff", - behavior: [ - "XX|EX:20>ice_cream|XX", - "XX|XX|XX", - "M2|M1 AND EX:20>ice_cream|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - - -elements.dirty_sand = { - color: ["#a35222", "#a15122", "#7e3f1a", "#f4ba9a", "#fed3ba", "#f2b796"], - behavior: behaviors.POWDER, - category: "Purple Guy's Mod", - state: "solid", - density: 2822 -} - -elements.wet_dirty_sand = { - color: ["#a35210", "#a15110", "#7e3f0a", "#f4ba8a", "#fed2ba", "#f2b784"], - behavior: behaviors.POWDER, - category: "Purple Guy's Mod", - state: "liquid", - density: 2822 -} - -elements.reverse_gravity_liquid = { - color: "#cdd7e2", - behavior: behaviors.AGLIQUID , - category: "Purple Guy's Mod", - state: "liquid", - density: 50 -} - -elements.reverse_soda = { - color: ["#5f2706", "#48230d", "#52250a"], - behavior: behaviors.AGLIQUID , behavior: [ - "M2|M1|M2", - "M2|XX|M2", - "XX|CR:foam%3|XX", - ], - - category: "Purple Guy's Mod", - state: "liquid", - density: 1030 -} - -elements.negatively_dense_liquid = { - color: "#94ffd1", - behavior: behaviors.LIQUID , - category: "Purple Guy's Mod", - state: "liquid", - density: -2000 -} - -elements.plasma2 = { - color: "#caf7ff", - behavior: behaviors.DGAS , - category: "Purple Guy's Mod", - state: "gas", - density: 50000, - temp:500000 -} - -elements.negative_fire = { - color: ["#a6bfc4", "#6bd2e4", "#b8dee4", "#32cae4"], - behavior: behaviors.DGAS , - category: "Purple Guy's Mod", - state: "gas", - density: -0.1, - temp:-20000 -} - -elements.coldest_bomb = { - color: "#fffff0", - behavior: [ - "XX|EX:55>negative_fire|XX", - "XX|XX|XX", - "M2|M1 AND EX:55>negative_fire|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - -elements.reinforced_wall = { - color: "#ffff01", - behavior: behaviors.WALL, - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - hardness:10^81 -} - -elements.unreinforced_wall = { - color: "#ffff82", - behavior: behaviors.WALL, - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - hardness:0 -} - -elements.reinforced_liquid_wall = { - color: "#ffff01", - behavior: behaviors.WALL, - category: "Purple Guy's Mod", - state: "liquid", - density: 1300, - hardness:10^81 -} - - -if (!elements.sand.reactions) { elements.sand.reactions = {} } -elements.sand.reactions.dirt = { elem1:"dirty_sand", elem2:"dirty_sand" } - -if (!elements.dirty_sand.reactions) { elements.dirty_sand.reactions = {} } -elements.dirty_sand.reactions.water = { elem1:"wet_dirty_sand", elem2:"wet_dirty_sand" } - -if (!elements.soda.reactions) { elements.soda.reactions = {} } -elements.soda.reactions.reverse_gravity_liquid = { elem1:"reverse_soda", elem2:"reverse_soda" } - -if (!elements.wall.reactions) { elements.wall.reactions = {} } -elements.wall.reactions.plasma2 = { elem1:"plasma2", elem2:"plasma2" } \ No newline at end of file From 654a34abc197ea963385ad8f83d9b54a4f0cad61 Mon Sep 17 00:00:00 2001 From: GuyWhoGotSpringlocked <163777207+GWhoGS@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:41:55 -0400 Subject: [PATCH 10/13] Purple Guy's Mod v0.1 v0.1 -15 New Elements -Keep in mind that most of my code came from Ryan. --- purple_guys_mod.js | 173 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 purple_guys_mod.js diff --git a/purple_guys_mod.js b/purple_guys_mod.js new file mode 100644 index 00000000..78f4257f --- /dev/null +++ b/purple_guys_mod.js @@ -0,0 +1,173 @@ +elements.super_bomb = { + color: "#551c41", + behavior: [ + "XX|EX:125|XX", + "XX|XX|XX", + "M2|M1 AND EX:125|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + +elements.mega_bomb = { + color: "#736e7e", + behavior: [ + "XX|EX:350|XX", + "XX|XX|XX", + "M2|M1 AND EX:350|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + +elements.ultra_bomb = { + color: "#79910a", + behavior: [ + "XX|EX:500>plasma2|XX", + "XX|XX|XX", + "M2|M1 AND EX:500>plasma2|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + +elements.ice_cream_bomb = { + color: "#ffffff", + behavior: [ + "XX|EX:20>ice_cream|XX", + "XX|XX|XX", + "M2|M1 AND EX:20>ice_cream|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + + +elements.dirty_sand = { + color: ["#a35222", "#a15122", "#7e3f1a", "#f4ba9a", "#fed3ba", "#f2b796"], + behavior: behaviors.POWDER, + category: "Purple Guy's Mod", + state: "solid", + density: 2822 +} + +elements.wet_dirty_sand = { + color: ["#a35210", "#a15110", "#7e3f0a", "#f4ba8a", "#fed2ba", "#f2b784"], + behavior: behaviors.POWDER, + category: "Purple Guy's Mod", + state: "liquid", + density: 2822 +} + +elements.reverse_gravity_liquid = { + color: "#cdd7e2", + behavior: behaviors.AGLIQUID , + category: "Purple Guy's Mod", + state: "liquid", + density: 50 +} + +elements.reverse_soda = { + color: ["#5f2706", "#48230d", "#52250a"], + behavior: behaviors.AGLIQUID , behavior: [ + "M2|M1|M2", + "M2|XX|M2", + "XX|CR:foam%3|XX", + ], + + category: "Purple Guy's Mod", + state: "liquid", + density: 1030 +} + +elements.negatively_dense_liquid = { + color: "#94ffd1", + behavior: behaviors.LIQUID , + category: "Purple Guy's Mod", + state: "liquid", + density: -2000 +} + +elements.plasma2 = { + color: "#caf7ff", + behavior: behaviors.DGAS , + category: "Purple Guy's Mod", + state: "gas", + density: 50000, + temp:500000 +} + +elements.negative_fire = { + color: ["#a6bfc4", "#6bd2e4", "#b8dee4", "#32cae4"], + behavior: behaviors.DGAS , + category: "Purple Guy's Mod", + state: "gas", + density: -0.1, + temp:-20000 +} + +elements.coldest_bomb = { + color: "#fffff0", + behavior: [ + "XX|EX:55>negative_fire|XX", + "XX|XX|XX", + "M2|M1 AND EX:55>negative_fire|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + +elements.reinforced_wall = { + color: "#ffff01", + behavior: behaviors.WALL, + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + hardness:10^81 +} + +elements.unreinforced_wall = { + color: "#ffff82", + behavior: behaviors.WALL, + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + hardness:0 +} + +elements.reinforced_liquid_wall = { + color: "#ffff01", + behavior: behaviors.WALL, + category: "Purple Guy's Mod", + state: "liquid", + density: 1300, + hardness:10^81 +} + + +if (!elements.sand.reactions) { elements.sand.reactions = {} } +elements.sand.reactions.dirt = { elem1:"dirty_sand", elem2:"dirty_sand" } + +if (!elements.dirty_sand.reactions) { elements.dirty_sand.reactions = {} } +elements.dirty_sand.reactions.water = { elem1:"wet_dirty_sand", elem2:"wet_dirty_sand" } + +if (!elements.soda.reactions) { elements.soda.reactions = {} } +elements.soda.reactions.reverse_gravity_liquid = { elem1:"reverse_soda", elem2:"reverse_soda" } + +if (!elements.wall.reactions) { elements.wall.reactions = {} } +elements.wall.reactions.plasma2 = { elem1:"plasma2", elem2:"plasma2" } \ No newline at end of file From 162924c5a9c76c20e6b20fd34b11ff9dd6c69b21 Mon Sep 17 00:00:00 2001 From: GuyWhoGotSpringlocked <163777207+GWhoGS@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:58:32 -0400 Subject: [PATCH 11/13] Purple Guy's Mod v0.1 v0.1 -15 New Elements (5 bombs, 5 liquids, 2 gasses, 2 new walls, and 1 new powder!) -Keep in mind that my knowledge of JS is very low, and I got most of this code from Ryan or other people from the Discord server. --- mods/purple_guys_mod.js | 173 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 mods/purple_guys_mod.js diff --git a/mods/purple_guys_mod.js b/mods/purple_guys_mod.js new file mode 100644 index 00000000..78f4257f --- /dev/null +++ b/mods/purple_guys_mod.js @@ -0,0 +1,173 @@ +elements.super_bomb = { + color: "#551c41", + behavior: [ + "XX|EX:125|XX", + "XX|XX|XX", + "M2|M1 AND EX:125|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + +elements.mega_bomb = { + color: "#736e7e", + behavior: [ + "XX|EX:350|XX", + "XX|XX|XX", + "M2|M1 AND EX:350|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + +elements.ultra_bomb = { + color: "#79910a", + behavior: [ + "XX|EX:500>plasma2|XX", + "XX|XX|XX", + "M2|M1 AND EX:500>plasma2|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + +elements.ice_cream_bomb = { + color: "#ffffff", + behavior: [ + "XX|EX:20>ice_cream|XX", + "XX|XX|XX", + "M2|M1 AND EX:20>ice_cream|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + + +elements.dirty_sand = { + color: ["#a35222", "#a15122", "#7e3f1a", "#f4ba9a", "#fed3ba", "#f2b796"], + behavior: behaviors.POWDER, + category: "Purple Guy's Mod", + state: "solid", + density: 2822 +} + +elements.wet_dirty_sand = { + color: ["#a35210", "#a15110", "#7e3f0a", "#f4ba8a", "#fed2ba", "#f2b784"], + behavior: behaviors.POWDER, + category: "Purple Guy's Mod", + state: "liquid", + density: 2822 +} + +elements.reverse_gravity_liquid = { + color: "#cdd7e2", + behavior: behaviors.AGLIQUID , + category: "Purple Guy's Mod", + state: "liquid", + density: 50 +} + +elements.reverse_soda = { + color: ["#5f2706", "#48230d", "#52250a"], + behavior: behaviors.AGLIQUID , behavior: [ + "M2|M1|M2", + "M2|XX|M2", + "XX|CR:foam%3|XX", + ], + + category: "Purple Guy's Mod", + state: "liquid", + density: 1030 +} + +elements.negatively_dense_liquid = { + color: "#94ffd1", + behavior: behaviors.LIQUID , + category: "Purple Guy's Mod", + state: "liquid", + density: -2000 +} + +elements.plasma2 = { + color: "#caf7ff", + behavior: behaviors.DGAS , + category: "Purple Guy's Mod", + state: "gas", + density: 50000, + temp:500000 +} + +elements.negative_fire = { + color: ["#a6bfc4", "#6bd2e4", "#b8dee4", "#32cae4"], + behavior: behaviors.DGAS , + category: "Purple Guy's Mod", + state: "gas", + density: -0.1, + temp:-20000 +} + +elements.coldest_bomb = { + color: "#fffff0", + behavior: [ + "XX|EX:55>negative_fire|XX", + "XX|XX|XX", + "M2|M1 AND EX:55>negative_fire|M2", + ], + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + excludeRandom: true, + cooldown: defaultCooldown +} + +elements.reinforced_wall = { + color: "#ffff01", + behavior: behaviors.WALL, + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + hardness:10^81 +} + +elements.unreinforced_wall = { + color: "#ffff82", + behavior: behaviors.WALL, + category: "Purple Guy's Mod", + state: "solid", + density: 1300, + hardness:0 +} + +elements.reinforced_liquid_wall = { + color: "#ffff01", + behavior: behaviors.WALL, + category: "Purple Guy's Mod", + state: "liquid", + density: 1300, + hardness:10^81 +} + + +if (!elements.sand.reactions) { elements.sand.reactions = {} } +elements.sand.reactions.dirt = { elem1:"dirty_sand", elem2:"dirty_sand" } + +if (!elements.dirty_sand.reactions) { elements.dirty_sand.reactions = {} } +elements.dirty_sand.reactions.water = { elem1:"wet_dirty_sand", elem2:"wet_dirty_sand" } + +if (!elements.soda.reactions) { elements.soda.reactions = {} } +elements.soda.reactions.reverse_gravity_liquid = { elem1:"reverse_soda", elem2:"reverse_soda" } + +if (!elements.wall.reactions) { elements.wall.reactions = {} } +elements.wall.reactions.plasma2 = { elem1:"plasma2", elem2:"plasma2" } \ No newline at end of file From 070e7bbfa55bb5cf40c622ad7c9cbcf12dce7c27 Mon Sep 17 00:00:00 2001 From: GuyWhoGotSpringlocked <163777207+GWhoGS@users.noreply.github.com> Date: Tue, 19 Mar 2024 13:00:09 -0400 Subject: [PATCH 12/13] Deleted purple_guys_mod.js there was an extra file --- purple_guys_mod.js | 173 --------------------------------------------- 1 file changed, 173 deletions(-) delete mode 100644 purple_guys_mod.js diff --git a/purple_guys_mod.js b/purple_guys_mod.js deleted file mode 100644 index 78f4257f..00000000 --- a/purple_guys_mod.js +++ /dev/null @@ -1,173 +0,0 @@ -elements.super_bomb = { - color: "#551c41", - behavior: [ - "XX|EX:125|XX", - "XX|XX|XX", - "M2|M1 AND EX:125|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - -elements.mega_bomb = { - color: "#736e7e", - behavior: [ - "XX|EX:350|XX", - "XX|XX|XX", - "M2|M1 AND EX:350|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - -elements.ultra_bomb = { - color: "#79910a", - behavior: [ - "XX|EX:500>plasma2|XX", - "XX|XX|XX", - "M2|M1 AND EX:500>plasma2|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - -elements.ice_cream_bomb = { - color: "#ffffff", - behavior: [ - "XX|EX:20>ice_cream|XX", - "XX|XX|XX", - "M2|M1 AND EX:20>ice_cream|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - - -elements.dirty_sand = { - color: ["#a35222", "#a15122", "#7e3f1a", "#f4ba9a", "#fed3ba", "#f2b796"], - behavior: behaviors.POWDER, - category: "Purple Guy's Mod", - state: "solid", - density: 2822 -} - -elements.wet_dirty_sand = { - color: ["#a35210", "#a15110", "#7e3f0a", "#f4ba8a", "#fed2ba", "#f2b784"], - behavior: behaviors.POWDER, - category: "Purple Guy's Mod", - state: "liquid", - density: 2822 -} - -elements.reverse_gravity_liquid = { - color: "#cdd7e2", - behavior: behaviors.AGLIQUID , - category: "Purple Guy's Mod", - state: "liquid", - density: 50 -} - -elements.reverse_soda = { - color: ["#5f2706", "#48230d", "#52250a"], - behavior: behaviors.AGLIQUID , behavior: [ - "M2|M1|M2", - "M2|XX|M2", - "XX|CR:foam%3|XX", - ], - - category: "Purple Guy's Mod", - state: "liquid", - density: 1030 -} - -elements.negatively_dense_liquid = { - color: "#94ffd1", - behavior: behaviors.LIQUID , - category: "Purple Guy's Mod", - state: "liquid", - density: -2000 -} - -elements.plasma2 = { - color: "#caf7ff", - behavior: behaviors.DGAS , - category: "Purple Guy's Mod", - state: "gas", - density: 50000, - temp:500000 -} - -elements.negative_fire = { - color: ["#a6bfc4", "#6bd2e4", "#b8dee4", "#32cae4"], - behavior: behaviors.DGAS , - category: "Purple Guy's Mod", - state: "gas", - density: -0.1, - temp:-20000 -} - -elements.coldest_bomb = { - color: "#fffff0", - behavior: [ - "XX|EX:55>negative_fire|XX", - "XX|XX|XX", - "M2|M1 AND EX:55>negative_fire|M2", - ], - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - excludeRandom: true, - cooldown: defaultCooldown -} - -elements.reinforced_wall = { - color: "#ffff01", - behavior: behaviors.WALL, - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - hardness:10^81 -} - -elements.unreinforced_wall = { - color: "#ffff82", - behavior: behaviors.WALL, - category: "Purple Guy's Mod", - state: "solid", - density: 1300, - hardness:0 -} - -elements.reinforced_liquid_wall = { - color: "#ffff01", - behavior: behaviors.WALL, - category: "Purple Guy's Mod", - state: "liquid", - density: 1300, - hardness:10^81 -} - - -if (!elements.sand.reactions) { elements.sand.reactions = {} } -elements.sand.reactions.dirt = { elem1:"dirty_sand", elem2:"dirty_sand" } - -if (!elements.dirty_sand.reactions) { elements.dirty_sand.reactions = {} } -elements.dirty_sand.reactions.water = { elem1:"wet_dirty_sand", elem2:"wet_dirty_sand" } - -if (!elements.soda.reactions) { elements.soda.reactions = {} } -elements.soda.reactions.reverse_gravity_liquid = { elem1:"reverse_soda", elem2:"reverse_soda" } - -if (!elements.wall.reactions) { elements.wall.reactions = {} } -elements.wall.reactions.plasma2 = { elem1:"plasma2", elem2:"plasma2" } \ No newline at end of file From 4ea46197f49d195c6cf2a7853e3d77641624c6ff Mon Sep 17 00:00:00 2001 From: slweeb <91897291+slweeb@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:36:31 -0400 Subject: [PATCH 13/13] translation --- lang/de.json | 4 -- lang/es.json | 4 -- lang/fr.json | 4 -- lang/hu.json | 4 -- lang/pl.json | 4 -- lang/pt_br.json | 4 -- lang/ru.json | 4 -- lang/template.json | 4 -- lang/tok.json | 4 -- lang/uk.json | 4 -- lang/vi.json | 4 -- lang/zh_cn.json | 128 ++++++++++++++++++++++----------------------- lang/zh_hant.json | 4 -- 13 files changed, 62 insertions(+), 114 deletions(-) diff --git a/lang/de.json b/lang/de.json index 2a365ce0..3e471bd0 100644 --- a/lang/de.json +++ b/lang/de.json @@ -457,18 +457,14 @@ "greek_fire":"Griechisches_Feuer", "fireball":"Feuerball", "rocket":"Rakete", -"sticky_bomb":"Klebrige_bombe", "cold_bomb":"Kalte_bombe", "hot_bomb":"Heiße_bombe", -"electro_bomb":"Electrobombe", -"water_bomb":"Wasserbombe", "antimatter_bomb":"Antimaterie bombe", "party_popper":"Party-Popper", "flashbang":"LichtKnall", "flash":"Lichtschnelle", "smoke_grenade":"Rauchgranate", "landmine":"Landmine", -"cluster_bomb":"Streubomben", "armageddon":"Armageddon", "tesla_coil":"Tesla-Spule", "light_bulb":"Glühbirne", diff --git a/lang/es.json b/lang/es.json index b65d9e78..31123ab2 100644 --- a/lang/es.json +++ b/lang/es.json @@ -457,18 +457,14 @@ "greek_fire":"", "fireball":"", "rocket":"", -"sticky_bomb":"", "cold_bomb":"", "hot_bomb":"", -"electro_bomb":"", -"water_bomb":"", "antimatter_bomb":"", "party_popper":"", "flashbang":"", "flash":"", "smoke_grenade":"", "landmine":"", -"cluster_bomb":"", "armageddon":"", "tesla_coil":"", "light_bulb":"", diff --git a/lang/fr.json b/lang/fr.json index 3a1f936d..e2d0d0af 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -457,18 +457,14 @@ "greek_fire":"Feu grec", "fireball":"Boule de feu", "rocket":"Fusée", -"sticky_bomb":"Bombe collante", "cold_bomb":"Bombe froide", "hot_bomb":"Bombe chaude", -"electro_bomb":"Bombe électro", -"water_bomb":"Bombe à eau", "antimatter_bomb":"Bombe antimatière", "party_popper":"Bombe de table", "flashbang":"Flashbang", "flash":"Éclair", "smoke_grenade":"Grenade fumigène", "landmine":"Mine terrestre", -"cluster_bomb":"Bombe à fragmentation", "armageddon":"Armageddon", "tesla_coil":"Bobine Tesla", "light_bulb":"Ampoule", diff --git a/lang/hu.json b/lang/hu.json index 40e65a67..19ff0198 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -457,18 +457,14 @@ "greek_fire":"görögtűz", "fireball":"tűzgolyó", "rocket":"rakéta", -"sticky_bomb":"ragacsos_bomba", "cold_bomb":"hideg_bomba", "hot_bomb":"forró_bomba", -"electro_bomb":"elektromos_bomba", -"water_bomb":"vízi_bomba", "antimatter_bomb":"antianyag_bomba", "party_popper":"konfetti_durrancs", "flashbang":"villanógránát", "flash":"villanás", "smoke_grenade":"füstgránát", "landmine":"taposóakna", -"cluster_bomb":"kazettás_bomba", "armageddon":"armageddon", "tesla_coil":"teszlatekercs", "light_bulb":"villanykörte", diff --git a/lang/pl.json b/lang/pl.json index 795478c5..645fce31 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -457,18 +457,14 @@ "greek_fire":"ogień_grecki", "fireball":"kula_ognia", "rocket":"rakieta", -"sticky_bomb":"klejąca_bomba", "cold_bomb":"zimna_bomba", "hot_bomb":"gorąca_bomba", -"electro_bomb":"elektro_bomba", -"water_bomb":"bomba_wodna", "antimatter_bomb":"bomba_antymateryjna", "party_popper":"pukawka", "flashbang":"flashbang", "flash":"błysk", "smoke_grenade":"granat_dymny", "landmine":"mina", -"cluster_bomb":"bomba_kasetowa", "armageddon":"armagedon", "tesla_coil":"cewka_tesli", "light_bulb":"żarówka", diff --git a/lang/pt_br.json b/lang/pt_br.json index 1e7a509c..4e3e6ffa 100644 --- a/lang/pt_br.json +++ b/lang/pt_br.json @@ -457,18 +457,14 @@ "greek_fire":"fogo_grego", "fireball":"bola_de_fogo", "rocket":"foguete", -"sticky_bomb":"bomba_pegajosa", "cold_bomb":"bomba_fria", "hot_bomb":"bomba_quente", -"electro_bomb":"bomba_electro", -"water_bomb":"bomba_de_água", "antimatter_bomb":"bomba_antimateria", "party_popper":"popper_de_festa", "flashbang":"granada_de_luz", "flash":"flash", "smoke_grenade":"grenada_de_fumaça", "landmine":"mina_terrestre", -"cluster_bomb":"bomba_coletiva", "armageddon":"armagedom", "tesla_coil":"bobina_de_tesla", "light_bulb":"lampada", diff --git a/lang/ru.json b/lang/ru.json index e1492094..63134399 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -457,18 +457,14 @@ "greek_fire":"", "fireball":"", "rocket":"", -"sticky_bomb":"", "cold_bomb":"", "hot_bomb":"", -"electro_bomb":"", -"water_bomb":"", "antimatter_bomb":"", "party_popper":"", "flashbang":"", "flash":"", "smoke_grenade":"дымовая граната", "landmine":"мина", -"cluster_bomb":"кластерная бомба", "armageddon":"", "tesla_coil":"", "light_bulb":"", diff --git a/lang/template.json b/lang/template.json index 933aac39..0d5eb96e 100644 --- a/lang/template.json +++ b/lang/template.json @@ -457,18 +457,14 @@ "greek_fire": "", "fireball": "", "rocket": "", -"sticky_bomb": "", "cold_bomb": "", "hot_bomb": "", -"electro_bomb": "", -"water_bomb": "", "antimatter_bomb": "", "party_popper": "", "flashbang": "", "flash": "", "smoke_grenade": "", "landmine": "", -"cluster_bomb": "", "armageddon": "", "tesla_coil": "", "light_bulb": "", diff --git a/lang/tok.json b/lang/tok.json index fe6b9257..e1996537 100644 --- a/lang/tok.json +++ b/lang/tok.json @@ -457,18 +457,14 @@ "greek_fire":"", "fireball":"", "rocket":"", -"sticky_bomb":"", "cold_bomb":"", "hot_bomb":"", -"electro_bomb":"", -"water_bomb":"", "antimatter_bomb":"", "party_popper":"", "flashbang":"", "flash":"suno_lili", "smoke_grenade":"", "landmine":"", -"cluster_bomb":"", "armageddon":"", "tesla_coil":"", "light_bulb":"", diff --git a/lang/uk.json b/lang/uk.json index e0469a47..85af6e33 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -457,18 +457,14 @@ "greek_fire":"", "fireball":"", "rocket":"", -"sticky_bomb":"", "cold_bomb":"", "hot_bomb":"", -"electro_bomb":"", -"water_bomb":"", "antimatter_bomb":"", "party_popper":"", "flashbang":"", "flash":"", "smoke_grenade":"", "landmine":"", -"cluster_bomb":"", "armageddon":"", "tesla_coil":"", "light_bulb":"", diff --git a/lang/vi.json b/lang/vi.json index 2e7dc1f6..1afe1c5b 100644 --- a/lang/vi.json +++ b/lang/vi.json @@ -458,18 +458,14 @@ "greek_fire": "Lửa Hi Lạp", "fireball": "Cầu lửa", "rocket": "Tên lửa", -"sticky_bomb": "Bom dính", "cold_bomb": "Bom lạnh", "hot_bomb": "Bom nóng", -"electro_bomb": "Bom điện", -"water_bomb": "Bom nước ", "antimatter_bomb": "Bom phản vật chất", "party_popper": "Pháo giấy", "flashbang": "Bom choáng ", "flash": "Chóp sáng", "smoke_grenade": "Lựu đạn khói", "landmine": "Mìn", -"cluster_bomb": "Bom cụm", "armageddon": "Tận thế", "tesla_coil": "Cuộn tesla", "light_bulb": "Bóng đèn", diff --git a/lang/zh_cn.json b/lang/zh_cn.json index 45c363d8..5ae22f25 100644 --- a/lang/zh_cn.json +++ b/lang/zh_cn.json @@ -40,17 +40,17 @@ "dead_plant":"死植物", "frozen_plant":"冰植物", "grass":"草", -"algae":"", -"concrete":"", +"algae":"藻类", +"concrete":"混凝土", "wall":"墙", "fire":"火", "bomb":"炸弹", "steam":"争气", "ice":"冰", -"rime":"", +"rime":"雾凇", "snow":"雪", "slush":"冰水", -"packed_snow":"", +"packed_snow":"积雪", "wood":"木", "smoke":"烟", "magma":"岩浆", @@ -70,20 +70,20 @@ "flour":"面粉", "wire":"电线", "battery":"电瓶", -"cloner":"", -"sensor":"", -"heater":"", -"cooler":"", +"cloner":"克隆机", +"sensor":"感受器", +"heater":"热机", +"cooler":"冷机", "random":"乱", "image":"图片", -"unpaint":"", -"uncharge":"", -"unburn":"", +"unpaint":"取消画", +"uncharge":"取消电", +"unburn":"取消烧", "smash":"砸", -"filler":"", +"filler":"填料", "lattice":"格子", -"gravel":"lishlish", -"slime":"", +"gravel":"碎石", +"slime":"粘液", "cement":"水泥", "dust":"灰尘", "void":"太虚", @@ -91,7 +91,7 @@ "cell":"细胞", "cancer":"癌", "dna":"DNA", -"plague":"", +"plague":"瘟疫", "worm":"蚯蚓", "frozen_worm":"冰蚯蚓", "flea":"跳蚤", @@ -99,10 +99,10 @@ "ant":"蚂蚁", "fly":"苍蝇", "firefly":"荧光虫", -"hive":"", +"hive":"蜜蜂窝", "bee":"蜜蜂", -"stink_bug":"", -"dead_bug":"", +"stink_bug":"臭虫", +"dead_bug":"死虫", "human":"人", "body":"生体", "head":"头", @@ -113,11 +113,11 @@ "tadpole":"蝌蚪", "fish":"鱼", "frozen_fish":"冰鱼", -"slug":"", +"slug":"蛞蝓", "snail":"蜗牛", -"burner":"", -"superheater":"", -"freezer":"", +"burner":"燃烧机", +"superheater":"过热机", +"freezer":"冷冻机", "pipe":"管", "pipe_wall":"管墙", "ewall":"电墙", @@ -138,47 +138,47 @@ "molten_ash":"熔融灰", "light":"光", "liquid_light":"夜光", -"laser":"", +"laser":"雷射", "ball":"圆圈", -"pointer":"", -"charcoal":"", -"tinder":"", -"sawdust":"", -"hail":"", +"pointer":"指针", +"charcoal":"木炭", +"tinder":"木材", +"sawdust":"锯末", +"hail":"冰雹", "hydrogen":"氢气", "oxygen":"氧气", "nitrogen":"氮气", "helium":"氦气", -"anesthesia":"", +"anesthesia":"麻醉", "ammonia":"氨气", "liquid_ammonia":"氨气液体", -"carbon_dioxide":"", +"carbon_dioxide":"二氧化碳", "oil":"油", -"lamp_oil":"", -"propane":"", -"methane":"", -"liquid_methane":"", -"stained_glass":"", -"molten_stained_glass":"", -"art":"", +"lamp_oil":"灯油", +"propane":"丙烷", +"methane":"甲烷", +"liquid_methane":"液甲烷", +"stained_glass":"彩色玻璃", +"molten_stained_glass":"熔彩色玻璃", +"art":"艺术", "rainbow":"彩虹", -"static":"", -"border":"", +"static":"電干扰", +"border":"边", "clay":"泥土", "clay_soil":"壤土", "brick":"砖", -"ruins":"", +"ruins":"废墟", "porcelain":"瓷", -"sapling":"", -"pinecone":"", -"evergreen":"", -"cactus":"", +"sapling":"树苗", +"pinecone":"松果", +"evergreen":"松树", +"cactus":"仙人掌", "seeds":"种子", "grass_seed":"草种子", -"wheat_seed":"", +"wheat_seed":"麦种子", "straw":"干草", "paper":"纸", -"pollen":"", +"pollen":"花粉", "flower_seed":"", "pistil":"", "petal":"", @@ -258,23 +258,23 @@ "molten_lead":"", "molten_solder":"", "juice":"果汁", -"juice_ice":"", +"juice_ice":"果汁冰", "broth":"汤", "milk":"牛奶", "chocolate_milk":"巧克力牛奶", -"fruit_milk":"", -"pilk":"", +"fruit_milk":"水果牛奶", +"pilk":"气水牛奶", "eggnog":"蛋奶", "egg":"蛋", "yolk":"蛋黄", "hard_yolk":"硬蛋黄", -"nut_milk":"", -"dough":"", -"batter":"", -"homunculus":"", +"nut_milk":"坚果奶", +"dough":"面团", +"batter":"面糊", +"homunculus":"何蒙库鲁兹", "butter":"牛油", "cheese":"芝士", -"rotten_cheese":"", +"rotten_cheese":"腐烂芝士", "chocolate":"巧克力", "grape":"葡萄", "vinegar":"醋", @@ -308,13 +308,13 @@ "nut_meat":"", "nut_butter":"", "jelly":"布丁", -"baking_soda":"", +"baking_soda":"苏打粉", "yogurt":"", "frozen_yogurt":"", "ice_cream":"冰淇凌", "cream":"奶油", "beans":"豆子", -"dry_ice":"", +"dry_ice":"干冰", "nitrogen_ice":"", "particleboard":"皮肤", "skin":"皮肤", @@ -374,7 +374,7 @@ "smog":"", "stench":"", "liquid_stench":"", -"fragrance":"", +"fragrance":"香水", "perfume":"香水", "cyanide":"", "cyanide_gas":"", @@ -408,7 +408,7 @@ "electric":"电", "uranium":"", "molten_uranium":"", -"diamond":"", +"diamond":"钻石", "gold_coin":"硬币", "rust":"", "oxidized_copper":"", @@ -457,18 +457,14 @@ "greek_fire":"", "fireball":"", "rocket":"", -"sticky_bomb":"粘炸弹", "cold_bomb":"冷炸弹", "hot_bomb":"热炸弹", -"electro_bomb":"电炸弹", -"water_bomb":"水炸弹", "antimatter_bomb":"", "party_popper":"", "flashbang":"光榴弹", "flash":"", "smoke_grenade":"烟榴弹", "landmine":"", -"cluster_bomb":"", "armageddon":"", "tesla_coil":"", "light_bulb":"灯泡", @@ -508,7 +504,7 @@ "broth_ice":"", "frozen_vinegar":"", "sauce_ice":"", -"alcohol_ice":"", +"alcohol_ice":"酒冰", "bleach_ice":"", "chlorine_ice":"", "frozen_ink":"", @@ -538,9 +534,9 @@ "sandstorm": "", "caustic_potash": "", "antibomb": "", -"tornado": "", -"earthquake": "", -"tsunami": "", +"tornado": "龙卷风", +"earthquake": "地震", +"tsunami": "海啸", "blaster": "", "propane_ice": "", "molten_caustic_potash": "" diff --git a/lang/zh_hant.json b/lang/zh_hant.json index 0b89f9fb..60f85a5a 100644 --- a/lang/zh_hant.json +++ b/lang/zh_hant.json @@ -457,18 +457,14 @@ "greek_fire":"希臘火", "fireball":"火球", "rocket":"火箭", -"sticky_bomb":"粘炸彈", "cold_bomb":"冷炸彈", "hot_bomb":"熱炸彈", -"electro_bomb":"電炸彈", -"water_bomb":"水炸彈", "antimatter_bomb":"反物質炸彈", "party_popper":"紙屑炸彈", "flashbang":"閃光彈", "flash":"閃光", "smoke_grenade":"煙炸藥", "landmine":"地雷", -"cluster_bomb":"集束炸彈", "armageddon":"世界末日", "tesla_coil":"特斯拉線圈", "light_bulb":"電燈",