Merge pull request #78536 from marilynias/fix-inheritence

Add qualities to copy-from recipes in mods
CleverRaven · Dec 14, 2024 · 508e922 · 508e922
2 parents 58e95c5 + f9de446
commit 508e922
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 2 deletions.
diff --git a/data/json/recipes/armor/pets_cow.json b/data/json/recipes/armor/pets_cow.json
@@ -6,6 +6,7 @@
     "copy-from": "armor_acidchitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_BOVINE ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ], [ "fabrication", 4 ] ],
     "time": "10 h 15 m",
     "using": [ [ "cordage", 7 ] ],
@@ -236,6 +237,7 @@
     "copy-from": "armor_plarmor",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_BOVINE ARMOR",
+    "qualities": [ { "id": "HAMMER", "level": 3 } ],
     "skills_required": [ "tailor", 3 ],
     "time": "28 h 45 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],

diff --git a/data/json/recipes/armor/pets_dog.json b/data/json/recipes/armor/pets_dog.json
@@ -6,6 +6,7 @@
     "copy-from": "armor_acidchitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_CANINE ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ], [ "fabrication", 2 ] ],
     "time": "3 h 30 m",
     "using": [ [ "cordage", 1 ], [ "clasps", 3 ] ],

diff --git a/data/json/recipes/armor/pets_horse.json b/data/json/recipes/armor/pets_horse.json
@@ -6,6 +6,7 @@
     "copy-from": "armor_acidchitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_EQUINE ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ], [ "fabrication", 4 ] ],
     "time": "8 h 30 m",
     "using": [ [ "cordage", 7 ] ],
@@ -236,6 +237,7 @@
     "copy-from": "armor_plarmor",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_EQUINE ARMOR",
+    "qualities": [ { "id": "HAMMER", "level": 3 } ],
     "skills_required": [ "tailor", 3 ],
     "time": "24 h",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],

diff --git a/data/mods/Aftershock/recipes/robot_recipes.json b/data/mods/Aftershock/recipes/robot_recipes.json
@@ -66,7 +66,8 @@
       [ [ "afs_circuitry_1", 4 ] ],
       [ [ "afs_energy_storage_3", 1 ] ],
       [ [ "afs_material_1", 7 ] ]
