From 58d340ba49ce06d4de6a08ea26760e05cdc1fb54 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:56:03 -0500 Subject: [PATCH 01/17] Update jellystone.matitem --- items/materials/jellystone.matitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/materials/jellystone.matitem b/items/materials/jellystone.matitem index 9fea183da6f..94a165683a2 100644 --- a/items/materials/jellystone.matitem +++ b/items/materials/jellystone.matitem @@ -4,7 +4,7 @@ "rarity": "Common", "price": 0, "inventoryIcon": "jellystone.png", - "description": "Unsure how this is possible, but okay.\n^green;Extractable^reset;.", + "description": "Unsure how this is possible, but okay.\n^green;Extractable^reset;, ^orange;Crushable^reset;.", "shortdescription": "Gelatinous Stone", "materialId": 6630 } From 632fc00a975155ce06432fbc1307dd664ee18d01 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:56:48 -0500 Subject: [PATCH 02/17] Update jungledirt1.matitem --- items/materials/jungledirt1.matitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/materials/jungledirt1.matitem b/items/materials/jungledirt1.matitem index 0c239359dcc..6b1fb3beb1a 100644 --- a/items/materials/jungledirt1.matitem +++ b/items/materials/jungledirt1.matitem @@ -10,6 +10,6 @@ 2.0 ], "shortdescription": "Jungle Soil", - "description": "This is some nice soil.\n^green;Extractable^reset;.", + "description": "This is some nice soil.\n^green;Extractable^reset;, ^orange;Siftable^reset;.", "materialId": 6569 } From 5d38d3def03d2eb11594114404abd50c6ddbf738 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:57:23 -0500 Subject: [PATCH 03/17] Update jungledirt2.matitem --- items/materials/jungledirt2.matitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/materials/jungledirt2.matitem b/items/materials/jungledirt2.matitem index 41aec5d72a5..f65d6627489 100644 --- a/items/materials/jungledirt2.matitem +++ b/items/materials/jungledirt2.matitem @@ -10,6 +10,6 @@ 2.0 ], "shortdescription": "Jungle Dirt", - "description": "This is some nice dirt.\n^green;Extractable^reset;.", + "description": "This is some nice dirt.\n^green;Extractable^reset;, ^orange;Siftable^reset;.", "materialId": 6570 } From d55dcee1059e865139da4cde563131eb9369e6c8 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:00:06 -0500 Subject: [PATCH 04/17] Update bloodstonewall.matitem --- items/materials/bloodstonewall.matitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/materials/bloodstonewall.matitem b/items/materials/bloodstonewall.matitem index c55580857c3..01dbe301393 100644 --- a/items/materials/bloodstonewall.matitem +++ b/items/materials/bloodstonewall.matitem @@ -10,6 +10,6 @@ 2.0 ], "shortdescription": "Blood Crystal", - "description": "Contains valuable quietus essence.\n^green;Extractable^reset;.", + "description": "Contains valuable quietus essence.\n^green;Extractable^reset;, ^orange;Crushable^reset;.", "materialId": 6506 } From b1ccfd43175684bdb57ed820e8dbccf5ee51f218 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:02:40 -0500 Subject: [PATCH 05/17] Update centrifuge_recipes.config --- objects/generic/centrifuge_recipes.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index 3d8ba005f0f..4cd092e11db 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -1772,7 +1772,10 @@ "gravelmaterial" : ["common", 2], "drysand" : ["common", 2] - } + }, + "candyblock" :{ + "sugar" : ["rarest", 1] + } }, "itemMapFarm": { From f2ccecbebece87d0e1b786c527f2160c725d6e6e Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:04:05 -0500 Subject: [PATCH 06/17] Add files via upload --- items/materials/candyblock.matitem.patch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/items/materials/candyblock.matitem.patch b/items/materials/candyblock.matitem.patch index 776582cf21d..ab6fe94ff0c 100644 --- a/items/materials/candyblock.matitem.patch +++ b/items/materials/candyblock.matitem.patch @@ -1,7 +1,5 @@ -[ - { - "op": "replace", - "path": "/description", - "value": "Sweet-smelling rock candy!\n^green;Extractable^reset;." - } -] +{ + "op": "replace", + "path": "/description", + "value": "Sweet-smelling rock candy! \n^orange;Crushable^reset;." +} \ No newline at end of file From 59c06f78bdc9351be3c6e992b1a2627034048440 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:10:18 -0500 Subject: [PATCH 07/17] Update supermatter.matitem.patch --- items/materials/supermatter.matitem.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/materials/supermatter.matitem.patch b/items/materials/supermatter.matitem.patch index e1a08e08be0..e735c1a096a 100644 --- a/items/materials/supermatter.matitem.patch +++ b/items/materials/supermatter.matitem.patch @@ -2,7 +2,7 @@ { "op": "replace", "path": "/description", - "value": "A crystal used to power FTL technology. It's still not fully understood.\n^green;Extractable^reset;." + "value": "A crystal used to power FTL technology. It's still not fully understood.\n^green;Extractable^reset;, ^orange;Crushable^reset;." }, { "op": "add", From d128c693ef11e3e37d0e8d2c0340fa0e46d95f6a Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:11:40 -0500 Subject: [PATCH 08/17] Update candyblock.matitem.patch --- items/materials/candyblock.matitem.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/items/materials/candyblock.matitem.patch b/items/materials/candyblock.matitem.patch index ab6fe94ff0c..3b27d936dbe 100644 --- a/items/materials/candyblock.matitem.patch +++ b/items/materials/candyblock.matitem.patch @@ -1,5 +1,7 @@ +] { "op": "replace", "path": "/description", "value": "Sweet-smelling rock candy! \n^orange;Crushable^reset;." -} \ No newline at end of file +} +] From 254f20b4f9f66a0b140b26717860befa120c4757 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:12:05 -0500 Subject: [PATCH 09/17] Update candyblock.matitem.patch --- items/materials/candyblock.matitem.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/items/materials/candyblock.matitem.patch b/items/materials/candyblock.matitem.patch index 3b27d936dbe..1197bbeed94 100644 --- a/items/materials/candyblock.matitem.patch +++ b/items/materials/candyblock.matitem.patch @@ -1,7 +1,7 @@ ] -{ - "op": "replace", - "path": "/description", - "value": "Sweet-smelling rock candy! \n^orange;Crushable^reset;." -} + { + "op": "replace", + "path": "/description", + "value": "Sweet-smelling rock candy! \n^orange;Crushable^reset;." + } ] From c0bd2a35cdcacf17ced43e7c654182ab2f7a9f74 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:36:47 -0500 Subject: [PATCH 10/17] Update glowsandmaterial.matitem --- items/materials/glowsandmaterial.matitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/materials/glowsandmaterial.matitem b/items/materials/glowsandmaterial.matitem index cc478d6ff5b..8da8305f1a4 100644 --- a/items/materials/glowsandmaterial.matitem +++ b/items/materials/glowsandmaterial.matitem @@ -9,7 +9,7 @@ 2.5, 2.0 ], - "description": "An interesting and unusual irradiated sand.\n^blue;+^white;1 ^blue;Fuel^reset;\n^green;Extractable^reset;.", + "description": "An interesting and unusual irradiated sand.\n^blue;+^white;1 ^blue;Fuel^reset;\n^green;Extractable^reset;, ^orange;Siftable^reset;.", "shortdescription": "Glowing Sand", "fuelAmount": 1, "materialId": 6565 From 0c190d2a66acd741a9352f178852468f17a10387 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:37:00 -0500 Subject: [PATCH 11/17] Update centrifuge_recipes.config --- objects/generic/centrifuge_recipes.config | 58 +++++++++++++++++------ 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index 4cd092e11db..7380a565dc6 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -650,16 +650,28 @@ "dirtmaterial" : ["common", 3], "drydirt" : ["common", 3], "drysand" : ["common", 3] + }, + "glowsandmaterial" : { + "irradiumore": ["rarest", 6], + "uraniumore": ["rarest", 6], + "neptuniumore": ["rarest", 6], + "thoriumore": ["rarest", 6], + "liquidirradium": ["rarest", 6], + "volatilepowder": ["rarest", 6], + + "glowfibre": ["rare", 3], + "prisiliteore": ["rare", 3], + "lead": ["rare", 3], + + "crystal": ["uncommon", 3], + "biospore": ["uncommon", 3], + "ff_silicon": ["uncommon", 3], + + "crystalsandmaterial": ["common", 2], + "sand2": ["common", 2] } }, - - - - - - - "itemMapRocks": { "coral2material": { "calciumnitrate": ["rarest", 2], @@ -1740,7 +1752,7 @@ "gravelmaterial": ["rarest", 2], "sand": ["rare", 1] }, - "jellystone" : { + "jellystone" : { "ironore" : ["rarest", 2], "goldore" : ["rarest", 2], @@ -1753,8 +1765,8 @@ "cobblestonematerial" : ["common", 2], "fu_salt" : ["common", 2] - }, - "bloodstonewall" : { + }, + "bloodstonewall" : { "quietusore" : ["rarest", 2], "blooddiamond" : ["rarest", 2], @@ -1765,16 +1777,32 @@ "crystal" : ["common", 2], "bloodsandmaterial" : ["common", 2] - }, - "ferron" : { - "magnetinpowder" : ["uncommon", 2], + }, + "ferron" : { + "magnetinpowder" : ["uncommon", 2], "ironfilings" :["uncommon", 2], "gravelmaterial" : ["common", 2], "drysand" : ["common", 2] - }, - "candyblock" :{ + }, + "candyblock" :{ "sugar" : ["rarest", 1] + }, + "brickmaterial": { + "clay": ["rarest",2], + "gravelmaterial": ["rarest",2], + "sand": ["rare",1] + }, + "supermatter": { + "solidfuel": ["rare", 2], + "liquidfuel": ["rare", 2], + + "crystal": ["uncommon", 2], + "glowsandmaterial" : ["uncommon", 2], + + "crystalsandmaterial": ["common", 3], + "sand2": ["common", 3], + "glasssandmaterial": ["common", 3] } }, From 51c8b6e36a11e67d6ff54d8fd26314d6c0280564 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:40:05 -0500 Subject: [PATCH 12/17] Update candyblock.matitem.patch --- items/materials/candyblock.matitem.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/items/materials/candyblock.matitem.patch b/items/materials/candyblock.matitem.patch index 1197bbeed94..d790a55ba6e 100644 --- a/items/materials/candyblock.matitem.patch +++ b/items/materials/candyblock.matitem.patch @@ -1,7 +1,7 @@ -] +[ { "op": "replace", "path": "/description", - "value": "Sweet-smelling rock candy! \n^orange;Crushable^reset;." + "value": "Sweet-smelling rock candy!\n^green;Extractable^reset;, \n^orange;Crushable^reset;." } ] From 902def12f85b967539c4300560f78e83f967707b Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:42:28 -0500 Subject: [PATCH 13/17] Create brick.matitem.patch --- items/materials/brick.matitem.patch | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 items/materials/brick.matitem.patch diff --git a/items/materials/brick.matitem.patch b/items/materials/brick.matitem.patch new file mode 100644 index 00000000000..5e86cc00e7c --- /dev/null +++ b/items/materials/brick.matitem.patch @@ -0,0 +1,7 @@ +[ +{ + "op": "replace", + "path": "/description", + "value": "Small but perfectly formed bricks made from clay. \n^orange;Crushable^reset;." +} +] From fb1eb91ca05706b2ac88e475ce3f2a1a36410357 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:43:55 -0500 Subject: [PATCH 14/17] Add files via upload --- items/materials/ferron.matitem.patch | 7 +++++++ items/materials/ironfilings.matitem.patch | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 items/materials/ferron.matitem.patch create mode 100644 items/materials/ironfilings.matitem.patch diff --git a/items/materials/ferron.matitem.patch b/items/materials/ferron.matitem.patch new file mode 100644 index 00000000000..0cf0926dd07 --- /dev/null +++ b/items/materials/ferron.matitem.patch @@ -0,0 +1,7 @@ +[ + { + "op": "replace", + "path": "/description", + "value": "A rock containing trace amounts of the finnicky ore rumoured to be used in the manufacture of vivatin.\n^orange;Crushable^reset;." + } +] diff --git a/items/materials/ironfilings.matitem.patch b/items/materials/ironfilings.matitem.patch new file mode 100644 index 00000000000..d82a79a914f --- /dev/null +++ b/items/materials/ironfilings.matitem.patch @@ -0,0 +1,7 @@ +[ + { + "op": "replace", + "path": "/description", + "value": "Iron grains, fine as sand.\n^red;Smeltable^reset;, ^orange;Siftable^reset;." + } +] From 43dc69558284b4f48e6e5a1787cb5e0d92e7ac58 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:50:26 -0500 Subject: [PATCH 15/17] Update isn_arcsmelter.object --- objects/power/isn_arcsmelter/isn_arcsmelter.object | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/objects/power/isn_arcsmelter/isn_arcsmelter.object b/objects/power/isn_arcsmelter/isn_arcsmelter.object index f9ae00769ef..e35e78b8551 100644 --- a/objects/power/isn_arcsmelter/isn_arcsmelter.object +++ b/objects/power/isn_arcsmelter/isn_arcsmelter.object @@ -131,7 +131,8 @@ "treasurehoard" : "money", //Other/Non-FU - "luckycoin" :"luckycoin_khe" + "luckycoin" :"luckycoin_khe", + "ironfilings" : "liquidironfu" }, @@ -223,9 +224,9 @@ "protorockmaterial" : {"fu_nitrogen" : 11,"aliencompound" : 18,"liquidbioooze" : 24,"fu_carbondioxide" : 30}, "rustyblock" : { "fu_carbon" : 26 }, "rustymetal" : { "fu_carbon" : 26 }, - "treasurehoard" : { "goldbar" : 15 } + "treasurehoard" : { "goldbar" : 15 }, //Other/Non-FU - + "ironfilings" : { "ironbar" : 15 } } } From c7c3f0e7145f72846835b4c0303a987209eef428 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 18:11:17 -0500 Subject: [PATCH 16/17] Update fu_blastfurnace.object --- objects/power/fu_blastfurnace/fu_blastfurnace.object | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/objects/power/fu_blastfurnace/fu_blastfurnace.object b/objects/power/fu_blastfurnace/fu_blastfurnace.object index 71339adfcb7..bcda59929cf 100644 --- a/objects/power/fu_blastfurnace/fu_blastfurnace.object +++ b/objects/power/fu_blastfurnace/fu_blastfurnace.object @@ -133,7 +133,8 @@ "treasurehoard" : "money", //Other/Non-FU - "luckycoin":"luckycoin_khe" + "luckycoin":"luckycoin_khe", + "ironfilings" : "liquidironfu" }, @@ -224,9 +225,10 @@ "protorockmaterial": {"fu_nitrogen": 11,"aliencompound": 18,"liquidbioooze": 24,"fu_carbondioxide": 30}, "rustyblock": { "fu_carbon": 26 }, "rustymetal": { "fu_carbon": 26 }, - "treasurehoard": { "goldbar": 5 } + "treasurehoard": { "goldbar": 5 }, //Other/Non-FU + "ironfilings" : { "ironbar" : 15 } } } From af3ebb382cd51c6169aa64fa62d734480b44e776 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Tue, 12 Nov 2024 18:14:28 -0500 Subject: [PATCH 17/17] Update electricfurnace.object --- objects/power/electricfurnace/electricfurnace.object | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/objects/power/electricfurnace/electricfurnace.object b/objects/power/electricfurnace/electricfurnace.object index 725a10b4c30..5982ae50418 100644 --- a/objects/power/electricfurnace/electricfurnace.object +++ b/objects/power/electricfurnace/electricfurnace.object @@ -132,7 +132,8 @@ //"treasurehoard" : "money", //Other/Non-FU - "luckycoin":"luckycoin_khe" + "luckycoin":"luckycoin_khe", + "ironfilings" : "liquidironfu" }, @@ -205,7 +206,7 @@ "mud": { "mudstonematerial": 90 }, "sand": { "fu_carbon": 8 }, "sand2": { "fu_carbon": 8 }, - "retexsand2": { "fu_carbon": 8 }//, + "retexsand2": { "fu_carbon": 8 }, //Tiles (Blast furnace+Arc) //"alienrock": {"fu_nitrogen": 21,"vialproto": 18,"liquidnitrogenitem": 16,"fu_carbondioxide": 30}, @@ -226,6 +227,7 @@ //"treasurehoard": { "silverbar": 48, "goldbar": 48 } //Other/Non-FU + "ironfilings" : { "ironbar" : 15 } } }