Change Magiclysm recipe proficiencies to simplified format (#45036)

CleverRaven · Oct 25, 2020 · 8e5a544 · 8e5a544
1 parent 0d7c6da
commit 8e5a544
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 124 deletions.
diff --git a/data/mods/Magiclysm/recipes/alchemy.json b/data/mods/Magiclysm/recipes/alchemy.json
@@ -12,7 +12,7 @@
     ],
     "tools": [ [ [ "food_processor", 40 ] ], [ [ "surface_heat", 20, "LIST" ] ] ],
     "components": [ [ [ "dragon_scale", 4, "LIST" ], [ "meat_dragon", 40 ] ] ],
-    "proficiencies": [ { "proficiency": "prof_alchemy", "required": false, "time_multiplier": 2 } ],
+    "proficiencies": [ { "proficiency": "prof_alchemy" } ],
     "time": "2 h",
     "skill_used": "chemistry",
     "difficulty": 3,
@@ -65,7 +65,7 @@
     "skill_used": "chemistry",
     "difficulty": 3,
     "skills_required": [ "spellcraft", 3 ],
-    "proficiencies": [ { "proficiency": "prof_alchemy", "required": false, "time_multiplier": 2 } ],
+    "proficiencies": [ { "proficiency": "prof_alchemy" } ],
     "category": "CC_ENCHANTED",
     "subcategory": "CSC_ENCHANTED_OTHER",
     "autolearn": true

diff --git a/data/mods/Magiclysm/recipes/armor.json b/data/mods/Magiclysm/recipes/armor.json
@@ -14,10 +14,7 @@
     "subcategory": "CSC_ENCHANTED_ARMOR",
     "skill_used": "tailor",
     "skills_required": [ [ "spellcraft", 6 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_chitinworking", "required": false, "time_multiplier": 3 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_chitinworking" } ],
     "difficulty": 7,
     "time": "4 h",
     "book_learn": [ [ "magic_armormaking", 6 ] ],
