Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Innawood] Chemistry, electricity, and more! #56348

Merged
merged 8 commits into from
Mar 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions data/mods/innawood/hobbies.json
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" ]
}
]
19 changes: 19 additions & 0 deletions data/mods/innawood/items/electronics.json
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
}
]
22 changes: 22 additions & 0 deletions data/mods/innawood/items/vehicle_battery.json
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 data/mods/innawood/mapgen/map_extras/trapdoor_spider_den.json
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" ]
}
}
]
3 changes: 2 additions & 1 deletion data/mods/innawood/mining/recipes/smelting.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"batch_time_factors": [ 90, 4 ],
"autolearn": true,
"//": "Yield is just over 98% by weight, each output of copper is 400 weight. Volume of output is massively oversize however.",
"result_mult": 22,
"result_mult": 21,
"byproducts": [ [ "platinum_small" ] ],
"tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "fire", -1 ], [ "toolset", 10 ] ] ],
"components": [ [ [ "chunk_copper", 1 ] ] ]
},
Expand Down
21 changes: 21 additions & 0 deletions data/mods/innawood/mutations/mutations.json
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" ]
}
]
63 changes: 63 additions & 0 deletions data/mods/innawood/recipes/chem_fuel.json
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" ]
}
]
57 changes: 57 additions & 0 deletions data/mods/innawood/recipes/chem_other.json
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 ]
]
]
}
]
43 changes: 43 additions & 0 deletions data/mods/innawood/recipes/electronic_parts.json
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 ] ]
]
}
]
18 changes: 18 additions & 0 deletions data/mods/innawood/recipes/food_drinks.json
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 ] ] ]
}
]
76 changes: 76 additions & 0 deletions data/mods/innawood/recipes/medsandchemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,81 @@
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
"components": [ [ [ "oxy_powder", 200 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ], [ [ "charcoal", 25 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "bleach",
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_CHEMICALS",
"skill_used": "chemistry",
"skills_required": [ "electronics", 2 ],
"difficulty": 4,
"time": "25 m",
"batch_time_factors": [ 90, 4 ],
"//": "another variation of chloralkali process, now used to produce bleach (sodium hypochlorite - or rather rough, technical grade hypochlorite/hydroxide/chloride mix), note we will not be heating anything and that the (mostly) electrochemical reaction easily scales in size, some hydrogen gas could be recoverable (optional byproduct)",
"autolearn": true,
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "electrolysis_kit", 250 ] ] ],
"components": [ [ [ "salt_water", 2 ], [ "saline", 10 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "oxy_powder",
"byproducts": [ [ "salt_water", 2 ] ],
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_CHEMICALS",
"skill_used": "chemistry",
"skills_required": [ "electronics", 2 ],
"difficulty": 5,
"time": "45 m",
"batch_time_factors": [ 60, 4 ],
"//": "abstracting using chloralkali process (hot solution, unpartitioned cell) to produce sodium chlorate, then perchlorate by anodic oxidation on platinum, then ammonia perchlorate by double decomposition from sodium perchlorate and ammonium chloride; while we can't directly use bleach here but we do end up recovering some brine",
"autolearn": true,
"qualities": [ { "id": "CHEM", "level": 2 }, { "id": "BOIL", "level": 1 } ],
"tools": [ [ [ "electrolysis_kit", 750 ] ], [ [ "surface_heat", 25, "LIST" ] ], [ [ "platinum_small", -1 ] ] ],
"components": [ [ [ "salt_water", 4 ], [ "saline", 20 ] ], [ [ "ammonia", 1 ] ], [ [ "chem_muriatic_acid", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "latex",
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_OTHER",
"skill_used": "chemistry",
"difficulty": 2,
"autolearn": true,
"time": "3 m",
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "FINE_GRIND", "level": 1 } ],
"components": [ [ [ "spurge", 20 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "chunk_rubber",
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_OTHER",
"skill_used": "chemistry",
"difficulty": 3,
"autolearn": true,
"time": "30 m",
"//": "This is not actually accurate; producing rubber from formic acid and latex generally takes around 12 hours. However, it will be better if we simply create some kind of curing rubber, and let it naturally evolve into rubber chunks from there. Nobody has twelve hours to watch rubber form in a zombie apocalypse.",
"components": [ [ [ "latex", 5 ] ], [ [ "formic_acid", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "formic_acid",
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_DRUGS",
"skill_used": "chemistry",
"difficulty": 2,
"time": "20 m",
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "FINE_GRIND", "level": 1 } ],
"autolearn": true,
"//": "Should likely come from an entomology text, or something similar, in the future; but still relatively basic.",
"tools": [ [ [ "funnel", -1 ], [ "metal_funnel", -1 ] ] ],
"components": [ [ [ "wasp_sting", 1 ], [ "bee_sting", 1 ] ] ]
}
]
Loading