-    ]
+    ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ]
   },
   {
     "result": "bot_utilibot_beehive",
@@ -79,7 +80,8 @@
       [ [ "afs_energy_storage_3", 1 ] ],
       [ [ "afs_material_1", 8 ] ],
       [ [ "robot_controls", 1 ] ]
-    ]
+    ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ]
   },
   {
     "type": "recipe",

diff --git a/data/mods/DinoMod/recipes/pets_bear.json b/data/mods/DinoMod/recipes/pets_bear.json
@@ -6,6 +6,7 @@
     "copy-from": "armor_acidchitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_BEAR ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ], [ "fabrication", 4 ] ],
     "time": "8 h 30 m",
     "using": [ [ "cordage", 7 ] ],
@@ -23,6 +24,7 @@
     "copy-from": "armor_chitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_BEAR ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "time": "8 h 30 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
     "skills_required": [ [ "fabrication", 4 ] ],
@@ -97,6 +99,7 @@
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_BEAR ARMOR",
     "activity_level": "LIGHT_EXERCISE",
+    "qualities": [ { "id": "COOK", "level": 3 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ "tailor", 6 ],
     "time": "10 h 30 m",
     "autolearn": true,
@@ -131,6 +134,7 @@
     "activity_level": "LIGHT_EXERCISE",
     "difficulty": 4,
     "time": "6 h 30 m",
+    "qualities": [ { "id": "COOK", "level": 3 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "using": [ [ "sewing_standard", 75 ], [ "clasps", 4 ] ],
     "components": [ [ [ "bone", 39 ], [ "bone_human", 39 ], [ "bone_demihuman", 39 ] ], [ [ "armor_blarmor", 3 ] ] ],
     "extend": { "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_carving" } ] }
@@ -246,6 +250,7 @@
     "copy-from": "armor_plarmor",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_BEAR ARMOR",
+    "qualities": [ { "id": "HAMMER", "level": 3 } ],
     "skills_required": [ "tailor", 3 ],
     "time": "24 h",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],

diff --git a/data/mods/DinoMod/recipes/pets_elephant.json b/data/mods/DinoMod/recipes/pets_elephant.json
@@ -6,6 +6,7 @@
     "copy-from": "armor_acidchitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_ELEPHANT ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ], [ "fabrication", 4 ] ],
     "time": "8 h 30 m",
     "using": [ [ "cordage", 7 ] ],
@@ -23,6 +24,7 @@
     "copy-from": "armor_chitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_ELEPHANT ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "time": "8 h 30 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
     "skills_required": [ [ "fabrication", 4 ] ],
@@ -97,6 +99,7 @@
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_ELEPHANT ARMOR",
     "activity_level": "LIGHT_EXERCISE",
+    "qualities": [ { "id": "COOK", "level": 3 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ "tailor", 6 ],
     "time": "10 h 30 m",
     "autolearn": true,
@@ -131,6 +134,7 @@
     "activity_level": "LIGHT_EXERCISE",
     "difficulty": 4,
     "time": "6 h 30 m",
+    "qualities": [ { "id": "COOK", "level": 3 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "using": [ [ "sewing_standard", 75 ], [ "clasps", 4 ] ],
     "components": [ [ [ "bone", 39 ], [ "bone_human", 39 ], [ "bone_demihuman", 39 ] ], [ [ "armor_blarmor", 3 ] ] ],
     "extend": { "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_carving" } ] }
@@ -246,6 +250,7 @@
     "copy-from": "armor_plarmor",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_ELEPHANT ARMOR",
+    "qualities": [ { "id": "HAMMER", "level": 3 } ],
     "skills_required": [ "tailor", 3 ],
     "time": "24 h",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],

diff --git a/data/mods/DinoMod/recipes/pets_ostrich.json b/data/mods/DinoMod/recipes/pets_ostrich.json
@@ -6,6 +6,7 @@
     "copy-from": "armor_acidchitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_OSTRICH ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ [ "survival", 4 ], [ "firstaid", 2 ], [ "fabrication", 4 ] ],
     "time": "8 h 30 m",
     "using": [ [ "cordage", 7 ] ],
@@ -23,6 +24,7 @@
     "copy-from": "armor_chitin",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_OSTRICH ARMOR",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "time": "8 h 30 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
     "skills_required": [ [ "fabrication", 4 ] ],
@@ -97,6 +99,7 @@
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_OSTRICH ARMOR",
     "activity_level": "LIGHT_EXERCISE",
+    "qualities": [ { "id": "COOK", "level": 3 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "skills_required": [ "tailor", 6 ],
     "time": "10 h 30 m",
     "autolearn": true,
@@ -246,6 +249,7 @@
     "copy-from": "armor_plarmor",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_OSTRICH ARMOR",
+    "qualities": [ { "id": "HAMMER", "level": 3 } ],
     "skills_required": [ "tailor", 3 ],
     "time": "24 h",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],

diff --git a/data/mods/Magiclysm/recipes/armor.json b/data/mods/Magiclysm/recipes/armor.json
@@ -56,6 +56,12 @@
     "result": "xl_armguard_demonchitin",
     "type": "recipe",
     "copy-from": "armguard_demonchitin",
+    "qualities": [
+      { "id": "CHISEL", "level": 1 },
+      { "id": "SEW", "level": 3 },
+      { "id": "LEATHER_AWL", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 2 }
+    ],
     "time": "3 h",
     "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_plate", 1 ] ], [ [ "demon_chitin_piece", 3 ] ] ]
   },
@@ -87,6 +93,12 @@
     "result": "xl_armor_demonchitin",
     "type": "recipe",
     "copy-from": "armor_demonchitin",
+    "qualities": [
+      { "id": "CHISEL", "level": 1 },
+      { "id": "SEW", "level": 3 },
+      { "id": "LEATHER_AWL", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 2 }
+    ],
     "time": "5 h",
     "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_plate", 1 ] ], [ [ "demon_chitin_piece", 10 ] ] ]
   },
@@ -118,6 +130,12 @@
     "result": "xl_boots_demonchitin",
     "type": "recipe",
     "copy-from": "boots_demonchitin",
+    "qualities": [
+      { "id": "CHISEL", "level": 1 },
+      { "id": "SEW", "level": 3 },
+      { "id": "LEATHER_AWL", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 2 }
+    ],
     "time": "4 h",
     "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_plate", 1 ] ], [ [ "demon_chitin_piece", 5 ] ] ]
   },
@@ -149,6 +167,12 @@
     "result": "xl_gauntlets_demonchitin",
     "type": "recipe",
     "copy-from": "gauntlets_demonchitin",
+    "qualities": [
+      { "id": "CHISEL", "level": 1 },
+      { "id": "SEW", "level": 3 },
+      { "id": "LEATHER_AWL", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 2 }
+    ],
     "time": "3 h",
     "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_piece", 14 ] ] ]
   },
