forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Innawood] Chemistry, electricity, and more! (CleverRaven#56348)
- Loading branch information
1 parent
dcde9cd
commit 0cc5c05
Showing
28 changed files
with
1,321 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
[ | ||
{ | ||
"type": "profession", | ||
"subtype": "hobby", | ||
"id": "hates_books", | ||
"name": "Book Hating", | ||
"description": "Reading is for nerds! You've managed to make hatred of the written word a central part of your identity. Or, perhaps, you have a barrier that makes books additionally challenging and frustrating for you. Whatever the reason, boring books are more boring, and you can't have fun by reading books.", | ||
"points": 0, | ||
"traits": [ "HATES_BOOKS" ] | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
[ | ||
{ | ||
"type": "GENERIC", | ||
"id": "makeshift_transformer", | ||
"symbol": ",", | ||
"color": "light_gray", | ||
"name": { "str": "makeshift transformer" }, | ||
"category": "spare_parts", | ||
"looks_like": "power_supply", | ||
"description": "A bundle of cables around an iron core. Useful for controlling voltage.", | ||
"price": 170, | ||
"price_postapoc": 15, | ||
"material": [ "iron", "copper" ], | ||
"weight": "113 g", | ||
"volume": "1 L", | ||
"bashing": 5, | ||
"to_hit": -1 | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
[ | ||
{ | ||
"id": "battery_car_clay", | ||
"type": "MAGAZINE", | ||
"category": "veh_parts", | ||
"name": { "str": "clay car battery", "str_pl": "clay car batteries" }, | ||
"description": "A 12v lead-acid battery used to power car electrical systems, contained in a clay shell.", | ||
"looks_like": "clay_hydria", | ||
"weight": "18000 g", | ||
"volume": "6250 ml", | ||
"price": 4000, | ||
"price_postapoc": 500, | ||
"material": [ "clay" ], | ||
"symbol": ":", | ||
"color": "light_cyan", | ||
"ammo_type": [ "battery" ], | ||
"capacity": 2500, | ||
"//": "58Ah @ 12VDC. Could supply ~700 watts for an hour", | ||
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE" ], | ||
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 2500 } } ] | ||
} | ||
] |
39 changes: 39 additions & 0 deletions
39
data/mods/innawood/mapgen/map_extras/trapdoor_spider_den.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
[ | ||
{ | ||
"type": "mapgen", | ||
"method": "json", | ||
"update_mapgen_id": "mx_Trapdoor_spider_den", | ||
"object": { | ||
"rows": [ | ||
" t s t tt t s ", | ||
" t t t t t ", | ||
" t t d d s ", | ||
"t td t t t t t t ", | ||
" st t t t t ", | ||
"t tt t t d t t tt ", | ||
" t t tt ", | ||
" t d t t tst d tt", | ||
" t t t ", | ||
" t s d t tt s ", | ||
" t tt t ", | ||
" t d tt s t ", | ||
" t t t t t t dt ", | ||
" t t t tt d t tt tt t", | ||
" t tts t t t t tt t", | ||
" tt t tt tt tt t t ", | ||
" d t t tt t tt td ", | ||
" t tt tt t t t t ", | ||
" t t d t t s ", | ||
"t s t t tt d t ", | ||
" t t s t ", | ||
" t t t s t ", | ||
"t d t ", | ||
" s t s " | ||
], | ||
"terrain": { "t": [ "t_region_tree", "t_dirt" ], "s": [ "t_dirt" ] }, | ||
"traps": { "s": { "trap": "tr_spider" } }, | ||
"item": { "d": { "item": "bone" } }, | ||
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] | ||
} | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
[ | ||
{ | ||
"type": "mutation", | ||
"id": "ILLITERATE", | ||
"name": { "str": "Illiterate" }, | ||
"points": 0, | ||
"description": "You never learned to read! Books and computers are off-limits to you.", | ||
"starting_trait": false, | ||
"valid": false, | ||
"cancels": [ "FASTREADER", "SLOWREADER", "PROF_DICEMASTER", "LOVES_BOOKS", "HATES_BOOKS" ] | ||
}, | ||
{ | ||
"type": "mutation", | ||
"id": "HATES_BOOKS", | ||
"name": { "str": "Hates Books" }, | ||
"points": 0, | ||
"description": "Reading is for nerds! Boring books are more boring, and you can't have fun by reading books.", | ||
"valid": false, | ||
"cancels": [ "ILLITERATE", "LOVES_BOOKS" ] | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
[ | ||
{ | ||
"result": "chem_ethanol", | ||
"type": "recipe", | ||
"activity_level": "NO_EXERCISE", | ||
"byproducts": [ [ "water_clean" ] ], | ||
"category": "CC_CHEM", | ||
"subcategory": "CSC_CHEM_FUEL", | ||
"skill_used": "chemistry", | ||
"difficulty": 4, | ||
"time": "30 m", | ||
"autolearn": true, | ||
"qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ], | ||
"tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "thermometer", -1 ] ] ], | ||
"components": [ [ [ "mixed_alcohol_strong", 14 ], [ "mixed_alcohol_weak", 10 ], [ "wash_liquor", 42, "LIST" ] ] ] | ||
}, | ||
{ | ||
"result": "methed_alcohol", | ||
"type": "recipe", | ||
"activity_level": "NO_EXERCISE", | ||
"byproducts": [ [ "water_clean" ] ], | ||
"category": "CC_CHEM", | ||
"subcategory": "CSC_CHEM_FUEL", | ||
"skill_used": "chemistry", | ||
"difficulty": 4, | ||
"time": "30 m", | ||
"autolearn": true, | ||
"qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ], | ||
"tools": [ [ [ "surface_heat", 60, "LIST" ] ] ], | ||
"components": [ [ [ "moonshine", 40 ] ] ] | ||
}, | ||
{ | ||
"result": "biodiesel", | ||
"type": "recipe", | ||
"activity_level": "NO_EXERCISE", | ||
"category": "CC_CHEM", | ||
"subcategory": "CSC_CHEM_FUEL", | ||
"byproducts": [ [ "chem_glycerol", 4 ] ], | ||
"skill_used": "chemistry", | ||
"difficulty": 5, | ||
"result_mult": 4, | ||
"time": "420 m", | ||
"autolearn": true, | ||
"batch_time_factors": [ 99, 1 ], | ||
"qualities": [ { "id": "CHEM", "level": 2 } ], | ||
"tools": [ [ [ "surface_heat", 100, "LIST" ] ] ], | ||
"components": [ | ||
[ [ "water_clean", 4 ], [ "water", 4 ] ], | ||
[ [ "chem_ethanol", 100 ], [ "chem_methanol", 100 ], [ "denat_alcohol", 100 ], [ "methed_alcohol", 100 ] ], | ||
[ [ "lye_powder", 8 ] ], | ||
[ | ||
[ "cooking_oil", 64 ], | ||
[ "cooking_oil2", 64 ], | ||
[ "edible_tallow_lard", 8, "LIST" ], | ||
[ "tallow_tainted", 8 ], | ||
[ "any_fat", 16, "LIST" ], | ||
[ "lamp_oil", 1000 ], | ||
[ "motor_oil", 1000 ] | ||
] | ||
], | ||
"flags": [ "ALLOW_ROTTEN" ] | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
[ | ||
{ | ||
"result": "rubber_cement", | ||
"type": "recipe", | ||
"activity_level": "LIGHT_EXERCISE", | ||
"category": "CC_CHEM", | ||
"subcategory": "CSC_CHEM_OTHER", | ||
"skill_used": "chemistry", | ||
"difficulty": 3, | ||
"time": "20 m", | ||
"autolearn": true, | ||
"qualities": [ { "id": "CHEM", "level": 1 } ], | ||
"tools": [ [ [ "food_processor", 20 ] ] ], | ||
"components": [ | ||
[ [ "chem_acetone", 1 ], [ "chem_chloroform", 250 ], [ "ammonia", 1 ] ], | ||
[ [ "chem_ethanol", 10 ], [ "denat_alcohol", 10 ], [ "methed_alcohol", 10 ], [ "chem_methanol", 10 ] ], | ||
[ | ||
[ "balloon", 2 ], | ||
[ "condom", 2 ], | ||
[ "gloves_medical", 2 ], | ||
[ "chunk_rubber", 1 ], | ||
[ "latex", 2 ], | ||
[ "gum", 20 ], | ||
[ "sheet_neoprene", 11 ], | ||
[ "scrap_neoprene", 16 ], | ||
[ "neoprene", 1 ] | ||
] | ||
] | ||
}, | ||
{ | ||
"result": "rubber_cement", | ||
"type": "recipe", | ||
"activity_level": "LIGHT_EXERCISE", | ||
"category": "CC_CHEM", | ||
"subcategory": "CSC_CHEM_OTHER", | ||
"skill_used": "chemistry", | ||
"difficulty": 3, | ||
"time": "2 h", | ||
"autolearn": true, | ||
"qualities": [ { "id": "CHEM", "level": 1 } ], | ||
"components": [ | ||
[ [ "chem_acetone", 1 ], [ "chem_chloroform", 250 ], [ "ammonia", 1 ] ], | ||
[ [ "chem_ethanol", 10 ], [ "denat_alcohol", 10 ], [ "methed_alcohol", 10 ], [ "chem_methanol", 10 ] ], | ||
[ | ||
[ "balloon", 2 ], | ||
[ "condom", 2 ], | ||
[ "gloves_medical", 2 ], | ||
[ "chunk_rubber", 1 ], | ||
[ "latex", 2 ], | ||
[ "gum", 20 ], | ||
[ "sheet_neoprene", 11 ], | ||
[ "scrap_neoprene", 16 ], | ||
[ "neoprene", 1 ] | ||
] | ||
] | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
[ | ||
{ | ||
"result": "battery_car_clay", | ||
"type": "recipe", | ||
"activity_level": "LIGHT_EXERCISE", | ||
"category": "CC_ELECTRONIC", | ||
"subcategory": "CSC_ELECTRONIC_PARTS", | ||
"skill_used": "electronics", | ||
"difficulty": 3, | ||
"skills_required": [ "fabrication", 2 ], | ||
"time": "30 m", | ||
"autolearn": true, | ||
"using": [ [ "soldering_standard", 10 ], [ "glazing", 2 ], [ "earthenware_firing", 120 ] ], | ||
"proficiencies": [ { "proficiency": "prof_plasticworking" } ], | ||
"qualities": [ { "id": "SCREW", "level": 1 } ], | ||
"components": [ | ||
[ [ "scrap", 4 ] ], | ||
[ [ "lead", 3200 ] ], | ||
[ [ "chem_sulphuric_acid", 13 ] ], | ||
[ [ "water", 2 ], [ "water_clean", 2 ] ], | ||
[ [ "clay_lump", 5 ] ] | ||
] | ||
}, | ||
{ | ||
"type": "recipe", | ||
"activity_level": "LIGHT_EXERCISE", | ||
"result": "light_bulb", | ||
"category": "CC_ELECTRONIC", | ||
"subcategory": "CSC_ELECTRONIC_LIGHTING", | ||
"skill_used": "fabrication", | ||
"difficulty": 4, | ||
"time": "30 m", | ||
"autolearn": true, | ||
"proficiencies": [ { "proficiency": "prof_glassblowing" } ], | ||
"qualities": [ { "id": "CHISEL", "level": 3 } ], | ||
"tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 75 ] ] ], | ||
"components": [ | ||
[ [ "glass_shard", 3 ], [ "pipe_glass", 1 ], [ "flask_glass", 3 ], [ "test_tube", 6 ], [ "marble", 75 ] ], | ||
[ [ "scrap", 1 ] ], | ||
[ [ "charcoal", 1 ] ] | ||
] | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
[ | ||
{ | ||
"type": "recipe", | ||
"result": "tea_willowbark", | ||
"activity_level": "NO_EXERCISE", | ||
"category": "CC_FOOD", | ||
"subcategory": "CSC_FOOD_DRINKS", | ||
"skill_used": "cooking", | ||
"skills_required": [ "survival", 5 ], | ||
"difficulty": 4, | ||
"time": "12 m", | ||
"batch_time_factors": [ 80, 4 ], | ||
"autolearn": true, | ||
"qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CUT", "level": 1 } ], | ||
"tools": [ [ [ "water_boiling_heat", 8, "LIST" ] ] ], | ||
"components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "willowbark", 1 ] ] ] | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.