Skip to content

Commit 75dd3c5

Browse files
Demon Chitin Flux (#81440)
* Demon Chitin Flux * Update tools.json * Update data/mods/Magiclysm/recipes/blacksmithing.json * Update data/mods/Magiclysm/recipes/blacksmithing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/items/alchemy_items.json * Apply suggestions from code review * Update data/mods/Magiclysm/items/alchemy_items.json * Update data/mods/Magiclysm/items/alchemy_items.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 90545b7 commit 75dd3c5

File tree

5 files changed

+97
-6
lines changed

5 files changed

+97
-6
lines changed

data/mods/Magiclysm/items/alchemy_items.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,21 @@
221221
"flags": [ "SPEAR", "SHEATH_KNIFE" ],
222222
"melee_damage": { "stab": 7 }
223223
},
224+
{
225+
"type": "ITEM",
226+
"id": "demon_chitin_flux",
227+
"category": "spare_parts",
228+
"symbol": ",",
229+
"color": "red",
230+
"name": { "str_sp": "flux of demon chitin" },
231+
"description": "Demon chitin turned into a paste like substance referred to as flux. Used to create new; and fill in, repairing existing demon chitin items.",
232+
"price": "10 USD",
233+
"material": [ "demon_chitin" ],
234+
"weight": "500 mg",
235+
"volume": "1 ml",
236+
"phase": "solid",
237+
"flags": [ "TRADER_AVOID" ]
238+
},
224239
{
225240
"type": "ITEM",
226241
"id": "demon_chitin_piece",

data/mods/Magiclysm/items/enchanted_misc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@
178178
"parabolan_wool",
179179
"gutskin",
180180
"canvas",
181-
"black_dragon_hide",
182-
"demon_chitin"
181+
"black_dragon_hide"
183182
],
184183
"skill": "tailor",
185184
"tool_quality": 1,

data/mods/Magiclysm/items/tools.json

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
"gutskin",
9696
"denim",
9797
"canvas",
98-
"demon_chitin",
9998
"black_dragon_hide"
10099
],
101100
"skill": "tailor",
@@ -129,8 +128,7 @@
129128
"gutskin",
130129
"denim",
131130
"canvas",
132-
"black_dragon_hide",
133-
"demon_chitin"
131+
"black_dragon_hide"
134132
],
135133
"skill": "tailor",
136134
"tool_quality": 1,
@@ -139,6 +137,62 @@
139137
}
140138
]
141139
},
140+
{
141+
"id": "soldering_iron",
142+
"type": "ITEM",
143+
"subtypes": [ "TOOL" ],
144+
"name": { "str": "soldering iron" },
145+
"description": "A device with a metal tip that can get very hot. It is necessary for advanced electronics crafting. Has a short cable that you can plug to your grid.",
146+
"weight": "90 g",
147+
"volume": "120 ml",
148+
"longest_side": "22 cm",
149+
"price": "10 USD",
150+
"price_postapoc": "1 USD",
151+
"material": [ { "type": "plastic", "portion": 75 }, { "type": "copper", "portion": 25 } ],
152+
"symbol": ",",
153+
"color": "light_gray",
154+
"charges_per_use": 1,
155+
"use_action": [
156+
{
157+
"type": "repair_item",
158+
"item_action_type": "repair_metal",
159+
"materials": [ "plastic", "lead", "tin", "zinc", "demon_chitin" ],
160+
"skill": "fabrication",
161+
"cost_scaling": 0.1,
162+
"move_cost": 1500
163+
},
164+
{ "type": "link_up", "cable_length": 3, "charge_rate": "70 W" }
165+
],
166+
"flags": [ "BELT_CLIP", "ALLOWS_REMOTE_USE", "WATER_BREAK" ],
167+
"to_hit": { "grip": "solid", "length": "hand", "surface": "point", "balance": "neutral" },
168+
"melee_damage": { "stab": 2 },
169+
"tool_ammo": [ "battery" ]
170+
},
171+
{
172+
"id": "soldering_iron_portable",
173+
"copy-from": "soldering_iron",
174+
"type": "ITEM",
175+
"subtypes": [ "TOOL" ],
176+
"name": { "str": "portable soldering iron" },
177+
"description": "A device with a metal tip that can get very hot. It is necessary for advanced electronics crafting. This one is a portable version, and contains a slot for a battery.",
178+
"symbol": ",",
179+
"color": "light_gray",
180+
"use_action": [
181+
{
182+
"type": "repair_item",
183+
"item_action_type": "repair_metal",
184+
"materials": [ "plastic", "lead", "tin", "zinc", "demon_chitin" ],
185+
"skill": "fabrication",
186+
"cost_scaling": 0.1,
187+
"move_cost": 1500
188+
}
189+
],
190+
"pocket_data": [
191+
{ "pocket_type": "MAGAZINE_WELL", "flag_restriction": [ "BATTERY_MEDIUM" ], "default_magazine": "medium_battery_cell" }
192+
],
193+
"to_hit": { "grip": "solid", "length": "hand", "surface": "point", "balance": "neutral" },
194+
"melee_damage": { "stab": 2 }
195+
},
142196
{
143197
"id": "parabolan_wool_staple",
144198
"type": "ITEM",

data/mods/Magiclysm/materials.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"latent_heat": 333,
100100
"chip_resist": 10,
101101
"breathability": "POOR",
102-
"repaired_with": "demon_chitin_piece",
102+
"repaired_with": "demon_chitin_flux",
103103
"salvaged_into": "demon_chitin_piece",
104104
"dmg_adj": [ "scratched", "cut", "cracked", "shattered" ],
105105
"bash_dmg_verb": "cracked",

data/mods/Magiclysm/recipes/blacksmithing.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,29 @@
3939
"tools": [ [ [ "demon_forge", 15 ] ], [ [ "metalworking_tongs", -1 ] ] ],
4040
"components": [ [ [ "scrap_bronze", 9 ] ], [ [ "mercury", 400 ] ] ]
4141
},
42+
{
43+
"result": "demon_chitin_flux",
44+
"type": "recipe",
45+
"activity_level": "LIGHT_EXERCISE",
46+
"category": "CC_OTHER",
47+
"subcategory": "CSC_OTHER_MATERIALS",
48+
"skill_used": "chemistry",
49+
"difficulty": 1,
50+
"skills_required": [ "chemistry", 1 ],
51+
"time": "60 m",
52+
"batch_time_factors": [ 70, 5 ],
53+
"autolearn": true,
54+
"using": [ [ "surface_heat", 50 ] ],
55+
"charges": 50,
56+
"qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "COOK", "level": 3 }, { "id": "DISTILL", "level": 1 } ],
57+
"proficiencies": [ { "proficiency": "prof_alchemy", "required": false, "time_multiplier": 1.5, "skill_penalty": 0.5 } ],
58+
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
59+
"components": [
60+
[ [ "charcoal", 50 ] ],
61+
[ [ "crystallized_mana", 1 ] ],
62+
[ [ "any_strong_acid", 4, "LIST" ], [ "demon_chitin_piece", 1 ] ]
63+
]
64+
},
4265
{
4366
"type": "recipe",
4467
"activity_level": "BRISK_EXERCISE",

0 commit comments

Comments
 (0)