@@ -157,6 +181,12 @@
     "type": "recipe",
     "activity_level": "BRISK_EXERCISE",
     "copy-from": "armor_demonchitin",
+    "qualities": [
+      { "id": "CHISEL", "level": 1 },
+      { "id": "SEW", "level": 3 },
+      { "id": "LEATHER_AWL", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 2 }
+    ],
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_EQUINE ARMOR",
     "time": "17 h 30 m",
@@ -175,6 +205,12 @@
     "type": "recipe",
     "activity_level": "BRISK_EXERCISE",
     "copy-from": "armor_demonchitin",
+    "qualities": [
+      { "id": "CHISEL", "level": 1 },
+      { "id": "SEW", "level": 3 },
+      { "id": "LEATHER_AWL", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 2 }
+    ],
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_CANINE ARMOR",
     "skills_required": [ [ "spellcraft", 6 ], [ "fabrication", 4 ], [ "survival", 4 ] ],

diff --git a/data/mods/Magiclysm/recipes/tailoring.json b/data/mods/Magiclysm/recipes/tailoring.json
@@ -82,6 +82,7 @@
     "copy-from": "gambeson_parabolan",
     "time": "97 h",
     "using": [ [ "fastener_large", 2 ], [ "fastener_small", 15 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [
       [ [ "leather_belt", 1 ], [ "webbing_belt", 1 ], [ "santa_belt", 1 ] ],
       [ [ "parabolan_felt_patch", 3555 ] ],
@@ -94,6 +95,7 @@
     "copy-from": "gambeson_parabolan",
     "time": "49 h",
     "using": [ [ "fastener_large", 2 ], [ "fastener_small", 8 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [
       [ [ "leather_belt", 1 ], [ "webbing_belt", 1 ], [ "santa_belt", 1 ] ],
       [ [ "parabolan_felt_patch", 1777 ] ],
@@ -125,6 +127,7 @@
     "copy-from": "gambeson_parabolan_thinsleeved",
     "time": "87 h",
     "using": [ [ "fastener_large", 2 ], [ "fastener_small", 15 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [
       [ [ "leather_belt", 1 ], [ "webbing_belt", 1 ], [ "santa_belt", 1 ] ],
       [ [ "parabolan_felt_patch", 3114 ] ],
@@ -137,6 +140,7 @@
     "copy-from": "gambeson_parabolan_thinsleeved",
     "time": "44 h",
     "using": [ [ "fastener_large", 2 ], [ "fastener_small", 8 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [
       [ [ "leather_belt", 1 ], [ "webbing_belt", 1 ], [ "santa_belt", 1 ] ],
       [ [ "parabolan_felt_patch", 1572 ] ],
@@ -168,6 +172,7 @@
     "copy-from": "gambeson_parabolan_vest",
     "time": "54 h",
     "using": [ [ "fastener_large", 2 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [
       [ [ "leather_belt", 1 ], [ "webbing_belt", 1 ], [ "santa_belt", 1 ] ],
       [ [ "parabolan_felt_patch", 2736 ] ],
@@ -180,6 +185,7 @@
     "copy-from": "gambeson_parabolan_vest",
     "time": "27 h",
     "using": [ [ "fastener_large", 2 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [
       [ [ "leather_belt", 1 ], [ "webbing_belt", 1 ], [ "santa_belt", 1 ] ],
       [ [ "parabolan_felt_patch", 1368 ] ],
@@ -207,6 +213,7 @@
     "copy-from": "gambeson_pants_parabolan",
     "time": "60 h",
     "using": [ [ "fastener_small", 7 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [ [ [ "parabolan_felt_patch", 820 ] ], [ [ "parabolan_yarn", 600 ] ] ]
   },
   {
@@ -215,6 +222,7 @@
     "copy-from": "gambeson_pants_parabolan",
     "time": "30 h",
     "using": [ [ "fastener_small", 5 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [ [ [ "parabolan_felt_patch", 410 ] ], [ [ "parabolan_yarn", 300 ] ] ]
   },
   {
@@ -238,6 +246,7 @@
     "copy-from": "gambeson_gloves_parabolan",
     "time": "12 h",
     "using": [ [ "fastener_small", 3 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [ [ [ "parabolan_felt_patch", 174 ] ], [ [ "parabolan_yarn", 135 ] ] ]
   },
   {
@@ -246,6 +255,7 @@
     "copy-from": "gambeson_gloves_parabolan",
     "time": "6 h",
     "using": [ [ "fastener_small", 2 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
     "components": [ [ [ "parabolan_felt_patch", 87 ] ], [ [ "parabolan_yarn", 67 ] ] ]
   }
 ]