Skip to content

Commit

Permalink
Minor misc JSON edits (CleverRaven#68257)
Browse files Browse the repository at this point in the history
* animal locker

* atomic coffee

* goo canister

* wire proficiency

* new syntax
  • Loading branch information
Karol1223 authored Oct 28, 2023
1 parent 2017085 commit f16ef6d
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 24 deletions.
2 changes: 1 addition & 1 deletion data/json/items/comestibles/drink.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"healthy": -1,
"addiction_potential": 8,
"calories": 35,
"description": "This serving of coffee has been created using an atomic coffee pot's FULL NUCLEAR brewing cycle. Every possible microgram of caffeine and flavor has been carefully extracted for your enjoyment, using the power of the atom.",
"description": "This serving of coffee has twice as much coffee as black coffee, as well as some caffeine pills and sugar for good measure. You didn't plan to sleep this week anyway, right?",
"price": 300,
"price_postapoc": 100,
"flags": [ "EATEN_HOT", "NO_AUTO_CONSUME" ],
Expand Down
3 changes: 2 additions & 1 deletion data/json/items/vehicle/cargo.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@
"name": { "str": "animal locker" },
"description": "A locker used to contain animals safely during transportation if installed properly. There is room for animal food and other animal care goods. It is meant to hold medium or smaller animals for transport. Use it on a suitable animal to capture, use it on an empty tile to release.",
"weight": "10000 g",
"volume": "31250 ml"
"volume": "31250 ml",
"properties": { "creature_size_capacity": "MEDIUM" }
},
{
"id": "stowed_fridge",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/ammo/weldgas.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "ANVIL", "level": 1 } ],
"tools": [ [ [ "metalworking_tongs", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ], [ [ "wire_draw_machine", 120 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" } ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_wiremaking" } ],
"components": [ [ [ "material_aluminium_ingot", 3 ], [ "scrap_aluminum", 11 ] ] ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/other/parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@
"autolearn": true,
"charges": 182,
"qualities": [ { "id": "ANVIL", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
"proficiencies": [ { "proficiency": "prof_metalworking" } ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_wiremaking" } ],
"//": "Requires annealing 4 times from the copper rod.",
"tools": [
[ [ "metalworking_tongs", -1 ] ],
Expand Down
14 changes: 0 additions & 14 deletions data/json/recipes/recipe_medsandchemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,20 +564,6 @@
[ [ "lye_powder", 2 ] ]
]
},
{
"type": "recipe",
"activity_level": "NO_EXERCISE",
"result": "canister_goo",
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_CHEMICALS",
"skill_used": "fabrication",
"difficulty": 2,
"time": "5 m",
"autolearn": true,
"//": "'stick the blob globs in a can and seal it' does not seem hugely challenging",
"qualities": [ { "id": "SCREW", "level": 1 } ],
"components": [ [ [ "canister_empty", 1 ] ], [ [ "slime_scrap", 10 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
Expand Down
33 changes: 27 additions & 6 deletions data/json/recipes/recipe_others.json
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,11 @@
"result_mult": 6,
"autolearn": true,
"qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_wiremaking" }
],
"tools": [
[ [ "metalworking_tongs", -1 ] ],
[ [ "hotcut", -1 ] ],
Expand Down Expand Up @@ -768,7 +772,11 @@
"result_mult": 6,
"autolearn": true,
"qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_wiremaking" }
],
"tools": [
[ [ "metalworking_tongs", -1 ] ],
[ [ "hotcut", -1 ] ],
Expand Down Expand Up @@ -805,7 +813,11 @@
"result_mult": 6,
"autolearn": true,
"qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_wiremaking" }
],
"tools": [
[ [ "metalworking_tongs", -1 ] ],
[ [ "hotcut", -1 ] ],
Expand Down Expand Up @@ -842,7 +854,11 @@
"result_mult": 6,
"autolearn": true,
"qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_wiremaking" }
],
"tools": [
[ [ "metalworking_tongs", -1 ] ],
[ [ "hotcut", -1 ] ],
Expand Down Expand Up @@ -880,7 +896,11 @@
"autolearn": true,
"qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
"using": [ [ "carbon", 1 ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_wiremaking" }
],
"tools": [
[ [ "metalworking_tongs", -1 ] ],
[ [ "hotcut", -1 ] ],
Expand Down Expand Up @@ -925,7 +945,8 @@
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_quenching", "skill_penalty": 1 }
{ "proficiency": "prof_quenching", "skill_penalty": 1 },
{ "proficiency": "prof_wiremaking" }
],
"tools": [
[ [ "metalworking_tongs", -1 ] ],
Expand Down

0 comments on commit f16ef6d

Please sign in to comment.