From d955cf13d064744bb709ce28ccd52efd46bab0ef Mon Sep 17 00:00:00 2001
From: MrDraMaster <37799858+MrDraMaster@users.noreply.github.com>
Date: Thu, 1 Sep 2022 05:04:55 +0200
Subject: [PATCH] [Magiclysm] allow adept weapons as recipe tools (#60633)

* add technomancer adept weapon as tool alongside normal version

* add magus adept weapon as tool alongside normal version

* add animist adept weapon as tool alongside normal version
---
 data/mods/Magiclysm/recipes/mods.json         | 20 +++++--
 .../Magiclysm/recipes/recipe_potions.json     | 52 ++++++++++++++++---
 data/mods/Magiclysm/recipes/weapons.json      | 12 +++--
 3 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/data/mods/Magiclysm/recipes/mods.json b/data/mods/Magiclysm/recipes/mods.json
index 8d188db6fdd8c..ee85048268d2b 100644
--- a/data/mods/Magiclysm/recipes/mods.json
+++ b/data/mods/Magiclysm/recipes/mods.json
@@ -11,7 +11,7 @@
     "time": "2 m 36 s",
     "book_learn": [ [ "techno_basic", 4 ] ],
     "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ],
-    "tools": [ [ [ "rune_technomancer", -1 ], [ "rune_technomancer_weapon", -1 ] ] ],
+    "tools": [ [ [ "rune_technomancer", -1 ], [ "rune_technomancer_weapon", -1 ], [ "rune_technomancer_weapon_adept", -1 ] ] ],
     "components": [ [ [ "filter_liquid", 1 ], [ "muffler", 1 ] ], [ [ "pipe", 1 ] ], [ [ "scrap", 2 ] ], [ [ "glow_dust", 1 ] ] ]
   },
   {
@@ -27,7 +27,14 @@
     "book_learn": [ [ "techno_basic", 5 ] ],
     "using": [ [ "soldering_standard", 20 ], [ "surface_heat", 20 ], [ "plastic_molding", 2 ] ],
     "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "CHEM", "level": 2 }, { "id": "MANA_INFUSE", "level": 1 } ],
-    "tools": [ [ [ "rune_alchemist", -1 ], [ "rune_technomancer", -1 ], [ "rune_technomancer_weapon", -1 ] ] ],
+    "tools": [
+      [
+        [ "rune_alchemist", -1 ],
+        [ "rune_technomancer", -1 ],
+        [ "rune_technomancer_weapon", -1 ],
+        [ "rune_technomancer_weapon_adept", -1 ]
+      ]
+    ],
     "components": [
       [ [ "plastic_chunk", 2 ] ],
       [ [ "amplifier", 1 ] ],
@@ -54,7 +61,14 @@
     "book_learn": [ [ "techno_basic", 4 ] ],
     "using": [ [ "soldering_standard", 10 ] ],
     "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
-    "tools": [ [ [ "rune_technomancer", -1 ], [ "rune_technomancer_weapon", -1 ], [ "rune_alchemist", -1 ] ] ],
+    "tools": [
+      [
+        [ "rune_technomancer", -1 ],
+        [ "rune_technomancer_weapon", -1 ],
+        [ "rune_technomancer_weapon_adept", -1 ],
+        [ "rune_alchemist", -1 ]
+      ]
+    ],
     "components": [
       [ [ "amplifier", 1 ] ],
       [ [ "power_supply", 1 ] ],
diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json
index df438ba07ca84..f6460d5f175a0 100644
--- a/data/mods/Magiclysm/recipes/recipe_potions.json
+++ b/data/mods/Magiclysm/recipes/recipe_potions.json
@@ -137,7 +137,15 @@
     "batch_time_factors": [ 50, 4 ],
     "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ], [ "rune_magus_weapon", -1 ] ] ],
+    "tools": [
+      [ [ "surface_heat", 10, "LIST" ] ],
+      [
+        [ "rune_alchemist", -1 ],
+        [ "rune_magus", -1 ],
+        [ "rune_magus_weapon", -1 ],
+        [ "rune_magus_weapon_adept", -1 ]
+      ]
+    ],
     "proficiencies": [ { "proficiency": "prof_alchemy" } ],
     "components": [
       [ [ "potion_starter", 5 ] ],
@@ -172,7 +180,15 @@
     "batch_time_factors": [ 50, 4 ],
     "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ], [ "rune_magus_weapon", -1 ] ] ],
+    "tools": [
+      [ [ "surface_heat", 10, "LIST" ] ],
+      [
+        [ "rune_alchemist", -1 ],
+        [ "rune_magus", -1 ],
+        [ "rune_magus_weapon", -1 ],
+        [ "rune_magus_weapon_adept", -1 ]
+      ]
+    ],
     "components": [ [ [ "potion_starter", 5 ] ], [ [ "sinew", 40 ] ], [ [ "adrenal_gland_large", 2 ] ] ]
   },
   {
@@ -189,7 +205,15 @@
     "batch_time_factors": [ 50, 4 ],
     "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ], [ "rune_magus_weapon", -1 ] ] ],
+    "tools": [
+      [ [ "surface_heat", 10, "LIST" ] ],
+      [
+        [ "rune_alchemist", -1 ],
+        [ "rune_magus", -1 ],
+        [ "rune_magus_weapon", -1 ],
+        [ "rune_magus_weapon_adept", -1 ]
+      ]
+    ],
     "components": [
       [ [ "potion_starter", 5 ] ],
       [
@@ -239,7 +263,15 @@
     "batch_time_factors": [ 50, 4 ],
     "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ], [ "rune_magus_weapon", -1 ] ] ],
+    "tools": [
+      [ [ "surface_heat", 10, "LIST" ] ],
+      [
+        [ "rune_alchemist", -1 ],
+        [ "rune_magus", -1 ],
+        [ "rune_magus_weapon", -1 ],
+        [ "rune_magus_weapon_adept", -1 ]
+      ]
+    ],
     "components": [
       [ [ "potion_starter", 5 ] ],
       [ [ "brain", 2 ], [ "brain_cooked", 2 ] ],
@@ -270,7 +302,12 @@
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
     "tools": [
       [ [ "surface_heat", 10, "LIST" ] ],
-      [ [ "rune_alchemist", -1 ], [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ] ]
+      [
+        [ "rune_alchemist", -1 ],
+        [ "rune_animist", -1 ],
+        [ "rune_animist_weapon", -1 ],
+        [ "rune_animist_weapon_adept", -1 ]
+      ]
     ],
     "components": [ [ [ "potion_starter", 5 ] ], [ [ "edible_blood", 3, "LIST" ] ], [ [ "slime_scrap", 4 ], [ "meat_tainted", 12 ] ] ]
   },
@@ -289,7 +326,10 @@
     "batch_time_factors": [ 50, 4 ],
     "book_learn": [ [ "necro_basic", 5 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ] ] ],
+    "tools": [
+      [ [ "surface_heat", 10, "LIST" ] ],
+      [ [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ], [ "rune_animist_weapon_adept", -1 ] ]
+    ],
     "components": [
       [ [ "potion_starter", 5 ] ],
       [ [ "edible_blood", 5, "LIST" ] ],
diff --git a/data/mods/Magiclysm/recipes/weapons.json b/data/mods/Magiclysm/recipes/weapons.json
index 13818d344ecac..3124ee75e61a8 100644
--- a/data/mods/Magiclysm/recipes/weapons.json
+++ b/data/mods/Magiclysm/recipes/weapons.json
@@ -361,7 +361,9 @@
     "result_mult": 3,
     "book_learn": [ [ "necro_basic", 3 ] ],
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT_FINE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
-    "tools": [ [ [ "rune_alchemist", -1 ], [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ] ] ],
+    "tools": [
+      [ [ "rune_alchemist", -1 ], [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ], [ "rune_animist_weapon_adept", -1 ] ]
+    ],
     "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [
       [ [ "brain", 1 ], [ "brain_cooked", 1 ] ],
@@ -393,7 +395,9 @@
       { "id": "HAMMER_FINE", "level": 1 },
       { "id": "MANA_INFUSE", "level": 1 }
     ],
-    "tools": [ [ [ "rune_alchemist", -1 ], [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ] ] ],
+    "tools": [
+      [ [ "rune_alchemist", -1 ], [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ], [ "rune_animist_weapon_adept", -1 ] ]
+    ],
     "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [
       [ [ "brain", 1 ], [ "brain_cooked", 1 ] ],
@@ -420,7 +424,7 @@
     "result_mult": 3,
     "book_learn": [ [ "necro_basic", 6 ] ],
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT_FINE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
-    "tools": [ [ [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ] ] ],
+    "tools": [ [ [ "rune_animist", -1 ], [ "rune_animist_weapon", -1 ], [ "rune_animist_weapon_adept", -1 ] ] ],
     "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [
       [ [ "brain", 1 ], [ "brain_cooked", 1 ] ],
@@ -454,7 +458,7 @@
       { "id": "SCREW_FINE", "level": 1 },
       { "id": "MANA_INFUSE", "level": 1 }
     ],
-    "tools": [ [ [ "rune_technomancer", -1 ], [ "rune_technomancer_weapon", -1 ] ] ],
+    "tools": [ [ [ "rune_technomancer", -1 ], [ "rune_technomancer_weapon", -1 ], [ "rune_technomancer_weapon_adept", -1 ] ] ],
     "byproducts": [ [ "splinter", 4 ] ],
     "//": "Splinters from stock",
     "components": [ [ [ "leather", 4 ] ], [ [ "pipe_double_shotgun", 1 ], [ "shotgun_d", 1 ] ], [ [ "scrap", 8 ] ] ]