From 95ec9bd30717f8ff1af3647603048a69e41d4dd2 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:21:23 -0400 Subject: [PATCH 01/26] Update liquidmetallichydrogen.liqitem --- items/liquids/liquidmetallichydrogen.liqitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/liquids/liquidmetallichydrogen.liqitem b/items/liquids/liquidmetallichydrogen.liqitem index 13c50efe373..77c1afb4e6c 100644 --- a/items/liquids/liquidmetallichydrogen.liqitem +++ b/items/liquids/liquidmetallichydrogen.liqitem @@ -3,7 +3,7 @@ "rarity": "legendary", "category": "liquid", "inventoryIcon": "liquidmetallichydrogen.png", - "description": "Manipulation of ZPE via ^blue;Arc^reset; tech has unlocked liquid state at STP!\n^blue;+^white;32 ^blue;Fuel^reset;", + "description": "Manipulation of ZPE via ^blue;Arc^reset; tech has unlocked liquid state at STP!\n^blue;+^white;32 ^blue;Fuel^reset;, ^yellow;Centrifugable^reset", "shortdescription": "Liquid Metallic Hydrogen", // "learnBlueprintsOnPickup": ["m_hydrogenlavalamp"], "liquid": "metallichydrogenliquid", From e5cd53498803a0a6ad97b9b495efede82733fa7c Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:32:40 -0400 Subject: [PATCH 02/26] Update centrifuge_recipes.config Added Arcana's Ruinous Water. --- objects/generic/centrifuge_recipes.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index b633afe617f..cae1f3a6896 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -1765,6 +1765,11 @@ "liquidsulphuricacid": ["uncommon", 2], "liquidwastewater": ["common", 1] }, + "arcana_liquid_ruinousWater": { + "liquiddarkwater": ["rare", 1], + "fu_carbon": ["uncommon", 1], + "liquidwastewater": ["common", 1] + }, // begin other liquids "liquidorganicsoup": { From 2f08b6bc3492b6d9388bc37f1da4d7be10532ea0 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:34:00 -0400 Subject: [PATCH 03/26] Add files via upload --- liquids/arcana_liquid_arcaneWater.liqitem.patch | 5 +++++ liquids/arcana_liquid_illuminatedWater.liqitem.patch | 5 +++++ liquids/arcana_liquid_neonWater.liqitem.patch | 5 +++++ liquids/arcana_liquid_ruinousWater.liqitem.patch | 5 +++++ liquids/arcana_liquid_viridescentAcid.liqitem.patch | 6 ++++++ 5 files changed, 26 insertions(+) create mode 100644 liquids/arcana_liquid_arcaneWater.liqitem.patch create mode 100644 liquids/arcana_liquid_illuminatedWater.liqitem.patch create mode 100644 liquids/arcana_liquid_neonWater.liqitem.patch create mode 100644 liquids/arcana_liquid_ruinousWater.liqitem.patch create mode 100644 liquids/arcana_liquid_viridescentAcid.liqitem.patch diff --git a/liquids/arcana_liquid_arcaneWater.liqitem.patch b/liquids/arcana_liquid_arcaneWater.liqitem.patch new file mode 100644 index 00000000000..1cffd09fef2 --- /dev/null +++ b/liquids/arcana_liquid_arcaneWater.liqitem.patch @@ -0,0 +1,5 @@ + { + "op": "replace", + "path": "/description", + "value": "A measure of water sprinkled with arcane magic. \n^yellow;Centrifugable^reset;." + } \ No newline at end of file diff --git a/liquids/arcana_liquid_illuminatedWater.liqitem.patch b/liquids/arcana_liquid_illuminatedWater.liqitem.patch new file mode 100644 index 00000000000..5258964a4f2 --- /dev/null +++ b/liquids/arcana_liquid_illuminatedWater.liqitem.patch @@ -0,0 +1,5 @@ + { + "op": "replace", + "path": "/description", + "value": "A pale colored liquid. \n^yellow;Centrifugable^reset;." +} diff --git a/liquids/arcana_liquid_neonWater.liqitem.patch b/liquids/arcana_liquid_neonWater.liqitem.patch new file mode 100644 index 00000000000..146cae76dd8 --- /dev/null +++ b/liquids/arcana_liquid_neonWater.liqitem.patch @@ -0,0 +1,5 @@ +{ + "op": "replace", + "path": "/description", + "value": "A neon colored liquid. \n^yellow;Centrifugable^reset;." +} diff --git a/liquids/arcana_liquid_ruinousWater.liqitem.patch b/liquids/arcana_liquid_ruinousWater.liqitem.patch new file mode 100644 index 00000000000..6c119ec8aba --- /dev/null +++ b/liquids/arcana_liquid_ruinousWater.liqitem.patch @@ -0,0 +1,5 @@ +{ + "op": "replace", + "path": "/description", + "value": "A mysterious dark liquid. \n^yellow;Centrifugable^reset;." +} diff --git a/liquids/arcana_liquid_viridescentAcid.liqitem.patch b/liquids/arcana_liquid_viridescentAcid.liqitem.patch new file mode 100644 index 00000000000..31acd5f2d04 --- /dev/null +++ b/liquids/arcana_liquid_viridescentAcid.liqitem.patch @@ -0,0 +1,6 @@ + +{ + "op": "replace", + "path": "/description", + "value": "A highly acidic liquid, found in Viridescent planets. \n^yellow;Centrifugable^reset;." +} From 493625386ac152874fd6bb0e343f13aae0205986 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:35:08 -0400 Subject: [PATCH 04/26] Update arcana_liquid_viridescentAcid.liqitem.patch --- liquids/arcana_liquid_viridescentAcid.liqitem.patch | 1 - 1 file changed, 1 deletion(-) diff --git a/liquids/arcana_liquid_viridescentAcid.liqitem.patch b/liquids/arcana_liquid_viridescentAcid.liqitem.patch index 31acd5f2d04..83c2e368512 100644 --- a/liquids/arcana_liquid_viridescentAcid.liqitem.patch +++ b/liquids/arcana_liquid_viridescentAcid.liqitem.patch @@ -1,4 +1,3 @@ - { "op": "replace", "path": "/description", From 65cfe2e965f2f606ee1157ba1d2cba3bfd3ca1f0 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:35:28 -0400 Subject: [PATCH 05/26] Update arcana_liquid_arcaneWater.liqitem.patch --- liquids/arcana_liquid_arcaneWater.liqitem.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liquids/arcana_liquid_arcaneWater.liqitem.patch b/liquids/arcana_liquid_arcaneWater.liqitem.patch index 1cffd09fef2..cc48f6fd323 100644 --- a/liquids/arcana_liquid_arcaneWater.liqitem.patch +++ b/liquids/arcana_liquid_arcaneWater.liqitem.patch @@ -2,4 +2,4 @@ "op": "replace", "path": "/description", "value": "A measure of water sprinkled with arcane magic. \n^yellow;Centrifugable^reset;." - } \ No newline at end of file + } From 197f2fe16c4ef6a6c7325c990bc034ab283a0f7a Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:36:58 -0400 Subject: [PATCH 06/26] Update arcana_liquid_arcaneWater.liqitem.patch --- liquids/arcana_liquid_arcaneWater.liqitem.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/liquids/arcana_liquid_arcaneWater.liqitem.patch b/liquids/arcana_liquid_arcaneWater.liqitem.patch index cc48f6fd323..132f75e09a3 100644 --- a/liquids/arcana_liquid_arcaneWater.liqitem.patch +++ b/liquids/arcana_liquid_arcaneWater.liqitem.patch @@ -1,5 +1,5 @@ - { - "op": "replace", - "path": "/description", - "value": "A measure of water sprinkled with arcane magic. \n^yellow;Centrifugable^reset;." - } +{ + "op": "replace", + "path": "/description", + "value": "A measure of water sprinkled with arcane magic. \n^yellow;Centrifugable^reset;." +} From c1f4a1b4526ed7a9e2f5faa429df29abab5e32b5 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:37:17 -0400 Subject: [PATCH 07/26] Update arcana_liquid_illuminatedWater.liqitem.patch --- liquids/arcana_liquid_illuminatedWater.liqitem.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/liquids/arcana_liquid_illuminatedWater.liqitem.patch b/liquids/arcana_liquid_illuminatedWater.liqitem.patch index 5258964a4f2..dac38b1fcb0 100644 --- a/liquids/arcana_liquid_illuminatedWater.liqitem.patch +++ b/liquids/arcana_liquid_illuminatedWater.liqitem.patch @@ -1,5 +1,5 @@ - { - "op": "replace", - "path": "/description", - "value": "A pale colored liquid. \n^yellow;Centrifugable^reset;." +{ + "op": "replace", + "path": "/description", + "value": "A pale colored liquid. \n^yellow;Centrifugable^reset;." } From b6a9a742d56d783341c2a16d659f1697a7ba233a Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:37:57 -0400 Subject: [PATCH 08/26] Update arcana_liquid_neonWater.liqitem.patch --- liquids/arcana_liquid_neonWater.liqitem.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liquids/arcana_liquid_neonWater.liqitem.patch b/liquids/arcana_liquid_neonWater.liqitem.patch index 146cae76dd8..4670802f1dd 100644 --- a/liquids/arcana_liquid_neonWater.liqitem.patch +++ b/liquids/arcana_liquid_neonWater.liqitem.patch @@ -1,5 +1,5 @@ { - "op": "replace", - "path": "/description", - "value": "A neon colored liquid. \n^yellow;Centrifugable^reset;." + "op": "replace", + "path": "/description", + "value": "A neon colored liquid. \n^yellow;Centrifugable^reset;." } From 1a2ffad13ce478146a9c056d2cf413843df53a74 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:38:30 -0400 Subject: [PATCH 09/26] Update arcana_liquid_ruinousWater.liqitem.patch --- liquids/arcana_liquid_ruinousWater.liqitem.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liquids/arcana_liquid_ruinousWater.liqitem.patch b/liquids/arcana_liquid_ruinousWater.liqitem.patch index 6c119ec8aba..71a0ab230e0 100644 --- a/liquids/arcana_liquid_ruinousWater.liqitem.patch +++ b/liquids/arcana_liquid_ruinousWater.liqitem.patch @@ -1,5 +1,5 @@ { - "op": "replace", - "path": "/description", - "value": "A mysterious dark liquid. \n^yellow;Centrifugable^reset;." + "op": "replace", + "path": "/description", + "value": "A mysterious dark liquid. \n^yellow;Centrifugable^reset;." } From afb1f648900c16d8b26180a14a134ab74e3c0a59 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:38:47 -0400 Subject: [PATCH 10/26] Update arcana_liquid_viridescentAcid.liqitem.patch --- liquids/arcana_liquid_viridescentAcid.liqitem.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liquids/arcana_liquid_viridescentAcid.liqitem.patch b/liquids/arcana_liquid_viridescentAcid.liqitem.patch index 83c2e368512..13c7d5a84bb 100644 --- a/liquids/arcana_liquid_viridescentAcid.liqitem.patch +++ b/liquids/arcana_liquid_viridescentAcid.liqitem.patch @@ -1,5 +1,5 @@ { - "op": "replace", - "path": "/description", - "value": "A highly acidic liquid, found in Viridescent planets. \n^yellow;Centrifugable^reset;." + "op": "replace", + "path": "/description", + "value": "A highly acidic liquid, found in Viridescent planets. \n^yellow;Centrifugable^reset;." } From 6810d43e40c42a7aaf259a9c3336c5240695ef2e Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:41:26 -0400 Subject: [PATCH 11/26] Delete liquids/arcana_liquid_arcaneWater.liqitem.patch --- liquids/arcana_liquid_arcaneWater.liqitem.patch | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 liquids/arcana_liquid_arcaneWater.liqitem.patch diff --git a/liquids/arcana_liquid_arcaneWater.liqitem.patch b/liquids/arcana_liquid_arcaneWater.liqitem.patch deleted file mode 100644 index 132f75e09a3..00000000000 --- a/liquids/arcana_liquid_arcaneWater.liqitem.patch +++ /dev/null @@ -1,5 +0,0 @@ -{ - "op": "replace", - "path": "/description", - "value": "A measure of water sprinkled with arcane magic. \n^yellow;Centrifugable^reset;." -} From a0d6618f7b7751b62ed3c006e5f80374e9cbf70d Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:41:33 -0400 Subject: [PATCH 12/26] Delete liquids/arcana_liquid_illuminatedWater.liqitem.patch --- liquids/arcana_liquid_illuminatedWater.liqitem.patch | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 liquids/arcana_liquid_illuminatedWater.liqitem.patch diff --git a/liquids/arcana_liquid_illuminatedWater.liqitem.patch b/liquids/arcana_liquid_illuminatedWater.liqitem.patch deleted file mode 100644 index dac38b1fcb0..00000000000 --- a/liquids/arcana_liquid_illuminatedWater.liqitem.patch +++ /dev/null @@ -1,5 +0,0 @@ -{ - "op": "replace", - "path": "/description", - "value": "A pale colored liquid. \n^yellow;Centrifugable^reset;." -} From f56f7a5fa18538d2be1481daac568bdf8d0cd10d Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:41:43 -0400 Subject: [PATCH 13/26] Delete liquids/arcana_liquid_neonWater.liqitem.patch --- liquids/arcana_liquid_neonWater.liqitem.patch | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 liquids/arcana_liquid_neonWater.liqitem.patch diff --git a/liquids/arcana_liquid_neonWater.liqitem.patch b/liquids/arcana_liquid_neonWater.liqitem.patch deleted file mode 100644 index 4670802f1dd..00000000000 --- a/liquids/arcana_liquid_neonWater.liqitem.patch +++ /dev/null @@ -1,5 +0,0 @@ -{ - "op": "replace", - "path": "/description", - "value": "A neon colored liquid. \n^yellow;Centrifugable^reset;." -} From da20b0d506522dc680239bb87c4a580edd9c9640 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:42:02 -0400 Subject: [PATCH 14/26] Delete liquids/arcana_liquid_ruinousWater.liqitem.patch --- liquids/arcana_liquid_ruinousWater.liqitem.patch | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 liquids/arcana_liquid_ruinousWater.liqitem.patch diff --git a/liquids/arcana_liquid_ruinousWater.liqitem.patch b/liquids/arcana_liquid_ruinousWater.liqitem.patch deleted file mode 100644 index 71a0ab230e0..00000000000 --- a/liquids/arcana_liquid_ruinousWater.liqitem.patch +++ /dev/null @@ -1,5 +0,0 @@ -{ - "op": "replace", - "path": "/description", - "value": "A mysterious dark liquid. \n^yellow;Centrifugable^reset;." -} From 8150c88875a0f065d2bb31edc0d016554ace8e62 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:42:17 -0400 Subject: [PATCH 15/26] Delete liquids/arcana_liquid_viridescentAcid.liqitem.patch --- liquids/arcana_liquid_viridescentAcid.liqitem.patch | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 liquids/arcana_liquid_viridescentAcid.liqitem.patch diff --git a/liquids/arcana_liquid_viridescentAcid.liqitem.patch b/liquids/arcana_liquid_viridescentAcid.liqitem.patch deleted file mode 100644 index 13c7d5a84bb..00000000000 --- a/liquids/arcana_liquid_viridescentAcid.liqitem.patch +++ /dev/null @@ -1,5 +0,0 @@ -{ - "op": "replace", - "path": "/description", - "value": "A highly acidic liquid, found in Viridescent planets. \n^yellow;Centrifugable^reset;." -} From dc74705c002bd2864ce819b5a6d940e00bce1693 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:42:49 -0400 Subject: [PATCH 16/26] Add files via upload Added Arcana liquid descriptions. --- items/liquids/arcana_liquid_arcaneWater.liqitem.patch | 5 +++++ items/liquids/arcana_liquid_illuminatedWater.liqitem.patch | 5 +++++ items/liquids/arcana_liquid_neonWater.liqitem.patch | 5 +++++ items/liquids/arcana_liquid_ruinousWater.liqitem.patch | 5 +++++ items/liquids/arcana_liquid_viridescentAcid.liqitem.patch | 5 +++++ 5 files changed, 25 insertions(+) create mode 100644 items/liquids/arcana_liquid_arcaneWater.liqitem.patch create mode 100644 items/liquids/arcana_liquid_illuminatedWater.liqitem.patch create mode 100644 items/liquids/arcana_liquid_neonWater.liqitem.patch create mode 100644 items/liquids/arcana_liquid_ruinousWater.liqitem.patch create mode 100644 items/liquids/arcana_liquid_viridescentAcid.liqitem.patch diff --git a/items/liquids/arcana_liquid_arcaneWater.liqitem.patch b/items/liquids/arcana_liquid_arcaneWater.liqitem.patch new file mode 100644 index 00000000000..132f75e09a3 --- /dev/null +++ b/items/liquids/arcana_liquid_arcaneWater.liqitem.patch @@ -0,0 +1,5 @@ +{ + "op": "replace", + "path": "/description", + "value": "A measure of water sprinkled with arcane magic. \n^yellow;Centrifugable^reset;." +} diff --git a/items/liquids/arcana_liquid_illuminatedWater.liqitem.patch b/items/liquids/arcana_liquid_illuminatedWater.liqitem.patch new file mode 100644 index 00000000000..dac38b1fcb0 --- /dev/null +++ b/items/liquids/arcana_liquid_illuminatedWater.liqitem.patch @@ -0,0 +1,5 @@ +{ + "op": "replace", + "path": "/description", + "value": "A pale colored liquid. \n^yellow;Centrifugable^reset;." +} diff --git a/items/liquids/arcana_liquid_neonWater.liqitem.patch b/items/liquids/arcana_liquid_neonWater.liqitem.patch new file mode 100644 index 00000000000..4670802f1dd --- /dev/null +++ b/items/liquids/arcana_liquid_neonWater.liqitem.patch @@ -0,0 +1,5 @@ +{ + "op": "replace", + "path": "/description", + "value": "A neon colored liquid. \n^yellow;Centrifugable^reset;." +} diff --git a/items/liquids/arcana_liquid_ruinousWater.liqitem.patch b/items/liquids/arcana_liquid_ruinousWater.liqitem.patch new file mode 100644 index 00000000000..71a0ab230e0 --- /dev/null +++ b/items/liquids/arcana_liquid_ruinousWater.liqitem.patch @@ -0,0 +1,5 @@ +{ + "op": "replace", + "path": "/description", + "value": "A mysterious dark liquid. \n^yellow;Centrifugable^reset;." +} diff --git a/items/liquids/arcana_liquid_viridescentAcid.liqitem.patch b/items/liquids/arcana_liquid_viridescentAcid.liqitem.patch new file mode 100644 index 00000000000..13c7d5a84bb --- /dev/null +++ b/items/liquids/arcana_liquid_viridescentAcid.liqitem.patch @@ -0,0 +1,5 @@ +{ + "op": "replace", + "path": "/description", + "value": "A highly acidic liquid, found in Viridescent planets. \n^yellow;Centrifugable^reset;." +} From dfc681b87b24a20977f11d7add1860a8ee74f44f Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:48:41 -0400 Subject: [PATCH 17/26] Update liquidmetallichydrogen.liqitem --- items/liquids/liquidmetallichydrogen.liqitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/liquids/liquidmetallichydrogen.liqitem b/items/liquids/liquidmetallichydrogen.liqitem index 77c1afb4e6c..d1cbd07701e 100644 --- a/items/liquids/liquidmetallichydrogen.liqitem +++ b/items/liquids/liquidmetallichydrogen.liqitem @@ -3,7 +3,7 @@ "rarity": "legendary", "category": "liquid", "inventoryIcon": "liquidmetallichydrogen.png", - "description": "Manipulation of ZPE via ^blue;Arc^reset; tech has unlocked liquid state at STP!\n^blue;+^white;32 ^blue;Fuel^reset;, ^yellow;Centrifugable^reset", + "description": "Manipulation of ZPE via ^blue;Arc^reset; tech has unlocked liquid state at STP!\n^blue;+^white;32 ^blue;Fuel\n^yellow;Centrifugable^reset;.", "shortdescription": "Liquid Metallic Hydrogen", // "learnBlueprintsOnPickup": ["m_hydrogenlavalamp"], "liquid": "metallichydrogenliquid", From c7fb26e77eca89340faea177efe98c60100a89ae Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:49:39 -0400 Subject: [PATCH 18/26] Update liquiddeuterium.liqitem --- items/liquids/liquiddeuterium.liqitem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/liquids/liquiddeuterium.liqitem b/items/liquids/liquiddeuterium.liqitem index 0bd6263fc9a..5bd15995db9 100644 --- a/items/liquids/liquiddeuterium.liqitem +++ b/items/liquids/liquiddeuterium.liqitem @@ -5,7 +5,7 @@ "category": "liquid", "inventoryIcon": "liquiddeuteriumicon.png", "shortdescription": "Liquid Deuterium", - "description": "A powerful cold-source and thus has many nuclear applications.\n^blue;+^white;5 ^blue;Fuel^reset;", + "description": "A powerful cold-source and thus has many nuclear applications.\n^blue;+^white;5 ^blue;Fuel\n^yellow;Centrifugable^reset;.", "fuelAmount" : 5, // "learnBlueprintsOnPickup": [ // "liquiddeuterium", From 9e284bcac81118020b2f6ba21274a9f1ee545b83 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:07:53 -0400 Subject: [PATCH 19/26] Update centrifuge_recipes.config --- objects/generic/centrifuge_recipes.config | 1 + 1 file changed, 1 insertion(+) diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index cae1f3a6896..ecc22991f7b 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -1766,6 +1766,7 @@ "liquidwastewater": ["common", 1] }, "arcana_liquid_ruinousWater": { + "shadowgasliquid": ["rarest", 1], "liquiddarkwater": ["rare", 1], "fu_carbon": ["uncommon", 1], "liquidwastewater": ["common", 1] From a0c1901799bddba1ad6787437949b37e7c62b9d7 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:11:16 -0400 Subject: [PATCH 20/26] Update centrifuge_recipes.config --- objects/generic/centrifuge_recipes.config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index ecc22991f7b..96cdea0d0c8 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -1765,12 +1765,12 @@ "liquidsulphuricacid": ["uncommon", 2], "liquidwastewater": ["common", 1] }, - "arcana_liquid_ruinousWater": { - "shadowgasliquid": ["rarest", 1], - "liquiddarkwater": ["rare", 1], - "fu_carbon": ["uncommon", 1], - "liquidwastewater": ["common", 1] - }, + "arcana_liquid_ruinousWater": { + "shadowgasliquid": ["rarest", 1], + "liquiddarkwater": ["rare", 1], + "fu_carbon": ["uncommon", 1], + "liquidwastewater": ["common", 1] + }, // begin other liquids "liquidorganicsoup": { From c08d82e4126031648625a4ad088bf697e6e0b132 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Sat, 2 Nov 2024 14:42:25 -0400 Subject: [PATCH 21/26] Update expected_unknown_extraction_inputs.txt --- tests/travis/data/expected_unknown_extraction_inputs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/travis/data/expected_unknown_extraction_inputs.txt b/tests/travis/data/expected_unknown_extraction_inputs.txt index d13a042bfe9..181a00027af 100644 --- a/tests/travis/data/expected_unknown_extraction_inputs.txt +++ b/tests/travis/data/expected_unknown_extraction_inputs.txt @@ -61,6 +61,7 @@ arcana_flowers_windflower arcana_liquid_arcaneWater arcana_liquid_illuminatedWater arcana_liquid_neonWater +arcana_liquid_ruinousWater arcana_liquid_viridescentAcid arcana_ore_animaOre arcana_ore_arcaniumOre From d5eb0c0e2d85e2a7a30b023edffa118725540a21 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Sat, 2 Nov 2024 14:47:39 -0400 Subject: [PATCH 22/26] Update expected_unknown_extraction_inputs.txt --- tests/travis/data/expected_unknown_extraction_inputs.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/travis/data/expected_unknown_extraction_inputs.txt b/tests/travis/data/expected_unknown_extraction_inputs.txt index 181a00027af..2ee5a5add24 100644 --- a/tests/travis/data/expected_unknown_extraction_inputs.txt +++ b/tests/travis/data/expected_unknown_extraction_inputs.txt @@ -116,6 +116,7 @@ eecstrawberryseed eggs experimentalgene farythscale +ferron ferroveriumore frostnucleus fusioncore @@ -125,6 +126,7 @@ greengasbottle hematite hyveriumore ioncell +ironfilings jumpgatecore kelbethide lifebottle From eb3f8ca72aa92afa5cc5990f1993666f0ccb5fde Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:14:51 -0400 Subject: [PATCH 23/26] Update centrifuge_recipes.config --- objects/generic/centrifuge_recipes.config | 1489 +++++++++++---------- 1 file changed, 775 insertions(+), 714 deletions(-) diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index 96cdea0d0c8..a4535f2031d 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -1,5 +1,5 @@ { - "itemMapPowder": { + "itemMapPowder": { "oystershellmaterial": { "sand": ["common", 3], "sand2": ["common", 3], @@ -8,19 +8,19 @@ "cellmatter": ["uncommon", 3], "fu_nitrogen": ["uncommon", 3], "algaegreen": ["uncommon", 3], - + "fu_salt": ["rare", 2], "copperore": ["rare", 2] - }, + }, "bloodsandmaterial": { "liquidblood": ["common", 3], "sand": ["common", 3], "sand2": ["common", 3], - + "cellmatter": ["uncommon", 3], "fu_nitrogen": ["uncommon", 3], "algaegreen": ["uncommon", 3], - + "fu_hydrogen": ["rare", 3], "fu_salt": ["rare", 3], "ironore": ["rare", 3] @@ -29,15 +29,15 @@ "xithriciteore": ["rarest", 3], "liquidaether": ["rarest", 3], "koaniteore": ["rarest", 3], - + "fu_carbon": ["rare", 3], "cellmatter": ["rare", 3], "penumbriteore": ["rare", 3], - + "fu_nitrogen": ["uncommon", 3], "fu_hydrogen": ["uncommon", 3], "titaniumore": ["uncommon", 3], - + "biospore": ["common", 3], "algaegreen": ["common", 3], "fu_salt": ["common", 3] @@ -46,10 +46,11 @@ "bone": ["common", 3], "coralfragment": ["common", 3], "fu_salt": ["common", 3], - + "cellmatter": ["rare", 1], - + "calciumnitrate": ["rarest", 1] + }, "glasssandmaterial": { "biospore": ["rarest", 2], @@ -58,52 +59,51 @@ "fu_nitrogen": ["rare", 3], "calciumnitrate": ["rare", 3], "ff_silicon": ["rare", 3], - + "glass": ["uncommon", 3], "sand2": ["uncommon", 3], "liquidoil": ["uncommon", 3], - - "sand": ["common", 1] + + "sand": ["common", 1] }, "ash": { - "fu_salt": ["rarest", 3], + "fu_salt": ["rarest", 3], "diamond": ["rarest", 3], - "fu_nitrogen": ["rarest", 3], - + "fu_nitrogen": ["rarest", 3], + "fu_hydrogen": ["rare", 3], "fu_carbon": ["rare", 3], "tungstenore": ["rare", 3], - + "ironore": ["uncommon", 3], "corefragmentore": ["uncommon", 3], "copperore": ["uncommon", 3], "coalore": ["common", 1] }, - "bonemealmaterial": { "biospore": ["rarest", 2], "lead": ["rarest", 2], - + "cellmatter": ["rare", 3], "fu_nitrogen": ["rare", 3], "fu_salt": ["rare", 3], - - "sand2": ["uncommon", 3], - "liquidblood": ["uncommon", 3], + + "sand2": ["uncommon", 3], + "liquidblood": ["uncommon", 3], "liquidoil": ["uncommon", 3], - - "bone": ["common", 2] + + "bone": ["common", 2] }, "biogravelmaterial": { - "calciumnitrate": ["rarest", 4], - "ironore": ["rarest", 4], - "tungstenore": ["rarest", 4], - + "calciumnitrate": ["rarest", 4], + "ironore": ["rarest", 4], + "tungstenore": ["rarest", 4], + "fu_salt": ["rare", 3], "cellmatter": ["rare", 3], - "sulphur": ["rare", 3], - + "sulphur": ["rare", 3], + "lead": ["uncommon", 2], "liquidoil": ["uncommon", 2], @@ -111,198 +111,196 @@ }, "sulphurdirtmaterial": { - + "fu_nitrogen": ["rare", 3], "ff_silicon": ["rare", 3], "ironore": ["rare", 3], "copperore": ["uncommon", 2], "liquidsulphuricacid": ["uncommon", 2], - + "cinnabarore": ["common", 3], "lead": ["common", 3], - "sulphur": ["common", 3] - + "sulphur": ["common", 3] + }, "moondust": { "helium3gasliquid": ["rarest", 2], "moonstoneore": ["rarest", 2], - + "ff_silicon": ["rare", 3], "glass": ["rare", 3], "fu_nitrogen": ["rare", 3], - + "fu_hydrogen": ["uncommon", 3], "liquidfuel": ["uncommon", 3], "liquidoil": ["uncommon", 3], - + "solidfuel": ["common", 1] }, "steelashmaterial": { "biospore": ["rarest", 2], "lead": ["rarest", 2], - - "tungstenore": ["rare", 3], + + "tungstenore": ["rare", 3], "fu_nitrogen": ["rare", 3], - "ff_silicon": ["rare", 3], - + "ff_silicon": ["rare", 3], + "sand2": ["uncommon", 2], "liquidoil": ["uncommon", 2], - + "sand": ["common", 2] }, "crystalsandmaterial": { "biospore": ["rarest", 2], "lead": ["rarest", 2], - + "ff_silicon": ["rare", 3], "fu_nitrogen": ["rare", 3], "calciumnitrate": ["rare", 3], - "liquidoil": ["uncommon", 3], + "liquidoil": ["uncommon", 3], "sand2": ["uncommon", 3], - "crystal": ["uncommon", 3], - + "crystal": ["uncommon", 3], + "sand": ["common", 2] }, "ff_spareparts": { - + "cpu": ["rarest", 1], - + "laserdiode": ["rare", 2], "siliconboard": ["rare", 2], - + "silverore": ["uncommon", 3], "stickofram": ["uncommon", 3], "goldore": ["uncommon", 3], - + "ironore": ["common", 3], "tungstenore": ["common", 3], "copperore": ["common", 3] - + }, - "sand": { - "biospore": ["rarest", 2], "lead": ["rarest", 2], - + "fu_nitrogen": ["rare", 3], "volatilepowder": ["rare", 3], "ff_silicon": ["rare", 3], - + "liquidoil": ["uncommon", 1], - - "iodine": ["common", 1] + + "iodine": ["common", 1] }, "corruptdirtmaterial": { "ff_mercury": ["rarest", 1], - + "lead": ["rare", 3], "coalore": ["rare", 3], "fu_salt": ["rare", 3], - - "fu_hydrogen": ["uncommon", 2], + + "fu_hydrogen": ["uncommon", 2], "fleshstrand": ["uncommon", 2], - - "fu_nitrogen": ["common", 1] + + "fu_nitrogen": ["common", 1] }, "clay": { "ironore": ["rarest", 1], - + "magnesiumsulfate": ["rare", 3], "coalore": ["rare", 3], "fu_salt": ["rare", 3], - - "mud": ["uncommon", 2], + + "mud": ["uncommon", 2], "magnesiumore": ["uncommon", 2], - - "dirtmaterial": ["common", 1] - }, + + "dirtmaterial": ["common", 1] + }, "rainbowsandmaterial": { - + "biospore": ["rarest", 2], "lead": ["rarest", 2], - + "ff_silicon": ["rare", 3], "fu_nitrogen": ["rare", 3], "calciumnitrate": ["rare", 3], "sand2": ["uncommon", 2], "liquidoil": ["uncommon", 2], - - "sand": ["common", 2] - - }, - "penumbradirtmaterial": { - "penumbriteore": ["rarest", 1], - - "fu_carbon": ["rare", 2], - "lead": ["rare", 2], - + + "sand": ["common", 2] + + }, + "penumbradirtmaterial": { + "penumbriteore": ["rarest", 1], + + "fu_carbon": ["rare", 2], + "lead": ["rare", 2], + "methanol": ["uncommon", 2], "ammoniumsulfate": ["uncommon", 2], - - "penumbrastonematerial": ["common", 2], + + "penumbrastonematerial": ["common", 2], "fu_hydrogen": ["common", 2] - }, + }, "bioblockmaterial": { "aliencompound": ["rarest", 2], "deuterium": ["rarest", 2], - + "protociteore": ["rare", 2], "vialproto": ["rare", 2], - + "biospore": ["uncommon", 3], "cellmatter": ["uncommon", 3], "fu_carbon": ["uncommon", 3], - + "biodirtmaterial": ["common", 1] - }, + }, "bioblock2material": { "aliencompound": ["rarest", 2], "deuterium": ["rarest", 2], - + "protociteore": ["rare", 2], "vialproto": ["rare", 2], - + "biospore": ["uncommon", 3], "cellmatter": ["uncommon", 3], "fu_carbon": ["uncommon", 3], - + "biodirtmaterial": ["common", 1] - }, - "irradiatedwall": { - "irradiumore": ["rarest", 1], - - "neptuniumore": ["rare", 2], - "thoriumore": ["rare", 2], - + }, + "irradiatedwall": { + "irradiumore": ["rarest", 1], + + "neptuniumore": ["rare", 2], + "thoriumore": ["rare", 2], + "uraniumore": ["uncommon", 3], "plutoniumore": ["uncommon", 3], - "liquidirradium": ["uncommon", 3], - - "toxicwaste": ["common", 2], + "liquidirradium": ["uncommon", 3], + + "toxicwaste": ["common", 2], "fu_hydrogen": ["common", 2] - }, + }, "dirtmaterial": { "tungstenore": ["rarest", 4], "lead": ["rarest", 4], "sulphur": ["rarest", 4], "goldore": ["rarest", 4], - + "corefragmentore": ["rare", 4], "methanol": ["rare", 4], "algaegreen": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "ironore": ["uncommon", 2], - + "sand": ["common", 3], "coalore": ["common", 3], "copperore": ["common", 3] @@ -311,15 +309,15 @@ "lead": ["rarest", 3], "sulphur": ["rarest", 3], "goldore": ["rarest", 3], - + "corefragmentore": ["rare", 4], "copperore": ["rare", 4], "titaniumore": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "tungstenore": ["uncommon", 2], - + "ironore": ["common", 3], "coalore": ["common", 3], "ash": ["common", 3] @@ -327,15 +325,15 @@ "drydirt": { "tungstenore": ["rarest", 2], "goldore": ["rarest", 2], - + "corefragmentore": ["rare", 4], "sulphur": ["rare", 4], "lead": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "ironore": ["uncommon", 2], - + "sand": ["common", 3], "coalore": ["common", 3], "copperore": ["common", 3] @@ -343,29 +341,29 @@ "aliensoil": { "aliencompound": ["rarest", 2], "deuterium": ["rarest", 2], - + "agaranichor": ["rare", 2], "ff_mercury": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 3], "cellmatter": ["uncommon", 3], "blackslimematerial": ["uncommon", 3], - - "algaegreen": ["common", 2], + + "algaegreen": ["common", 2], "liquidalienjuice": ["common", 2] - }, + }, "drysand": { "tungstenore": ["rarest", 2], "goldore": ["rarest", 2], - + "corefragmentore": ["rare", 4], "liquidoil": ["rare", 4], "lead": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "ironore": ["uncommon", 2], - + "sand": ["common", 3], "coalore": ["common", 3], "copperore": ["common", 3] @@ -373,15 +371,15 @@ "chromadirtmaterial": { "durasteelore": ["rarest", 2], "goldore": ["rarest", 2], - + "prisiliteore": ["rare", 4], "fu_carbon": ["rare", 4], "titaniumore": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "tungstenore": ["uncommon", 2], - + "rainbowsandmaterial": ["common", 4], "ironore": ["common", 4], "coalore": ["common", 4], @@ -390,15 +388,15 @@ "swampdirtffmaterial": { "tungstenore": ["rarest", 2], "goldore": ["rarest", 2], - + "corefragmentore": ["rare", 4], "sulphur": ["rare", 4], "lead": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "ironore": ["uncommon", 2], - + "sand": ["common", 3], "algaegreen": ["common", 3], "fu_nitrogen": ["common", 3] @@ -406,15 +404,15 @@ "retexdirt": { "titaniumore": ["rarest", 2], "goldore": ["rarest", 2], - + "corefragmentore": ["rare", 4], "sulphur": ["rare", 4], "lead": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "tungstenore": ["uncommon", 2], - + "sand": ["common", 4], "ironore": ["common", 4], "coalore": ["common", 4], @@ -424,19 +422,19 @@ "icecrystal": ["rarest", 3], "sand": ["rarest", 3], "crystal": ["rarest", 3], - + "fu_nitrogen": ["rare", 3], "fu_salt": ["rare", 3], "cellmatter": ["rare", 3], - + "sulphur": ["uncommon", 2], "liquidoil": ["uncommon", 2], - - "ice": ["common", 1] + + "ice": ["common", 1] }, "steelsand": { "ff_spareparts": ["rarest", 2], - "lead": ["rarest", 2], + "lead": ["rarest", 2], "titaniumore": ["rare", 2], "fu_nitrogen": ["rare", 2], @@ -446,33 +444,32 @@ "ironore": ["common", 3], "sand": ["common", 3], - "tungstenore": ["common", 3] - + "tungstenore": ["common", 3] + }, "sand2": { "biospore": ["rarest", 2], "lead": ["rarest", 2], - + "fu_nitrogen": ["rare", 3], "fu_salt": ["rare", 3], - "ff_silicon": ["rare", 3], + "ff_silicon": ["rare", 3], "liquidoil": ["uncommon", 2], - - "sand": ["common", 2] - + + "sand": ["common", 1] }, "retexsand2": { "biospore": ["rarest", 2], "lead": ["rarest", 2], - + "fu_nitrogen": ["rare", 3], "fu_salt": ["rare", 3], "ff_silicon": ["rare", 3], "liquidoil": ["uncommon", 2], - - "sand": ["common", 2] + + "sand": ["common", 1] }, "gravelmaterial": { "siviteore": ["rarest", 2], @@ -481,10 +478,10 @@ "sulphur": ["rare", 3], "ff_silicon": ["rare", 3], "magnesiumore": ["rare", 3], - + "fu_salt": ["uncommon", 2], - "liquidoil": ["uncommon", 2], - + "liquidoil": ["uncommon", 2], + "asphalt": ["common", 2], "cobblestonematerial": ["common", 2] @@ -531,7 +528,7 @@ "thoriumore": ["rarest", 3], "neptuniumore": ["rarest", 3], "helium3gasliquid": ["rarest", 3], - + "uraniumore": ["rare", 3], "plutoniumore": ["rare", 3], "lead": ["rare", 3], @@ -548,137 +545,182 @@ "lead": ["rarest", 3], "sulphur": ["rarest", 3], "goldore": ["rarest", 3], - + "corefragmentore": ["rare", 4], "methanol": ["rare", 4], "algaegreen": ["rare", 4], "silverore": ["rare", 4], - - "liquidwater": ["uncommon", 3], + + "liquidwater": ["uncommon", 3], "fu_salt": ["uncommon", 3], "ironore": ["uncommon", 3], - + "dirtmaterial": ["common", 3], "coalore": ["common", 3], "copperore": ["common", 3] - }, + }, "magmawall3": { - "fu_nitrogen": ["rarest", 3], + "fu_nitrogen": ["rarest", 3], "fu_salt": ["rarest", 3], "diamond": ["rarest", 3], - + "fu_carbon": ["rare", 3], "tungstenore": ["rare", 3], - "calciumnitrate": ["rare", 3], - + "calciumnitrate": ["rare", 3], + "corefragmentore": ["uncommon", 3], "ironore": ["uncommon", 3], "copperore": ["uncommon", 3], - - "coalore": ["common", 2], - "ammoniumsulfate": ["common", 2] - - }, + + "coalore": ["common", 2], + "ammoniumsulfate": ["common", 2] + + }, "biodirtmaterial": { "aliencompound": ["rarest", 2], "deuterium": ["rarest", 2], - + "protociteore": ["rare", 2], "vialproto": ["rare", 2], - + "biospore": ["uncommon", 3], "cellmatter": ["uncommon", 3], "fu_carbon": ["uncommon", 3], - + "fu_nitrogen": ["common", 1] - }, + }, "mud": { "lead": ["rarest", 3], "sulphur": ["rarest", 3], "goldore": ["rarest", 3], - + "corefragmentore": ["rare", 3], "methanol": ["rare", 3], "silverore": ["rare", 3], - - "algaegreen": ["uncommon", 4], - "liquidwater": ["uncommon", 4], + + "algaegreen": ["uncommon", 4], + "liquidwater": ["uncommon", 4], "fu_salt": ["uncommon", 4], "ironore": ["uncommon", 4], - + "wetdirt": ["common", 3], - "dirtmaterial": ["common", 3], + "dirtmaterial": ["common", 3], "copperore": ["common", 3] - } - }, - - "itemMapRocks": { - "geode": { - "cobblestonematerial" : ["common", 9], - "geodestone" : ["common", 9], - "geodeblock" : ["common", 9], - "aegisaltcrystal" : ["common", 9], - "crystalblock" : ["common", 9], - "purplecrystalmaterial" : ["common", 9], - "crystal" : ["common", 9], - "fu_salt" : ["common", 9], - "coalore" : ["common", 9], - - "ironore": ["uncommon", 14], - "copperore": ["uncommon", 14], - "silverore": ["uncommon", 14], - "goldore": ["uncommon", 14], - "sulphur": ["uncommon", 14], - "lead": ["uncommon", 14], - "fuamberchunk" : ["uncommon", 14], - "titaniumore" : ["uncommon", 14], - "solarishard" : ["uncommon", 14], - "moonstoneore" : ["uncommon", 14], - "penumbriteore" : ["uncommon", 14], - "protociteore" : ["uncommon", 14], - "zerchesiumore" : ["uncommon", 14], - "durasteelore" : ["uncommon", 14], - - "coalsample" : ["rare", 16], - "corefragmentsample" : ["rare", 16], - "erchiuscrystalsample" : ["rare", 16], - "diamondsample" : ["rare", 16], - "ironsample" : ["rare", 16], - "coppersample" : ["rare", 16], - "silversample" : ["rare", 16], - "goldsample" : ["rare", 16], - "tungstensample" : ["rare", 16], - "titaniumsample" : ["rare", 16], - "durasteelsample" : ["rare", 16], - "prisilitesample" : ["rare", 16], - "aegisaltsample" : ["rare", 16], - "feroziumsample" : ["rare", 16], - "violiumsample" : ["rare", 16], - "solariumsample" : ["rare", 16], - - "blooddiamond" : ["rarest", 11], - "corruptionore" : ["rarest", 11], - "quietusore" : ["rarest", 11], - "irradiumore" : ["rarest", 11], - "triangliumore" : ["rarest", 11], - "prisiliteore" : ["rarest", 11], - "solariumore" : ["rarest", 11], - "densiniumore" : ["rarest", 11], - "xithriciteore" : ["rarest", 11], - "pyreiteore" : ["rarest", 11], - "isogenore" : ["rarest", 11] }, - + "jungledirt1material" : { + "ironore": ["rarest", 3], + "sulphur": ["rarest", 3], + "goldore": ["rarest", 3], + + "fu_mulch" : ["rare", 2], + "phosphorus" : ["rare", 2], + + "algaegreen" : ["uncommon", 2], + "biospore" : ["uncommon", 2], + + "wetdirt" : ["common", 3], + "plantfibre" : ["common", 3], + "mud" : ["common", 3] + }, + "jungledirt2material" : { + "ironore": ["rarest", 3], + "sulphur": ["rarest", 3], + "goldore": ["rarest", 3], + + "fu_mulch" : ["rare", 2], + "phosphorus" : ["rare", 2], + + "algaegreen" : ["uncommon", 2], + "biospore" : ["uncommon", 2], + + "wetdirt" : ["common", 3], + "plantfibre" : ["common", 3], + "mud" : ["common", 3] + }, + "ironfilings" :{ + "ff_spareparts": ["rarest", 3], + "coal": ["rarest", 3], + "magnetinpowder" : ["rarest", 3], + + "ironore" : ["rare", 1], + + "brittlemetal" : ["uncommon", 2], + "brittlejunk" : ["uncommon", 2], + + "dirt" : ["common", 3], + "drydirt" : ["common", 3], + "drysand" : ["common", 3] + } + }, + + + + + + + + + "itemMapRocks": { + "coral2material": { + "calciumnitrate": ["rarest", 2], + "cobblestonematerial": ["rarest", 2], + "cellmatter": ["rare", 1], + "bone": ["common", 3], + "coralfragment": ["common", 3], + "fu_salt": ["common", 3] + }, + "geode": { + "cobblestonematerial" : ["common", 8], + "copperore": ["common", 8], + "goldore": ["common", 8], + "silverore": ["common", 8], + "ironore": ["common", 8], + "sulphur": ["common", 8], + "lead": ["common", 8], + "titaniumore" : ["common", 8], + "erchiuscrystalsample" : ["uncommon", 28], + "coalsample" : ["uncommon", 28], + "goldsample" : ["uncommon", 28], + "silversample" : ["uncommon", 28], + "corefragmentsample" : ["uncommon", 28], + "prisilitesample" : ["uncommon", 28], + "solariumsample" : ["uncommon", 28], + "violiumsample" : ["uncommon", 28], + "aegisaltsample" : ["uncommon", 28], + "feroziumsample" : ["uncommon", 28], + "diamondsample" : ["uncommon", 28], + "durasteelsample" : ["uncommon", 28], + "titaniumsample" : ["uncommon", 28], + "tungstensample" : ["uncommon", 28], + "coppersample" : ["uncommon", 28], + "ironsample" : ["uncommon", 28], + "blooddiamond" : ["uncommon", 28], + "penumbriteore" : ["uncommon", 28], + "quietusore" : ["uncommon", 28], + "irradiumore" : ["uncommon", 28], + "solarishard" : ["uncommon", 28], + "fuamberchunk" : ["uncommon", 28], + "protociteore" : ["uncommon", 28], + "zerchesiumore" : ["uncommon", 28], + "moonstoneore" : ["uncommon", 28], + "triangliumore" : ["uncommon", 28], + "prisiliteore" : ["uncommon", 28], + "durasteelore" : ["uncommon", 28], + "densiniumore" : ["rare", 5], + "xithriciteore" : ["rare", 5], + "pyreiteore" : ["rare", 5], + "isogenore" : ["rare", 5], + "corruptionore" : ["rare", 5], + "nocxiumore" : ["rarest", 1] + }, "darkwatercoral": { "bone": ["common", 4], "coralfragment": ["common", 4], "fu_salt": ["common", 4], "liquiddarkwater": ["common", 4], - "cellmatter": ["rare", 1], + "cellmatter": ["rare", 1], "calciumnitrate": ["rarest", 1] - }, - - + }, "darknessmaterial": { "biospore": ["rarest", 3], "liquidoil": ["rarest", 3], @@ -693,16 +735,16 @@ "copperore": ["common", 4], "fu_nitrogen": ["common", 4], "fu_hydrogen": ["common", 4] - }, + }, "coralmaterial": { "bone": ["common", 3], "coralfragment": ["common", 3], "fu_salt": ["common", 3], - + "cellmatter": ["rare", 1], - + "calciumnitrate": ["rarest", 2], - "cobblestonematerial": ["rarest", 2] + "cobblestonematerial": ["rarest", 2] }, "biostonematerial": { "aliencompound": ["rarest", 2], @@ -717,116 +759,122 @@ "alienrock": { "aliencompound": ["rarest", 2], "deuterium": ["rarest", 2], - + "liquidnitrogenitem": ["rare", 2], "vialproto": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 3], "cellmatter": ["uncommon", 3], "fu_carbon": ["uncommon", 3], - - "aliensoil": ["common", 2], + + "aliensoil": ["common", 2], "ff_silicon": ["common", 2] - }, - + }, "sulphurstonematerial": { "neptuniumore": ["rarest", 2], "cinnabarore": ["rarest", 2], - + "phosphorus": ["rare", 2], "ff_mercury": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 3], "copperore": ["uncommon", 3], "liquidsulphuricacid": ["uncommon", 3], - - "sand2": ["common", 2], + + "sand2": ["common", 2], "sulphur": ["common", 2] - }, - - + }, "steelstonematerial": { "titaniumore": ["rarest", 1], - + "fu_carbon": ["rare", 2], "lead": ["rare", 2], - + "tungstenore": ["uncommon", 3], "liquidironfu": ["uncommon", 3], "copperore": ["uncommon", 3], - + "ironore": ["common", 1] - }, - + }, "brittlejunk": { "titaniumore": ["rarest", 1], - + "lead": ["rare", 1], - + "tungstenore": ["uncommon", 2], "ff_spareparts": ["uncommon", 2], - + "ironore": ["common", 1] - }, - + }, "rockbrickmaterial": { "sand": ["uncommon", 2], "sand2": ["uncommon", 2], - - "gravelmaterial": ["common", 2], + + "gravelmaterial": ["common", 2], "cobblestonematerial": ["common", 2] - }, - "stonerubble": { + }, + "stonerubble": { "sand": ["uncommon", 2], "sand2": ["uncommon", 2], - - "gravelmaterial": ["common", 2], + + "gravelmaterial": ["common", 2], "cobblestonematerial": ["common", 2] - }, - + }, + "bioblockmaterial": { + "sand": ["uncommon", 2], + "sand2": ["uncommon", 2], + + "gravelmaterial": ["common", 2], + "cobblestonematerial": ["common", 2] + }, + "bioblock2material": { + "sand": ["uncommon", 2], + "sand2": ["uncommon", 2], + + "gravelmaterial": ["common", 2], + "cobblestonematerial": ["common", 2] + }, "tarstonematerial": { "fu_carbon": ["rarest", 1], - + "fu_carbondioxide": ["rare", 2], - "ironore": ["rare", 2], - + "ironore": ["rare", 2], + "liquidoil": ["uncommon", 2], "liquidblacktar": ["uncommon", 2], - + "tar": ["common", 1] - }, - - + }, "moonstone": { "helium3gasliquid": ["rarest", 2], "moonstoneore": ["rarest", 2], - + "ff_silicon": ["rare", 3], "glass": ["rare", 3], "fu_nitrogen": ["rare", 3], - + "fu_hydrogen": ["uncommon", 3], "liquidfuel": ["uncommon", 3], "liquidoil": ["uncommon", 3], - + "solidfuel": ["common", 2], "moondust": ["common", 2] - }, + }, "moonrock": { "helium3gasliquid": ["rarest", 2], "moonstoneore": ["rarest", 2], - + "ff_silicon": ["rare", 3], "glass": ["rare", 3], "fu_nitrogen": ["rare", 3], - + "fu_hydrogen": ["uncommon", 3], "liquidfuel": ["uncommon", 3], "liquidoil": ["uncommon", 3], - + "solidfuel": ["common", 2], "moondust": ["common", 2] - }, + }, "purplecrystalmaterial": { "emera": ["rarest", 8], "nhydri": ["rarest", 8], @@ -836,30 +884,29 @@ "opul": ["rarest", 8], "kespar": ["rarest", 8], "rekite": ["rarest", 8], - + "crystal": ["rare", 2], "siviteore": ["rare", 2], - + "solarishard": ["uncommon", 3], "ff_silicon": ["uncommon", 3], "solidfuel": ["uncommon", 3], - + "gravelmaterial": ["common", 1] }, "crystalblock": { "icecrystal": ["rarest", 2], "kespar": ["rarest", 2], - + "solarishard": ["rare", 2], "siviteore": ["rare", 2], - + "liquidcrystal": ["uncommon", 3], "ff_silicon": ["uncommon", 3], "crystal": ["uncommon", 3], - + "gravelmaterial": ["common", 1] - }, - + }, "violiumcrystal": { "emera": ["rarest", 8], "nhydri": ["rarest", 8], @@ -869,17 +916,16 @@ "opul": ["rarest", 8], "kespar": ["rarest", 8], "rekite": ["rarest", 8], - + "crystal": ["rare", 2], "siviteore": ["rare", 2], - + "solarishard": ["uncommon", 3], "ff_silicon": ["uncommon", 3], "solidfuel": ["uncommon", 3], - + "gravelmaterial": ["common", 1] - }, - + }, "aegisaltcrystal": { "emera": ["rarest", 8], "nhydri": ["rarest", 8], @@ -889,16 +935,16 @@ "opul": ["rarest", 8], "kespar": ["rarest", 8], "rekite": ["rarest", 8], - + "crystal": ["rare", 2], "siviteore": ["rare", 2], - + "solarishard": ["uncommon", 3], "ff_silicon": ["uncommon", 3], "solidfuel": ["uncommon", 3], - + "gravelmaterial": ["common", 1] - }, + }, "geodeblock": { "emera": ["rarest", 9], "nhydri": ["rarest", 9], @@ -909,17 +955,17 @@ "kespar": ["rarest", 9], "rekite": ["rarest", 9], "diamond": ["rarest", 9], - - + + "crystal": ["rare", 2], "siviteore": ["rare", 2], - + "solarishard": ["uncommon", 3], "ff_silicon": ["uncommon", 3], "geode": ["uncommon", 3], - + "gravelmaterial": ["common", 1] - }, + }, "geodestone": { "emera": ["rarest", 8], "nhydri": ["rarest", 8], @@ -928,633 +974,614 @@ "oceanite": ["rarest", 8], "opul": ["rarest", 8], "kespar": ["rarest", 8], - "rekite": ["rarest", 8], + "rekite": ["rarest", 8], "siviteore": ["rare", 2], - + "solarishard": ["uncommon", 2], "ff_silicon": ["uncommon", 2], - - "crystal": ["common", 2], + + "crystal": ["common", 2], "gravelmaterial": ["common", 2] - }, - + }, "retexcobblestone": { "tungstenore": ["rarest", 2], "goldore": ["rarest", 2], - + "corefragmentore": ["rare", 4], "liquidoil": ["rare", 4], "lead": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "ironore": ["uncommon", 2], - + "gravelmaterial": ["common", 3], "coalore": ["common", 3], "copperore": ["common", 3] - }, + }, "cobblestonematerial": { "tungstenore": ["rarest", 2], "goldore": ["rarest", 2], - + "corefragmentore": ["rare", 4], "liquidoil": ["rare", 4], "lead": ["rare", 4], "silverore": ["rare", 4], - + "fu_salt": ["uncommon", 2], "ironore": ["uncommon", 2], - + "gravelmaterial": ["common", 3], "coalore": ["common", 3], "copperore": ["common", 3] }, - "direstone": { - "tungstenore": ["rarest", 2], - "goldore": ["rarest", 2], - - "corefragmentore": ["rare", 3], - "liquidoil": ["rare", 3], - "lead": ["rare", 3], - - "silverore": ["uncommon", 3], - "copperore": ["uncommon", 3], - "ironore": ["uncommon", 3], - - "cobblestonematerial": ["common", 2], - "gravelmaterial": ["common", 2] - }, "conglomeratematerial": { "goldore": ["rarest", 3], "magnesiumsulfate" : ["rarest", 3], - "volatilepowder": ["rarest", 3], - + "volatilepowder": ["rarest", 3], + "fu_carbon": ["rare", 2], "fu_salt": ["rare", 2], - + "ironore": ["uncommon", 3], - "sulphur": ["uncommon", 3], - "copperore": ["uncommon", 3], - + "sulphur": ["uncommon", 3], + "copperore": ["uncommon", 3], + "corefragmentore": ["uncommon", 3], "coalore": ["common", 3], - "ammoniumsulfate": ["common", 3] + "ammoniumsulfate": ["common", 3] }, "andesitematerial": { "goldore": ["rarest", 2], - "magnesiumpowder": ["rarest", 2], - + "magnesiumpowder": ["rarest", 2], + "crystal": ["rare", 2], - "fu_salt": ["rare", 2], - + "fu_salt": ["rare", 2], + "fu_carbondioxide": ["uncommon", 3], "copperore": ["uncommon", 3], "magnesiumsulfate": ["uncommon", 3], "coalore": ["common", 2], - "ash": ["common", 2] + "ash": ["common", 2] }, "andesite": { "goldore": ["rarest", 2], - "magnesiumpowder": ["rarest", 2], - + "magnesiumpowder": ["rarest", 2], + "crystal": ["rare", 2], - "fu_salt": ["rare", 2], - + "fu_salt": ["rare", 2], + "fu_carbondioxide": ["uncommon", 3], "copperore": ["uncommon", 3], "magnesiumsulfate": ["uncommon", 3], "coalore": ["common", 2], - "ash": ["common", 2] + "ash": ["common", 2] }, "arkosematerial": { "tungstenore": ["rarest", 3], "crystal" : ["rarest", 3], - "fu_salt": ["rarest", 3], - + "fu_salt": ["rarest", 3], + "fu_nitrogen": ["rare", 1], - + "sand2": ["uncommon", 3], "calciumnitrate": ["uncommon", 3], "copperore": ["uncommon", 3], - "drysand": ["common", 1] + "drysand": ["common", 1] }, "chertmaterial": { "silverore": ["rarest", 1], - + "volatilepowder": ["rare", 3], "ff_silicon": ["rare", 3], - "obsidian": ["rare", 3], - + "obsidian": ["rare", 3], + "sand2": ["uncommon", 3], "fu_oxygen": ["uncommon", 3], "ironore": ["uncommon", 3], - "sand": ["common", 1] + "sand": ["common", 1] }, "brittlemetal": { "titaniumore": ["rarest", 1], - + "lead": ["rare", 1], - + "tungstenore": ["uncommon", 2], "ff_spareparts": ["uncommon", 2], - + "ironore": ["common", 1] - }, - + }, "dacitematerial": { "tungstenore": ["rarest", 2], - "calciumnitrate" : ["rarest", 2], - + "calciumnitrate" : ["rarest", 2], + "ammoniumsulfate": ["rare", 2], - "obsidian": ["rare", 2], - + "obsidian": ["rare", 2], + "corefragmentore": ["uncommon", 3], "ironore": ["uncommon", 3], "fu_carbondioxide": ["uncommon", 3], - "magmawall3": ["common", 1] + "magmawall3": ["common", 1] }, "gabbromaterial": { "ff_silicon": ["rarest", 2], - "lead": ["rarest", 2], + "lead": ["rarest", 2], "ammoniumsulfate": ["rare", 2], - "copperore" : ["rare", 2], + "copperore" : ["rare", 2], "cobblestonematerial": ["uncommon", 3], "fu_oxygen": ["uncommon", 3], "magnesiumpowder": ["uncommon", 3], - - "magmawall3": ["common", 1] + + "magmawall3": ["common", 1] }, "gneissmaterial": { "crystal": ["rarest", 2], - "koaniteore": ["rarest", 2], - - "obsidian": ["rare", 2], - "ironore": ["rare", 2], + "koaniteore": ["rarest", 2], + + "obsidian": ["rare", 2], + "ironore": ["rare", 2], "copperore": ["uncommon", 3], "magnesiumsulfate": ["uncommon", 3], "sand": ["uncommon", 3], "coalore": ["common", 2], - "cobblestonematerial": ["common", 2] + "cobblestonematerial": ["common", 2] }, "harrowstone": { "crystal": ["rarest", 2], - "koaniteore": ["rarest", 2], - - "obsidian": ["rare", 2], - "ironore": ["rare", 2], + "koaniteore": ["rarest", 2], + + "obsidian": ["rare", 2], + "ironore": ["rare", 2], "copperore": ["uncommon", 3], "magnesiumsulfate": ["uncommon", 3], "sand": ["uncommon", 3], "coalore": ["common", 2], - "cobblestonematerial": ["common", 2] + "cobblestonematerial": ["common", 2] - }, + }, "gritstonematerial": { "cinnabarore": ["rarest", 2], - "lead": ["rarest", 2], - + "lead": ["rarest", 2], + "ironore": ["rare", 2], - "dirtmaterial": ["rare", 2], - + "dirtmaterial": ["rare", 2], + "drysand": ["uncommon", 3], "coalore": ["uncommon", 3], "copperore": ["uncommon", 3], "sand": ["common", 2], - "sand2": ["common", 2] + "sand2": ["common", 2] }, "mudstonematerial": { "iodine": ["rarest", 2], - "lead": ["rarest", 2], - + "lead": ["rarest", 2], + "fu_carbondioxide": ["rare", 2], "fu_carbon": ["rare", 2], - + "clay": ["uncommon", 3], "drysand": ["uncommon", 3], "copperore": ["uncommon", 3], - + "sand": ["common", 2], - "mud": ["common", 2] + "mud": ["common", 2] }, "limestonematerial": { - "volatilepowder": ["rarest", 1], - + "volatilepowder": ["rarest", 1], + "bugshell": ["rare", 3], "calciumnitrate": ["rare", 3], - "fu_carbon": ["rare", 3], - + "fu_carbon": ["rare", 3], + "fu_salt": ["uncommon", 3], "ash": ["uncommon", 3], "clay": ["uncommon", 3], "fu_carbondioxide": ["common", 2], - "bone": ["common", 2] + "bone": ["common", 2] }, "limestone": { - "volatilepowder": ["rarest", 1], - + "volatilepowder": ["rarest", 1], + "bugshell": ["rare", 3], "calciumnitrate": ["rare", 3], - "fu_carbon": ["rare", 3], - + "fu_carbon": ["rare", 3], + "fu_salt": ["uncommon", 3], "ash": ["uncommon", 3], "clay": ["uncommon", 3], "fu_carbondioxide": ["common", 2], - "bone": ["common", 2] - }, + "bone": ["common", 2] + }, "marestonematerial": { - "durasteelore": ["rarest", 2], - "thoriumore": ["rarest", 2], - + "durasteelore": ["rarest", 2], + "thoriumore": ["rarest", 2], + "coralfragment": ["rare", 2], - "fu_carbon": ["rare", 2], - + "fu_carbon": ["rare", 2], + "iodine": ["uncommon", 3], "coral2material": ["uncommon", 3], - "fu_nitrogen": ["uncommon", 3], - - "liquiddarkwater": ["common", 2], + "fu_nitrogen": ["uncommon", 3], + + "liquiddarkwater": ["common", 2], "darkwatercoral": ["common", 2] - }, + }, "rostonematerial": { - "durasteelore": ["rarest", 2], - "neptuniumore": ["rarest", 2], - + "durasteelore": ["rarest", 2], + "neptuniumore": ["rarest", 2], + "magnesiumpowder": ["rare", 2], "fu_carbon": ["rare", 2], - + "fu_nitrogen": ["uncommon", 3], "iodine": ["uncommon", 3], "coral2material": ["uncommon", 3], - + "liquiddarkwater": ["common", 2], "darkwatercoral": ["common", 2] }, "blaststone": { "goldore": ["rarest", 2], - "crystal" : ["rarest", 2], - + "crystal" : ["rarest", 2], + "silverore": ["rare", 2], - "volatilepowder": ["rare", 2], - + "volatilepowder": ["rare", 2], + "fu_carbon": ["uncommon", 4], "liquidlava": ["uncommon", 4], "copperore": ["uncommon", 4], - "ironore": ["uncommon", 4], - + "ironore": ["uncommon", 4], + "corefragmentore": ["common", 2], - "cobblestonematerial": ["common", 2] - + "cobblestonematerial": ["common", 2] }, "meteoriterock": { "moonstoneore": ["rarest", 2], - "helium3gasliquid" : ["rarest", 2], - + "helium3gasliquid" : ["rarest", 2], + "silverore": ["rare", 2], - "goldore": ["rare", 2], - + "goldore": ["rare", 2], + "fu_carbon": ["uncommon", 3], "tungstenore": ["uncommon", 3], "volatilepowder": ["uncommon", 3], - + "ff_silicon": ["common", 2], - "ironore": ["common", 2] + "ironore": ["common", 2] - }, + }, "whitemeteorite": { "icecrystal": ["rarest", 2], - "helium3gasliquid" : ["rarest", 2], - + "helium3gasliquid" : ["rarest", 2], + "silverore": ["rare", 2], - "crystal": ["rare", 2], - + "crystal": ["rare", 2], + "fu_carbon": ["uncommon", 3], "opul": ["uncommon", 3], "volatilepowder": ["uncommon", 3], - + "ff_silicon": ["common", 3], - "ironore": ["common", 3], - "fu_salt": ["common", 3] + "ironore": ["common", 3], + "fu_salt": ["common", 3] - }, + }, "obsidian": { "goldore": ["rarest", 2], - "silverore" : ["rarest", 2], - + "silverore" : ["rarest", 2], + "fu_carbon": ["rare", 2], - "ff_silicon": ["rare", 2], - + "ff_silicon": ["rare", 2], + "copperore": ["uncommon", 2], "crystal": ["uncommon", 2], + + "liquidlava": ["common", 1] - "liquidlava": ["common", 1] - - }, + }, "penumbrastonematerial": { "iodine": ["rarest", 2], - "titaniumore" : ["rarest", 2], - + "titaniumore" : ["rarest", 2], + "penumbriteore": ["rare", 2], - "ff_silicon": ["rare", 2], - + "ff_silicon": ["rare", 2], + "liquiddarkwater": ["uncommon", 2], "ammoniumsulfate": ["uncommon", 2], - - "penumbradirtmaterial": ["common", 2], + + "penumbradirtmaterial": ["common", 2], "fu_hydrogen": ["common", 2] - }, - "irradiatedwall2": { - "irradiumore": ["rarest", 1], - - "neptuniumore": ["rare", 3], - "thoriumore": ["rare", 3], - "liquidirradium": ["rare", 3], - + }, + "irradiatedwall2": { + "irradiumore": ["rarest", 1], + + "neptuniumore": ["rare", 3], + "thoriumore": ["rare", 3], + "liquidirradium": ["rare", 3], + "uraniumore": ["uncommon", 2], "plutoniumore": ["uncommon", 2], - - "irradiatedwall": ["common", 2], + + "irradiatedwall": ["common", 2], "fu_hydrogen": ["common", 2] - }, - "irradiatedwall3": { - "irradiumore": ["rarest", 1], - - "neptuniumore": ["rare", 3], - "thoriumore": ["rare", 3], + }, + "irradiatedwall3": { + "irradiumore": ["rarest", 1], + + "neptuniumore": ["rare", 3], + "thoriumore": ["rare", 3], "liquidirradium": ["rare", 3], - + "uraniumore": ["uncommon", 2], "plutoniumore": ["uncommon", 2], - - "irradiatedwall": ["common", 2], + + "irradiatedwall": ["common", 2], "fu_hydrogen": ["common", 2] - }, + }, "sandstonematerial": { "iodine": ["rarest", 2], - "tungstenore": ["rarest", 2], - - "fu_carbon": ["rare", 2], + "tungstenore": ["rarest", 2], + + "fu_carbon": ["rare", 2], "ff_silicon": ["rare", 2], - + "liquidoil": ["uncommon", 2], "copperore": ["uncommon", 2], "drysand": ["common", 3], - "sand2": ["common", 3], - "sand": ["common", 3] + "sand2": ["common", 3], + "sand": ["common", 3] }, "frozenstonematerial": { "prisiliteore": ["rarest", 2], "titaniumore": ["rarest", 2], - + "goldore": ["rare", 3], "tungstenore": ["rare", 3], "ff_silicon": ["rare", 3], - + "icecrystal": ["uncommon", 3], - "magnesiumpowder": ["uncommon", 3], + "magnesiumpowder": ["uncommon", 3], "liquidnitrogenitem": ["uncommon", 3], - - "ironore": ["common", 1] - }, + + "ironore": ["common", 1] + }, "ice": { - "fu_salt": ["rarest", 1], - - "fu_hydrogen": ["rare", 2], + "fu_salt": ["rarest", 1], + + "fu_hydrogen": ["rare", 2], "fu_oxygen": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 2], "fu_nitrogen": ["uncommon", 2], - "liquidwater": ["common", 1] - - }, + "liquidwater": ["common", 1] + }, "frozenwater": { - "fu_salt": ["rarest", 1], - - "fu_hydrogen": ["rare", 2], + "fu_salt": ["rarest", 1], + + "fu_hydrogen": ["rare", 2], "fu_oxygen": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 2], "fu_nitrogen": ["uncommon", 2], - "liquidwater": ["common", 1] + "liquidwater": ["common", 1] - }, + }, "iceblock4material": { - "fu_salt": ["rarest", 2], - "liquidnitrogenitem": ["rarest", 2], - - "fu_hydrogen": ["rare", 2], + "fu_salt": ["rarest", 2], + "liquidnitrogenitem": ["rarest", 2], + + "fu_hydrogen": ["rare", 2], "fu_oxygen": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 2], "fu_nitrogen": ["uncommon", 2], - "liquidwater": ["common", 1] + "liquidwater": ["common", 1] - }, + }, "iceblock3material": { - "fu_salt": ["rarest", 2], - "liquidnitrogenitem": ["rarest", 2], - - "fu_hydrogen": ["rare", 2], + "fu_salt": ["rarest", 2], + "liquidnitrogenitem": ["rarest", 2], + + "fu_hydrogen": ["rare", 2], "fu_oxygen": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 2], "fu_nitrogen": ["uncommon", 2], - "liquidwater": ["common", 1] + "liquidwater": ["common", 1] - }, + }, "iceblock2material": { - "fu_salt": ["rarest", 2], - "liquidnitrogenitem": ["rarest", 2], - - "fu_hydrogen": ["rare", 2], + "fu_salt": ["rarest", 2], + "liquidnitrogenitem": ["rarest", 2], + + "fu_hydrogen": ["rare", 2], "fu_oxygen": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 2], "fu_nitrogen": ["uncommon", 2], - "liquidwater": ["common", 1] + "liquidwater": ["common", 1] - }, + }, "iceblock1material": { - "fu_salt": ["rarest", 2], - "liquidnitrogenitem": ["rarest", 2], - - "fu_hydrogen": ["rare", 2], + "fu_salt": ["rarest", 2], + "liquidnitrogenitem": ["rarest", 2], + + "fu_hydrogen": ["rare", 2], "fu_oxygen": ["rare", 2], - + "fu_carbondioxide": ["uncommon", 2], "fu_nitrogen": ["uncommon", 2], - "liquidwater": ["common", 1] + "liquidwater": ["common", 1] }, "magmawall2": { - "fu_nitrogen": ["rarest", 2], + "fu_nitrogen": ["rarest", 2], "fu_salt": ["rarest", 2], - + "fu_carbon": ["rare", 2], - "calciumnitrate": ["rare", 2], - + "calciumnitrate": ["rare", 2], + "corefragmentore": ["uncommon", 3], "ironore": ["uncommon", 3], "copperore": ["uncommon", 3], - - "coalore": ["common", 2], - "ammoniumsulfate": ["common", 2] - - }, + + "coalore": ["common", 2], + "ammoniumsulfate": ["common", 2] + + }, "magmawall1": { - "fu_nitrogen": ["rarest", 2], + "fu_nitrogen": ["rarest", 2], "fu_salt": ["rarest", 2], - + "fu_carbon": ["rare", 2], - "calciumnitrate": ["rare", 2], - + "calciumnitrate": ["rare", 2], + "corefragmentore": ["uncommon", 3], "ironore": ["uncommon", 3], "copperore": ["uncommon", 3], - - "coalore": ["common", 2], - "ammoniumsulfate": ["common", 2] - - }, + + "coalore": ["common", 2], + "ammoniumsulfate": ["common", 2] + + }, "magmawall4": { - "fu_nitrogen": ["rarest", 2], + "fu_nitrogen": ["rarest", 2], "fu_salt": ["rarest", 2], - + "fu_carbon": ["rare", 2], - "calciumnitrate": ["rare", 2], - + "calciumnitrate": ["rare", 2], + "corefragmentore": ["uncommon", 3], "ironore": ["uncommon", 3], "copperore": ["uncommon", 3], - - "coalore": ["common", 2], - "ammoniumsulfate": ["common", 2] - - }, + + "coalore": ["common", 2], + "ammoniumsulfate": ["common", 2] + + }, "redhotcobblestone": { - "fu_nitrogen": ["rarest", 2], + "fu_nitrogen": ["rarest", 2], "fu_salt": ["rarest", 2], - + "fu_carbon": ["rare", 2], - "calciumnitrate": ["rare", 2], - + "calciumnitrate": ["rare", 2], + "corefragmentore": ["uncommon", 3], "ironore": ["uncommon", 3], "copperore": ["uncommon", 3], - - "coalore": ["common", 3], - "liquidlava": ["common", 3], - "ammoniumsulfate": ["common", 3] - - }, + + "coalore": ["common", 3], + "liquidlava": ["common", 3], + "ammoniumsulfate": ["common", 3] + + }, "protorockmaterial": { - "nocxiumore": ["rarest", 2], + "nocxiumore": ["rarest", 2], "corruptionore": ["rarest", 2], - + "lead": ["rare", 3], - "ff_mercury": ["rare", 3], - "prisiliteore": ["rare", 3], - + "ff_mercury": ["rare", 3], + "prisiliteore": ["rare", 3], + "aliencompound": ["uncommon", 3], "ironore": ["uncommon", 3], "liquidelderfluid": ["uncommon", 3], - "fu_nitrogen": ["common", 3], - "liquidbioooze": ["common", 3], - "fu_carbon": ["common", 3] - + "fu_nitrogen": ["common", 3], + "liquidbioooze": ["common", 3], + "fu_carbon": ["common", 3] + }, "wastestone": { - "tungstenore": ["rarest", 1], - + "tungstenore": ["rarest", 1], + "ff_mercury": ["rare", 2], - "lead": ["rare", 2], - + "lead": ["rare", 2], + "cinnabarore": ["uncommon", 3], "ironore": ["uncommon", 3], "sulphur": ["uncommon", 3], - - "fu_salt": ["common", 3], - "liquidsulphuricacid": ["common", 3], + + "fu_salt": ["common", 3], + "liquidsulphuricacid": ["common", 3], "sand": ["common", 3] }, "darkstonematerial": { "iodine": ["rarest", 2], - "titaniumore" : ["rarest", 2], - + "titaniumore" : ["rarest", 2], + "penumbriteore": ["rare", 2], - "ff_silicon": ["rare", 2], - + "ff_silicon": ["rare", 2], + "liquiddarkwater": ["uncommon", 2], "ff_mercury": ["uncommon", 2], - - "magmawall3": ["common", 2], + + "magmawall3": ["common", 2], "fu_hydrogen": ["common", 2] }, "shadowblock": { "iodine": ["rarest", 2], - "nocxiumore" : ["rarest", 2], - + "nocxiumore" : ["rarest", 2], + "corruptionore": ["rare", 2], - "ff_silicon": ["rare", 2], - + "ff_silicon": ["rare", 2], + "liquiddarkwater": ["uncommon", 2], "ff_mercury": ["uncommon", 2], - - "liquidelderfluid": ["common", 2], + + "liquidelderfluid": ["common", 2], "fu_hydrogen": ["common", 2] - }, + }, "fumossyrock2": { "goldore": ["rarest", 2], "corefragmentore": ["rarest", 2], - + "liquidoil": ["rare", 2], "silverore": ["rare", 2], - + "fu_salt": ["uncommon", 3], "ironore": ["uncommon", 3], "algaegreen": ["uncommon", 3], - - "plantfibre": ["common", 4], + + "plantfibre": ["common", 4], "gravelmaterial": ["common", 4], "coalore": ["common", 4], "copperore": ["common", 4] @@ -1562,31 +1589,31 @@ "grassyrock": { "goldore": ["rarest", 2], "corefragmentore": ["rarest", 2], - + "liquidoil": ["rare", 2], "silverore": ["rare", 2], - + "fu_salt": ["uncommon", 3], "ironore": ["uncommon", 3], "algaegreen": ["uncommon", 3], - - "plantfibre": ["common", 4], + + "plantfibre": ["common", 4], "gravelmaterial": ["common", 4], "coalore": ["common", 4], "copperore": ["common", 4] - }, + }, "junglestonematerial": { "goldore": ["rarest", 2], "titaniumore": ["rarest", 2], - + "liquidoil": ["rare", 2], "fu_carbon": ["rare", 2], - + "copperore": ["uncommon", 3], "ironore": ["uncommon", 3], "algaegreen": ["uncommon", 3], - - "plantfibre": ["common", 4], + + "plantfibre": ["common", 4], "gravelmaterial": ["common", 4], "coalore": ["common", 4], "fu_nitrogen": ["common", 4] @@ -1594,131 +1621,160 @@ "biorock": { "irradiumore": ["rarest", 2], "prisiliteore": ["rarest", 2], - + "icecrystal": ["rare", 2], "fu_carbon": ["rare", 2], - + "volatilepowder": ["uncommon", 3], "liquidirradium": ["uncommon", 3], "crystal": ["uncommon", 3], - - "rainbowsandmaterial": ["common", 3], + + "rainbowsandmaterial": ["common", 3], "chromadirtmaterial": ["common", 3], "biospore": ["common", 3] }, "biorock2": { "irradiumore": ["rarest", 2], "prisiliteore": ["rarest", 2], - + "icecrystal": ["rare", 2], "fu_carbon": ["rare", 2], - + "volatilepowder": ["uncommon", 3], "liquidirradium": ["uncommon", 3], "crystal": ["uncommon", 3], - - "rainbowsandmaterial": ["common", 3], + + "rainbowsandmaterial": ["common", 3], "chromadirtmaterial": ["common", 3], "biospore": ["common", 3] }, "greyslate": { "tungstenore": ["rarest", 2], "goldore": ["rarest", 2], - + "sulphur": ["rare", 3], "lead": ["rare", 3], "ff_silicon": ["rare", 3], - + "fu_salt": ["uncommon", 2], "liquidoil": ["uncommon", 2], - + "gravelmaterial": ["common", 3], "coalore": ["common", 3], "sand2": ["common", 3] }, "magmarock": { - "tungstenore" : ["rarest", 1], - + "tungstenore" : ["rarest", 1], + "fu_carbon": ["rare", 3], "ff_silicon": ["rare", 3], - - "copperore": ["uncommon", 2], + + "copperore": ["uncommon", 2], "volatilepowder": ["uncommon", 2], - "ironore": ["common", 3], + "ironore": ["common", 3], "liquidlava": ["common", 3], - "ammoniumsulfate": ["common", 3] + "ammoniumsulfate": ["common", 3] }, "bloodstonewall2": { "quietusore": ["rarest", 2], - "blooddiamond" : ["rarest", 2], - + "blooddiamond" : ["rarest", 2], + "lead": ["rare", 2], - "ff_mercury": ["rare", 2], - + "ff_mercury": ["rare", 2], + "bone": ["uncommon", 3], "liquidpus": ["uncommon", 3], "cellmatter": ["uncommon", 3], - + "fleshstrand": ["common", 2], - "liquidblood": ["common", 2] + "liquidblood": ["common", 2] }, "hiveoldmaterial": { - "larva": ["rarest", 2], - "ff_silicon": ["rarest", 2], - - "bugshell": ["rare", 2], - "liquidpus": ["rare", 2], - - "fleshstrand": ["uncommon", 1], - - "gravelmaterial": ["common", 3], - "fleshblock": ["common", 3], - "liquidblood": ["common", 3] - }, + "larva": ["rarest", 2], + "ff_silicon": ["rarest", 2], + + "bugshell": ["rare", 2], + "liquidpus": ["rare", 2], + + "fleshstrand": ["uncommon", 1], + + "gravelmaterial": ["common", 3], + "fleshblock": ["common", 3], + "liquidblood": ["common", 3] + }, "fuaetherstone" : { - "retexaetherdust": ["rarest", 2], - "liquidaether": ["rarest", 2], - - "biodirtmaterial": ["rare", 3], - "aliencompound": ["rare", 3], - "biospore": ["rare", 3], - - "biogravelmaterial": ["uncommon", 3], - "sand2": ["uncommon", 3], - "cobblestonematerial": ["uncommon", 3], - - "sand": ["common", 2], - "gravelmaterial": ["common", 2] - }, + "retexaetherdust": ["rarest", 2], + "liquidaether": ["rarest", 2], + + "biodirtmaterial": ["rare", 3], + "aliencompound": ["rare", 3], + "biospore": ["rare", 3], + + "biogravelmaterial": ["uncommon", 3], + "sand2": ["uncommon", 3], + "cobblestonematerial": ["uncommon", 3], + + "sand": ["common", 2], + "gravelmaterial": ["common", 2] + }, "asphalt" : { - "liquidblacktar": ["rarest", 2], - "tarstonematerial": ["rarest", 2], - - "cobblestonematerial": ["rare", 2], - "fu_carbon": ["rare", 2], - - "sand": ["uncommon", 1], - - "gravelmaterial": ["common", 1] - }, - + "liquidblacktar": ["rarest", 2], + "tarstonematerial": ["rarest", 2], + + "cobblestonematerial": ["rare", 2], + "fu_carbon": ["rare", 2], + + "sand": ["uncommon", 1], + + "gravelmaterial": ["common", 1] + }, "concretematerial" : { - "sand2": ["rarest", 2], - "gravelmaterial": ["rarest", 2], - "sand": ["rare", 1] - }, - - "outpostwall1" : { - "sand2": ["rarest", 2], - "gravelmaterial": ["rarest", 2], - - "sand": ["rare", 1] - } - }, - - + "sand2": ["rarest", 2], + "gravelmaterial": ["rarest", 2], + "sand": ["rare", 1] + }, + "outpostwall1" : { + "sand2": ["rarest", 2], + "gravelmaterial": ["rarest", 2], + "sand": ["rare", 1] + }, + "jellystone" : { + "ironore" : ["rarest", 2], + "goldore" : ["rarest", 2], + + "copperore" : ["rare", 3], + "ff_mercury" : ["rare", 3], + "liquidhealing" : ["rare", 3], + + "greenslime" : ["uncommon", 2], + "liquidslime" : ["uncommon", 2], + + "cobblestonematerial" : ["common", 2], + "fu_salt" : ["common", 2] + }, + "bloodstonewall" : { + "quietusore" : ["rarest", 2], + "blooddiamond" : ["rarest", 2], + + "bloodstonewall2" : ["rare", 2], + "ff_silicon" : ["rare", 2], + + "liquidblood" : ["uncommon", 1], + + "crystal" : ["common", 2], + "bloodsandmaterial" : ["common", 2] + }, + "ferron" : { + "magnetinpowder" : ["uncommon", 2], + "ironfilings" :["uncommon", 2], + + "gravelmaterial" : ["common", 2], + "drysand" : ["common", 2] + } + }, + "itemMapFarm": { "milk": { "cheese": ["common", 1] @@ -1731,7 +1787,7 @@ "liquidwastewater": { "liquidwater": ["rare", 1], "fu_hydrogen": ["normal", 2], - "fu_oxygen": ["normal", 2] + "fu_oxygen": ["normal", 2] } }, "itemMapLiquids": { @@ -1746,35 +1802,35 @@ "sulphur": ["uncommon", 1], "fu_nitrogen": ["common", 1] }, - - // begin Arcana liquids - "arcana_liquid_arcaneWater": { - "arcana_essence_arcaneEssence": ["rarest", 1], - "liquidwater": ["uncommon", 1] - }, - "arcana_liquid_illuminatedWater": { - "arcana_essence_illuminatedEssence": ["rarest", 1], - "liquidwater": ["uncommon", 1] - }, - "arcana_liquid_neonWater": { - "arcana_essence_superstormEssence": ["rarest", 1], - "liquidwater": ["uncommon", 1] - }, - "arcana_liquid_viridescentAcid": { - "liquidpoison": ["uncommon", 2], - "liquidsulphuricacid": ["uncommon", 2], - "liquidwastewater": ["common", 1] - }, - "arcana_liquid_ruinousWater": { - "shadowgasliquid": ["rarest", 1], - "liquiddarkwater": ["rare", 1], - "fu_carbon": ["uncommon", 1], - "liquidwastewater": ["common", 1] - }, + + // begin Arcana liquids + "arcana_liquid_arcaneWater": { + "arcana_essence_arcaneEssence": ["rarest", 1], + "liquidwater": ["uncommon", 1] + }, + "arcana_liquid_illuminatedWater": { + "arcana_essence_illuminatedEssence": ["rarest", 1], + "liquidwater": ["uncommon", 1] + }, + "arcana_liquid_neonWater": { + "arcana_essence_superstormEssence": ["rarest", 1], + "liquidwater": ["uncommon", 1] + }, + "arcana_liquid_viridescentAcid": { + "liquidpoison": ["uncommon", 2], + "liquidsulphuricacid": ["uncommon", 2], + "liquidwastewater": ["common", 1] + }, + "arcana_liquid_ruinousWater": { + "shadowgasliquid": ["rarest", 1], + "liquiddarkwater": ["rare", 1], + "fu_carbon": ["uncommon", 1], + "liquidwastewater": ["common", 1] + }, // begin other liquids "liquidorganicsoup": { - "cellmatter": ["rare", 1], + "cellmatter": ["rare", 1], "liquidwastewater": ["common", 2] }, "liquidelderfluid": { @@ -1804,7 +1860,7 @@ }, "liquidpus": { "liquidbioooze": ["common", 2], - "liquidwastewater": ["common", 2] + "liquidwastewater": ["common", 2] }, "liquidironfu": { "ironore": ["common", 1], @@ -1835,14 +1891,14 @@ "liquiddarkwater": ["rarest", 1], "magnesiumore": ["rare", 1], "fu_hydrogen": ["normal", 2], - "fu_oxygen": ["normal", 2] - }, + "fu_oxygen": ["normal", 2] + }, "liquiddarkwater": { "fu_carbon": ["rare", 3], "deuterium": ["rare", 3], "fu_hydrogen": ["normal", 2], "magnesiumore": ["rare", 3], - "fu_oxygen": ["normal", 2], + "fu_oxygen": ["normal", 2], "liquidwastewater": ["common", 2] }, "liquidblacktar": { @@ -1870,7 +1926,7 @@ "fu_hydrogen": ["common", 2], "tungstenore": ["uncommon", 2], "fu_carbon": ["uncommon", 2], - "lead": ["rare", 1] + "lead": ["rare", 1] }, "fu_liquidhoney": { "liquidwastewater": ["common", 2], @@ -1948,7 +2004,13 @@ }, "vialproto": { "protociteore": ["rare", 1], - "liquidwastewater": ["common", 2] + "liquidwastewater": ["common", 1] + }, + "blackslimematerial": { + "blobbushjelly" : ["rare", 2], + "liquiddarkwater" : ["rare", 2], + "liquidpoison" : ["uncommon", 1], + "liquidwastewater" : ["common", 1] } }, "itemMapBees": { @@ -2121,7 +2183,6 @@ "fu_hydrogen": ["common", 2] } }, - "recipeTypes": { "bees": ["itemMapFarm", "itemMapBees"], "liquid": ["itemMapFarm", "itemMapBees", "itemMapLiquids"], @@ -2136,4 +2197,4 @@ "rocks": ["itemMapRocks"], "precursor": ["itemMapPowder","itemMapRocks"] } -} + } From ffc0dc5b5530543348bda4adef27500317b3bcfa Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:24:29 -0400 Subject: [PATCH 24/26] Update centrifuge_recipes.config --- objects/generic/centrifuge_recipes.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index a4535f2031d..67ccb87a4b1 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -639,7 +639,7 @@ }, "ironfilings" :{ "ff_spareparts": ["rarest", 3], - "coal": ["rarest", 3], + "coal": ["rarest", 3], "magnetinpowder" : ["rarest", 3], "ironore" : ["rare", 1], From 20212bb0270aab93173974783221a7aa85a1b953 Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:30:14 -0400 Subject: [PATCH 25/26] Update centrifuge_recipes.config --- objects/generic/centrifuge_recipes.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index 67ccb87a4b1..3d8ba005f0f 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -624,8 +624,8 @@ }, "jungledirt2material" : { "ironore": ["rarest", 3], - "sulphur": ["rarest", 3], - "goldore": ["rarest", 3], + "sulphur": ["rarest", 3], + "goldore": ["rarest", 3], "fu_mulch" : ["rare", 2], "phosphorus" : ["rare", 2], @@ -639,7 +639,7 @@ }, "ironfilings" :{ "ff_spareparts": ["rarest", 3], - "coal": ["rarest", 3], + "coalore": ["rarest", 3], "magnetinpowder" : ["rarest", 3], "ironore" : ["rare", 1], @@ -647,7 +647,7 @@ "brittlemetal" : ["uncommon", 2], "brittlejunk" : ["uncommon", 2], - "dirt" : ["common", 3], + "dirtmaterial" : ["common", 3], "drydirt" : ["common", 3], "drysand" : ["common", 3] } From e98faa90868f40ad60baa753815d7e8b4065ebfc Mon Sep 17 00:00:00 2001 From: Argenttip <49217312+Argenttip@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:10:38 -0400 Subject: [PATCH 26/26] Update expected_unknown_item_codes.txt --- tests/travis/data/expected_unknown_item_codes.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/travis/data/expected_unknown_item_codes.txt b/tests/travis/data/expected_unknown_item_codes.txt index f5ca91ffd85..c4b8a5819bf 100644 --- a/tests/travis/data/expected_unknown_item_codes.txt +++ b/tests/travis/data/expected_unknown_item_codes.txt @@ -4,6 +4,8 @@ arcana_essence_superstormEssence bee_pesterer_drone bee_pesterer_queen bee_pordratetch_queen +ironfilings +magnetinpowder pandorasboxaqueyeaf pandorasboxautumnbopaf pandorasboxautumnbopbulb