Skip to content

Commit

Permalink
Add demon chitin armor & repairing dragon armor (#36733)
Browse files Browse the repository at this point in the history
* Make carried vehicle cargo available for inventory

* Update migration.json

de-duplicate lines 1002-1057

* Generic name to object (#38686)

* Generic name to object

* Name to object

* Armor name to object (#38685)

* Armor fix looks_like

* Name to object, volume to string

* Lowered beaver aggression and morale to be more accurate and believable. (#38688)

* made vacuum sealing more consistent

* Add demon chitin armor

* Add d-chitin armor recipes


Add armormaking book, remove autolearn from recipes


Fix recipe category


Add armorsmithing book to mapgen

* Fix playtest errors

* Add repairing ability to sewing kits

* Capitals

* Itemgroup description fix

* Linting

* Forgot gauntlet recipe + adjust crafting times

* Fix fire protection being too low

* Add dog & horse d-chitin armors

* Update data/mods/Magiclysm/items/recipe_books.json

Co-authored-by: jkraybill <[email protected]>
Co-authored-by: ZhilkinSerg <[email protected]>
Co-authored-by: tenmillimaster <>
Co-authored-by: snipercup <[email protected]>
Co-authored-by: chrimchim <[email protected]>
Co-authored-by: Curtis Merrill <[email protected]>
  • Loading branch information
6 people committed Mar 15, 2020
1 parent 144d032 commit 392182e
Show file tree
Hide file tree
Showing 8 changed files with 320 additions and 4 deletions.
16 changes: 14 additions & 2 deletions data/mods/Magiclysm/enchanted/enchanted_misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,19 @@
{
"type": "repair_item",
"item_action_type": "repair_fabric",
"materials": [ "cotton", "leather", "wool", "fur", "faux_fur", "nomex", "kevlar", "neoprene", "gutskin" ],
"materials": [
"cotton",
"leather",
"wool",
"fur",
"faux_fur",
"nomex",
"kevlar",
"neoprene",
"gutskin",
"black_dragon_hide",
"demon_chitin"
],
"skill": "tailor",
"tool_quality": 1,
"cost_scaling": 0.1,
Expand All @@ -156,7 +168,7 @@
"type": "sew_advanced",
"materials": [ "cotton", "leather", "wool", "fur", "faux_fur", "nomex", "kevlar", "neoprene", "gutskin", "plastic", "kevlar_rigid" ],
"skill": "tailor",
"clothing_mods": [ "leather_padded", "kevlar_padded", "furred", "wooled" ]
"clothing_mods": [ "leather_padded", "steel_padded", "kevlar_padded", "furred", "wooled" ]
}
],
"flags": [ "ALLOWS_REMOTE_USE" ]
Expand Down
5 changes: 4 additions & 1 deletion data/mods/Magiclysm/itemgroups/itemgroups.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"items": [
{ "group": "spellbook_loot_1", "prob": 3 },
{ "group": "magic_recipe_basic", "prob": 3 },
{ "group": "magic_recipe_advanced", "prob": 1 },
{ "group": "dragon_books", "prob": 3 }
]
},
Expand All @@ -40,6 +41,7 @@
"items": [
{ "group": "spellbook_loot_0", "prob": 6 },
{ "group": "magic_recipe_basic", "prob": 6 },
{ "group": "magic_recipe_advanced", "prob": 2 },
{ "group": "dragon_books", "prob": 5 }
]
},
Expand Down Expand Up @@ -105,7 +107,8 @@
{ "group": "spell_scroll_tier_0", "prob": 80 },
{ "group": "spell_scroll_tier_1", "prob": 60 },
{ "group": "spell_scroll_tier_2", "prob": 30 },
{ "group": "magic_recipe_basic", "prob": 50 }
{ "group": "magic_recipe_basic", "prob": 50 },
{ "group": "magic_recipe_advanced", "prob": 16 }
]
},
{
Expand Down
6 changes: 6 additions & 0 deletions data/mods/Magiclysm/itemgroups/recipe_books.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,11 @@
[ "book_mythological", 10 ],
[ "cooking_poison", 15 ]
]
},
{
"id": "magic_recipe_advanced",
"type": "item_group",
"//": "Higher tier recipes, where most school-related recipes require their rune or rune weapon.",
"items": [ [ "magic_armormaking", 30 ] ]
}
]
78 changes: 78 additions & 0 deletions data/mods/Magiclysm/items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,83 @@
"copy-from": "quiver_large_birchbark",
"type": "ARMOR",
"use_action": { "type": "bandolier", "capacity": 60, "ammo": [ "arrow", "bolt", "arrow_orichalcum" ], "draw_cost": 20 }
},
{
"id": "armguard_demonchitin",
"copy-from": "armguard_chitin",
"type": "ARMOR",
"name": { "str": "pair of demon chitin arm guards", "str_pl": "pairs of demon chitin arm guards" },
"description": "A pair of arm guards crafted from the carefully cleaned and pruned red exoskeletons of demon spiders. Fire-resistant and very durable.",
"material": [ "demon_chitin" ],
"proportional": { "weight": 0.9, "encumbrance": 0.9, "price": 10, "warmth": 2 },
"environmental_protection": 8
},
{
"id": "armor_demonchitin",
"copy-from": "armor_chitin",
"type": "ARMOR",
"name": { "str": "demon chitin armor" },
"description": "Leg and body armor crafted from the carefully cleaned and pruned red exoskeletons of demon spiders. Fire-resistant and very durable.",
"material": [ "demon_chitin" ],
"proportional": { "weight": 0.9, "encumbrance": 0.9, "price": 10, "warmth": 2 },
"environmental_protection": 8
},
{
"id": "helmet_demonchitin",
"copy-from": "helmet_chitin",
"type": "ARMOR",
"name": { "str": "demon chitin helmet" },
"description": "A helmet crafted from the carefully cleaned and pruned red exoskeletons of demon spiders. Covers the entire head; fire-resistant and very durable.",
"material": [ "demon_chitin" ],
"proportional": { "weight": 0.9, "encumbrance": 0.9, "price": 10, "warmth": 2 },
"environmental_protection": 8
},
{
"id": "gauntlets_demonchitin",
"copy-from": "gauntlets_chitin",
"type": "ARMOR",
"name": { "str": "pair of demon chitin gauntlets", "str_pl": "pairs of demon chitin gauntlets" },
"description": "Gauntlets crafted from the carefully cleaned and pruned red exoskeletons of demon spiders. Fire-resistant and very durable.",
"material": [ "demon_chitin" ],
"proportional": { "weight": 0.9, "encumbrance": 0.9, "price": 10, "warmth": 2 },
"environmental_protection": 8
},
{
"id": "boots_demonchitin",
"copy-from": "boots_chitin",
"type": "ARMOR",
"name": { "str": "pair of demon chitin boots", "str_pl": "pairs of demon chitin boots" },
"description": "Boots crafted from carefully cleaned and pruned pruned red exoskeletons of demon spiders. Fire-resistant and very durable.",
"material": [ "demon_chitin" ],
"proportional": { "weight": 0.9, "encumbrance": 0.9, "price": 10, "warmth": 2 },
"environmental_protection": 8
},
{
"type": "PET_ARMOR",
"id": "demonchitin_harness_dog",
"copy-from": "kevlar_harness",
"color": "red",
"name": { "str": "demon chitin dog mesh harness", "str_pl": "demon chitin dog mesh harnesses" },
"description": "A makeshift harness of demon chitin fitted to a thin mesh protecting the neck to flank of canines. You could put this on a friendly dog.",
"price": 50000,
"price_postapoc": 5000,
"material": [ "demon_chitin" ],
"weight": "4862 g",
"environmental_protection": 8
},
{
"type": "PET_ARMOR",
"id": "demonchitin_armor_horse",
"copy-from": "horse_armor",
"color": "green",
"name": { "str": "demon chitin horse armor" },
"description": "A makeshift assembly of criniere, peytral and croupiere made from demon chitin fitted to a thin mesh. You could put this on a friendly horse.",
"price": 120000,
"price_postapoc": 12000,
"material": [ "demon_chitin", "steel" ],
"weight": "31500 g",
"volume": "150 L",
"material_thickness": 6,
"environmental_protection": 8
}
]
19 changes: 19 additions & 0 deletions data/mods/Magiclysm/items/recipe_books.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,24 @@
"intelligence": 9,
"time": "20 m",
"fun": 1
},
{
"id": "magic_armormaking",
"type": "BOOK",
"name": { "str": "Protection from Magical Beasts", "str_pl": "copies of Protection from Magical Beasts" },
"description": "A leatherbound book with a picture of a shield holding back dragonfire on the cover. There are many ways to turn monster skins and hides into protective equipment inside.",
"weight": "1 kg",
"volume": "750 ml",
"price": 7900,
"bashing": 5,
"material": [ "paper" ],
"symbol": "?",
"color": "white",
"skill": "tailor",
"required_level": 6,
"max_level": 8,
"intelligence": 10,
"time": "25 m",
"fun": -1
}
]
79 changes: 79 additions & 0 deletions data/mods/Magiclysm/items/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,84 @@
"watertight": true,
"qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "MAGIC_MUTAGEN", 2 ] ],
"use_action": "HEAT_FOOD"
},
{
"id": "sewing_kit",
"name": "sewing kit",
"copy-from": "sewing_kit",
"type": "TOOL",
"use_action": {
"type": "repair_item",
"item_action_type": "repair_fabric",
"materials": [
"cotton",
"leather",
"lycra",
"nylon",
"wool",
"fur",
"faux_fur",
"nomex",
"kevlar",
"gutskin",
"demon_chitin",
"black_dragon_hide"
],
"skill": "tailor",
"tool_quality": 0,
"cost_scaling": 0.1,
"move_cost": 1000
}
},
{
"id": "tailors_kit",
"name": "tailor's kit",
"copy-from": "tailors_kit",
"type": "TOOL",
"use_action": [
{
"type": "repair_item",
"item_action_type": "repair_fabric",
"materials": [
"cotton",
"leather",
"lycra",
"nylon",
"wool",
"fur",
"faux_fur",
"nomex",
"kevlar",
"neoprene",
"gutskin",
"black_dragon_hide",
"demon_chitin"
],
"skill": "tailor",
"tool_quality": 1,
"cost_scaling": 0.1,
"move_cost": 800
},
{
"type": "sew_advanced",
"materials": [
"cotton",
"leather",
"lycra",
"nylon",
"wool",
"fur",
"faux_fur",
"nomex",
"kevlar",
"neoprene",
"gutskin",
"plastic",
"kevlar_rigid"
],
"skill": "tailor",
"clothing_mods": [ "leather_padded", "steel_padded", "kevlar_padded", "furred", "wooled" ]
}
]
}
]
4 changes: 3 additions & 1 deletion data/mods/Magiclysm/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{
"type": "material",
"ident": "black_dragon_hide",
"name": "black dragon hide",
"name": "Black Dragon Hide",
"density": 20,
"specific_heat_liquid": 4.186,
"specific_heat_solid": 2.108,
Expand Down Expand Up @@ -53,6 +53,8 @@
"fire_resist": 18,
"elec_resist": 2,
"chip_resist": 10,
"repaired_with": "demon_chitin_piece",
"salvaged_into": "demon_chitin_piece",
"dmg_adj": [ "scratched", "cut", "cracked", "shattered" ],
"bash_dmg_verb": "cracked",
"cut_dmg_verb": "chipped",
Expand Down
117 changes: 117 additions & 0 deletions data/mods/Magiclysm/recipes/armor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
[
{
"result": "helmet_demonchitin",
"byproducts": [ [ "demon_chitin_piece", 3 ] ],
"qualities": [
{ "id": "CHISEL", "level": 1 },
{ "id": "SEW", "level": 3 },
{ "id": "LEATHER_AWL", "level": 1 },
{ "id": "MANA_INFUSE", "level": 2 }
],
"type": "recipe",
"category": "CC_ENCHANTED",
"subcategory": "CSC_ENCHANTED_ARMOR",
"skill_used": "tailor",
"skills_required": [ [ "spellcraft", 6 ] ],
"difficulty": 7,
"time": "4 h",
"book_learn": [ [ "magic_armormaking", 6 ] ],
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_plate", 1 ] ], [ [ "demon_chitin_piece", 1 ] ] ]
},
{
"result": "armguard_demonchitin",
"byproducts": [ [ "demon_chitin_piece", 8 ] ],
"qualities": [
{ "id": "CHISEL", "level": 1 },
{ "id": "SEW", "level": 3 },
{ "id": "LEATHER_AWL", "level": 1 },
{ "id": "MANA_INFUSE", "level": 2 }
],
"type": "recipe",
"category": "CC_ENCHANTED",
"subcategory": "CSC_ENCHANTED_ARMOR",
"skill_used": "tailor",
"skills_required": [ [ "spellcraft", 6 ] ],
"difficulty": 6,
"time": "2 h",
"book_learn": [ [ "magic_armormaking", 5 ] ],
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_plate", 1 ] ], [ [ "demon_chitin_piece", 2 ] ] ]
},
{
"result": "armor_demonchitin",
"qualities": [
{ "id": "CHISEL", "level": 1 },
{ "id": "SEW", "level": 3 },
{ "id": "LEATHER_AWL", "level": 1 },
{ "id": "MANA_INFUSE", "level": 2 }
],
"type": "recipe",
"category": "CC_ENCHANTED",
"subcategory": "CSC_ENCHANTED_ARMOR",
"skill_used": "tailor",
"skills_required": [ [ "spellcraft", 6 ] ],
"difficulty": 8,
"time": "4 h",
"book_learn": [ [ "magic_armormaking", 7 ] ],
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_plate", 4 ] ], [ [ "demon_chitin_piece", 6 ] ] ]
},
{
"result": "boots_demonchitin",
"qualities": [
{ "id": "CHISEL", "level": 1 },
{ "id": "SEW", "level": 3 },
{ "id": "LEATHER_AWL", "level": 1 },
{ "id": "MANA_INFUSE", "level": 2 }
],
"type": "recipe",
"category": "CC_ENCHANTED",
"subcategory": "CSC_ENCHANTED_ARMOR",
"skill_used": "tailor",
"skills_required": [ [ "spellcraft", 6 ] ],
"difficulty": 5,
"time": "2 h 40 m",
"book_learn": [ [ "magic_armormaking", 4 ] ],
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_plate", 1 ] ], [ [ "demon_chitin_piece", 2 ] ] ]
},
{
"result": "gauntlets_demonchitin",
"qualities": [
{ "id": "CHISEL", "level": 1 },
{ "id": "SEW", "level": 3 },
{ "id": "LEATHER_AWL", "level": 1 },
{ "id": "MANA_INFUSE", "level": 2 }
],
"type": "recipe",
"category": "CC_ENCHANTED",
"subcategory": "CSC_ENCHANTED_ARMOR",
"skill_used": "tailor",
"skills_required": [ [ "spellcraft", 6 ] ],
"difficulty": 5,
"time": "2 h",
"book_learn": [ [ "magic_armormaking", 4 ] ],
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "demon_chitin_piece", 10 ] ] ]
},
{
"result": "demonchitin_armor_horse",
"type": "recipe",
"copy-from": "armor_demonchitin",
"category": "CC_ANIMALS",
"subcategory": "CSC_ANIMALS_EQUINE ARMOR",
"time": "17 h 30 m",
"book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
"skills_required": [ [ "spellcraft", 6 ], [ "fabrication", 4 ], [ "survival", 4 ] ],
"using": [ [ "cordage", 7 ] ],
"components": [ [ [ "demon_chitin_plate", 4 ] ], [ [ "demon_chitin_piece", 20 ] ] ]
},
{
"result": "demonchitin_harness_dog",
"type": "recipe",
"copy-from": "armor_demonchitin",
"category": "CC_ANIMALS",
"subcategory": "CSC_ANIMALS_CANINE ARMOR",
"skills_required": [ [ "spellcraft", 6 ], [ "fabrication", 4 ], [ "survival", 4 ] ],
"time": "5 h",
"using": [ [ "cordage", 1 ] ],
"components": [ [ [ "demon_chitin_piece", 12 ] ] ]
}
]

0 comments on commit 392182e

Please sign in to comment.