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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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 ac9f3703f9a7ca6310ff9982363202a8d7e342ae Mon Sep 17 00:00:00 2001 From: kaeud <97579413+kaeudomt@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:36:54 +0700 Subject: [PATCH 09/12] Add files via upload --- mods/WhisperingTheory.js | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 mods/WhisperingTheory.js diff --git a/mods/WhisperingTheory.js b/mods/WhisperingTheory.js new file mode 100644 index 00000000..7e4b0205 --- /dev/null +++ b/mods/WhisperingTheory.js @@ -0,0 +1,55 @@ +/* TODO +- [x] powder heater & coller +- [ ] block roomtemp +- [ ] no smoke from cold fire +*/ + +elements.powder_heater = { + category: "machines", + behavior: [ + "XX|HT:2|XX", + "HT:2|XX|HT:2", + "M2|HT:2 AND M1|M2", + ], + color: "#881111", + insulate: true, +} + +elements.powder_cooler = { + category: "machines", + behavior: [ + "XX|CO:2|XX", + "CO:2|XX|CO:2", + "M2|CO:2 AND M1|M2", + ], + color: "#111188", + insulate: true, +} + +elements.powder_superheater = { + category: "machines", + behavior: [ + "XX|HT:10|XX", + "HT:10|XX|HT:10", + "M2|HT:10 AND M1|M2", + ], + color: "#dd1111", + insulate: true, +} + +elements.powder_freeze = { + category: "machines", + behavior: [ + "XX|CO:10|XX", + "CO:10|XX|CO:10", + "M2|CO:10 AND M1|M2", + ], + color: "#1111dd", + insulate: true, +} + +elements.cold_fire.behavior = [ + "M1|M1|M1", + "M2|DL%8|M2", + "XX|M2|XX", +] \ No newline at end of file From ebeed6314161cef442da2d5397a36724d3ed2b12 Mon Sep 17 00:00:00 2001 From: kaeud <97579413+kaeudomt@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:43:55 +0700 Subject: [PATCH 10/12] Delete mods/WhisperingTheory.js --- mods/WhisperingTheory.js | 55 ---------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 mods/WhisperingTheory.js diff --git a/mods/WhisperingTheory.js b/mods/WhisperingTheory.js deleted file mode 100644 index 7e4b0205..00000000 --- a/mods/WhisperingTheory.js +++ /dev/null @@ -1,55 +0,0 @@ -/* TODO -- [x] powder heater & coller -- [ ] block roomtemp -- [ ] no smoke from cold fire -*/ - -elements.powder_heater = { - category: "machines", - behavior: [ - "XX|HT:2|XX", - "HT:2|XX|HT:2", - "M2|HT:2 AND M1|M2", - ], - color: "#881111", - insulate: true, -} - -elements.powder_cooler = { - category: "machines", - behavior: [ - "XX|CO:2|XX", - "CO:2|XX|CO:2", - "M2|CO:2 AND M1|M2", - ], - color: "#111188", - insulate: true, -} - -elements.powder_superheater = { - category: "machines", - behavior: [ - "XX|HT:10|XX", - "HT:10|XX|HT:10", - "M2|HT:10 AND M1|M2", - ], - color: "#dd1111", - insulate: true, -} - -elements.powder_freeze = { - category: "machines", - behavior: [ - "XX|CO:10|XX", - "CO:10|XX|CO:10", - "M2|CO:10 AND M1|M2", - ], - color: "#1111dd", - insulate: true, -} - -elements.cold_fire.behavior = [ - "M1|M1|M1", - "M2|DL%8|M2", - "XX|M2|XX", -] \ No newline at end of file From d3ebf7dc9ce96ff7db2f3667ff8f69c5f6e5b05d Mon Sep 17 00:00:00 2001 From: kaeud <97579413+kaeudomt@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:44:48 +0700 Subject: [PATCH 11/12] WhisperingTheory beta 1 uncompleted idk how to use custom js --- mods/WhisperingTheory.js | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 mods/WhisperingTheory.js diff --git a/mods/WhisperingTheory.js b/mods/WhisperingTheory.js new file mode 100644 index 00000000..7e4b0205 --- /dev/null +++ b/mods/WhisperingTheory.js @@ -0,0 +1,55 @@ +/* TODO +- [x] powder heater & coller +- [ ] block roomtemp +- [ ] no smoke from cold fire +*/ + +elements.powder_heater = { + category: "machines", + behavior: [ + "XX|HT:2|XX", + "HT:2|XX|HT:2", + "M2|HT:2 AND M1|M2", + ], + color: "#881111", + insulate: true, +} + +elements.powder_cooler = { + category: "machines", + behavior: [ + "XX|CO:2|XX", + "CO:2|XX|CO:2", + "M2|CO:2 AND M1|M2", + ], + color: "#111188", + insulate: true, +} + +elements.powder_superheater = { + category: "machines", + behavior: [ + "XX|HT:10|XX", + "HT:10|XX|HT:10", + "M2|HT:10 AND M1|M2", + ], + color: "#dd1111", + insulate: true, +} + +elements.powder_freeze = { + category: "machines", + behavior: [ + "XX|CO:10|XX", + "CO:10|XX|CO:10", + "M2|CO:10 AND M1|M2", + ], + color: "#1111dd", + insulate: true, +} + +elements.cold_fire.behavior = [ + "M1|M1|M1", + "M2|DL%8|M2", + "XX|M2|XX", +] \ No newline at end of file From d2e2900007a971a3b337793cf4112a4f493f766e Mon Sep 17 00:00:00 2001 From: kaeud <97579413+kaeudomt@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:20:51 +0700 Subject: [PATCH 12/12] WhisperingTheory.js v1 everything done --- mods/WhisperingTheory.js | 42 +++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/mods/WhisperingTheory.js b/mods/WhisperingTheory.js index 7e4b0205..ad41280b 100644 --- a/mods/WhisperingTheory.js +++ b/mods/WhisperingTheory.js @@ -1,7 +1,7 @@ /* TODO - [x] powder heater & coller -- [ ] block roomtemp -- [ ] no smoke from cold fire +- [x] block roomtemp +- [x] no smoke from cold fire */ elements.powder_heater = { @@ -13,7 +13,7 @@ elements.powder_heater = { ], color: "#881111", insulate: true, -} +}; elements.powder_cooler = { category: "machines", @@ -24,7 +24,7 @@ elements.powder_cooler = { ], color: "#111188", insulate: true, -} +}; elements.powder_superheater = { category: "machines", @@ -35,7 +35,7 @@ elements.powder_superheater = { ], color: "#dd1111", insulate: true, -} +}; elements.powder_freeze = { category: "machines", @@ -46,10 +46,38 @@ elements.powder_freeze = { ], color: "#1111dd", insulate: true, -} +}; + +elements.roomtemper = { + color: "#29632f", + behavior: behaviors.WALL, + tick: function(pixel) { + 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(pixelMap[x][y].temp < -230) { + pixelMap[x][y].temp = (pixelMap[x][y].temp + 7) + } else if(pixelMap[x][y].temp > 270) { + pixelMap[x][y].temp = (pixelMap[x][y].temp - 7) + } else if (pixelMap[x][y].temp < 20) { + pixelMap[x][y].temp = (pixelMap[x][y].temp + 2) + } else if (pixelMap[x][y].temp > 20) { + pixelMap[x][y].temp = (pixelMap[x][y].temp - 2) + } + } + } + }, + category:"machines", + state:"solid", + insulate: true, + noMix: true, + movable: false, +}, elements.cold_fire.behavior = [ "M1|M1|M1", "M2|DL%8|M2", "XX|M2|XX", -] \ No newline at end of file +]