@@ -39,7 +36,7 @@
     "skill_used": "tailor",
     "skills_required": [ [ "spellcraft", 6 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_chitinworking", "required": false, "time_multiplier": 3 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 }
     ],
@@ -63,7 +60,7 @@
     "skill_used": "tailor",
     "skills_required": [ [ "spellcraft", 6 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_chitinworking", "required": false, "time_multiplier": 3 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 }
     ],
@@ -87,7 +84,7 @@
     "skill_used": "tailor",
     "skills_required": [ [ "spellcraft", 6 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_chitinworking", "required": false, "time_multiplier": 3 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 }
     ],
@@ -111,7 +108,7 @@
     "skill_used": "tailor",
     "skills_required": [ [ "spellcraft", 6 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_chitinworking", "required": false, "time_multiplier": 3 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 3 }
     ],
@@ -132,7 +129,7 @@
     "skills_required": [ [ "spellcraft", 6 ], [ "fabrication", 4 ], [ "survival", 4 ] ],
     "using": [ [ "cordage", 7 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_chitinworking", "required": false, "time_multiplier": 3 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 }
     ],
@@ -147,7 +144,7 @@
     "subcategory": "CSC_ANIMALS_CANINE ARMOR",
     "skills_required": [ [ "spellcraft", 6 ], [ "fabrication", 4 ], [ "survival", 4 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_chitinworking", "required": false, "time_multiplier": 3 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 }
     ],

diff --git a/data/mods/Magiclysm/recipes/blacksmithing.json b/data/mods/Magiclysm/recipes/blacksmithing.json
@@ -10,10 +10,10 @@
     "time": "180 m",
     "batch_time_factors": [ 50, 2 ],
     "proficiencies": [
-      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_metallurgy", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_metallurgy" },
       { "proficiency": "prof_alchemy", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_almetallurgy", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_almetallurgy" }
     ],
     "book_learn": [ [ "welding_book", 4 ] ],
     "tools": [ [ [ "demon_forge", 15 ] ], [ [ "tongs", -1 ] ] ],
@@ -29,9 +29,9 @@
     "difficulty": 5,
     "time": "180 m",
     "proficiencies": [
-      { "proficiency": "prof_metallurgy", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_metallurgy" },
       { "proficiency": "prof_alchemy", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_almetallurgy", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_almetallurgy" }
     ],
     "batch_time_factors": [ 50, 2 ],
     "book_learn": [ [ "welding_book", 4 ] ],
@@ -50,7 +50,7 @@
     "book_learn": [ [ "metal_legends", 2 ] ],
     "proficiencies": [
       { "proficiency": "prof_alchemy", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_pottery", "required": false, "time_multiplier": 1.5 }
+      { "proficiency": "prof_pottery" }
     ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ],
     "tools": [ [ [ "con_mix", 50 ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ] ],

diff --git a/data/mods/Magiclysm/recipes/dragon_black.json b/data/mods/Magiclysm/recipes/dragon_black.json
@@ -19,7 +19,7 @@
       { "id": "MANA_INFUSE", "level": 1 }
     ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
-    "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 } ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ],
     "book_learn": [ [ "black_dragons", 2 ] ],
     "components": [ [ [ "dragon_essence", 1 ] ], [ [ "black_dragon_hide_raw", 1 ] ] ]
   },
@@ -36,10 +36,7 @@
     "book_learn": [ [ "black_dragons", 5 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 250 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [ [ [ "black_dragon_tanned_hide", 40 ] ], [ [ "dragon_black_scale", 150 ] ], [ [ "dragon_essence", 15 ] ] ]
   },
   {
@@ -54,10 +51,7 @@
     "time": "340 h",
     "book_learn": [ [ "black_dragons", 6 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "using": [ [ "sewing_standard", 250 ], [ "welding_standard", 50 ] ],
     "components": [ [ [ "black_dragon_tanned_hide", 40 ] ], [ [ "dragon_black_scale", 1500 ] ], [ [ "dragon_essence", 15 ] ] ]
   },
@@ -75,9 +69,9 @@
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 100 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_cobbling", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_cobbling" },
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [ [ [ "black_dragon_tanned_hide", 4 ] ], [ [ "dragon_black_scale", 15 ] ], [ [ "dragon_essence", 2 ] ] ]
   },
@@ -95,9 +89,9 @@
     "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 100 ], [ "welding_standard", 10 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_cobbling", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_cobbling" },
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [ [ [ "black_dragon_tanned_hide", 6 ] ], [ [ "dragon_black_scale", 75 ] ], [ [ "dragon_essence", 4 ] ] ]
   },
@@ -114,10 +108,7 @@
     "book_learn": [ [ "black_dragons", 5 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 100 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [ [ [ "black_dragon_tanned_hide", 3 ] ], [ [ "dragon_black_scale", 8 ] ], [ [ "dragon_essence", 2 ] ] ]
   },
   {
@@ -133,10 +124,7 @@
     "book_learn": [ [ "black_dragons", 6 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 100 ], [ "welding_standard", 10 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [ [ [ "black_dragon_tanned_hide", 1 ] ], [ [ "dragon_black_scale", 90 ] ], [ [ "dragon_essence", 4 ] ] ]
   },
   {
@@ -153,9 +141,9 @@
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 100 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [ [ [ "black_dragon_tanned_hide", 3 ] ], [ [ "dragon_black_scale", 10 ] ], [ [ "dragon_essence", 3 ] ] ]
   },
@@ -173,9 +161,9 @@
     "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 100 ], [ "welding_standard", 10 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [ [ [ "black_dragon_tanned_hide", 4 ] ], [ [ "dragon_black_scale", 50 ] ], [ [ "dragon_essence", 5 ] ] ]
   },
@@ -192,10 +180,7 @@
     "book_learn": [ [ "black_dragons", 5 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 350 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [ [ [ "black_dragon_tanned_hide", 60 ] ], [ [ "dragon_black_scale", 250 ] ], [ [ "dragon_essence", 20 ] ] ]
   },
   {
@@ -211,10 +196,7 @@
     "book_learn": [ [ "black_dragons", 6 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 350 ], [ "welding_standard", 100 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [ [ [ "black_dragon_tanned_hide", 60 ] ], [ [ "dragon_black_scale", 2250 ] ], [ [ "dragon_essence", 25 ] ] ]
   },
   {
@@ -231,9 +213,9 @@
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 150 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_cobbling", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_cobbling" },
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [ [ [ "black_dragon_tanned_hide", 6 ] ], [ [ "dragon_black_scale", 20 ] ], [ [ "dragon_essence", 3 ] ] ]
   },
@@ -251,9 +233,9 @@
     "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 150 ], [ "welding_standard", 20 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_cobbling", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_cobbling" },
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [ [ [ "black_dragon_tanned_hide", 8 ] ], [ [ "dragon_black_scale", 125 ] ], [ [ "dragon_essence", 6 ] ] ]
   },
@@ -270,10 +252,7 @@
     "book_learn": [ [ "black_dragons", 5 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 150 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [ [ [ "black_dragon_tanned_hide", 4 ] ], [ [ "dragon_black_scale", 12 ] ], [ [ "dragon_essence", 3 ] ] ]
   },
   {
@@ -289,10 +268,7 @@
     "book_learn": [ [ "black_dragons", 6 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 150 ], [ "welding_standard", 20 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
-    ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [ [ [ "black_dragon_tanned_hide", 2 ] ], [ [ "dragon_black_scale", 140 ] ], [ [ "dragon_essence", 6 ] ] ]
   },
   {
@@ -309,9 +285,9 @@
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 150 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [ [ [ "black_dragon_tanned_hide", 4 ] ], [ [ "dragon_black_scale", 15 ] ], [ [ "dragon_essence", 4 ] ] ]
   },
@@ -329,9 +305,9 @@
     "qualities": [ { "id": "MANA_INFUSE", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
     "using": [ [ "sewing_standard", 150 ], [ "welding_standard", 20 ] ],
     "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_leatherworking", "required": false, "time_multiplier": 2 }
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [ [ [ "black_dragon_tanned_hide", 6 ] ], [ [ "dragon_black_scale", 75 ] ], [ [ "dragon_essence", 7 ] ] ]
   },

diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -13,7 +13,7 @@
     "autolearn": true,
     "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ],
     "proficiencies": [
-      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_metalworking" },
       { "proficiency": "prof_redsmithing", "required": false, "time_multiplier": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
@@ -31,7 +31,7 @@
     "time": "20 m",
     "book_learn": [ [ "alchemy_basic", 3 ], [ "necro_basic", 4 ], [ "techno_basic", 4 ] ],
     "proficiencies": [
-      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_metalworking" },
       { "proficiency": "prof_redsmithing", "required": false, "time_multiplier": 3 }
     ],
     "qualities": [ { "id": "CHISEL", "level": 1 } ],
@@ -49,7 +49,7 @@
     "time": "20 m",
     "book_learn": [ [ "alchemy_basic", 3 ], [ "necro_basic", 4 ], [ "techno_basic", 4 ] ],
     "proficiencies": [
-      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_metalworking" },
       { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 }
     ],
     "qualities": [ { "id": "CHISEL", "level": 1 } ],