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

water rework part 1 #72252

Merged
merged 14 commits into from
Jun 4, 2024
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: osuphobia <78858975+osuphobia@users.noreply.github.com>
  • Loading branch information
nornagon and osuphobia authored May 1, 2024
commit 19f181ab5d82cfa1a8411d522171de353edfc21e
2 changes: 1 addition & 1 deletion data/json/items/tool/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@
"//": "Slow sand biofilter: https://wwwnc.cdc.gov/travel/yellowbook/2024/preparing/water-disinfection#:~:text=Figure%202%2D02.%20Emergency%20gravel%20and%20sand%20filter",
"description": "An improvised water filter made from a plastic bucket filled with a layer of sand and a layer of gravel. It can be used to remove particulates and some pathogens from water, but it is not 100% effective.",
"//2": "Density of sand is around 1.6g/cm^3. Gravel is similar. pi * 5in * 5in * (10 in + 4 in) * 1.6 g/cm^3 ~= 29 kg. Add 1 kg for the bucket itself.",
"weight": "30 kg",
"weight": "14.8 kg",
nornagon marked this conversation as resolved.
Show resolved Hide resolved
"volume": "21000 ml",
"price": 1000,
"price_postapoc": 150,
Expand Down
7 changes: 3 additions & 4 deletions data/json/recipes/recipe_food.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,20 @@
"skill_used": "survival",
"time": "1 m",
"autolearn": true,
"tools": [ [ [ "pur_tablets", 1 ] ] ],
"components": [ [ [ "water_murky", 1 ] ] ]
"components": [ [ [ "water_murky", 1 ] ], [ [ "pur_tablets", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "NO_EXERCISE",
"result": "water",
"charges": 10,
"category": "CC_FOOD",
"id_suffix": "using_water_purifier",
"id_suffix": "using_water_filter_sand",
"subcategory": "CSC_FOOD_DRINKS",
"skill_used": "survival",
"time": "15 m",
"autolearn": true,
"tools": [ [ "water_filter_sand" ] ],
"tools": [ [ "water_filter_sand", -1 ] ],

Check failure on line 111 in data/json/recipes/recipe_food.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> Expected an array, got int "time": "15 m", "autolearn": true, "tools": [ [ "water_filter_sand", -1 ] ], ▲▲▲ "components": [ [ [ "water_murky", 10 ] ] ] },

Check failure on line 111 in data/json/recipes/recipe_food.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

([slow] ~starting_items)=> Expected an array, got int "time": "15 m", "autolearn": true, "tools": [ [ "water_filter_sand", -1 ] ], ▲▲▲ "components": [ [ [ "water_murky", 10 ] ] ] },
nornagon marked this conversation as resolved.
Show resolved Hide resolved
"components": [ [ [ "water_murky", 10 ] ] ]
},
{
Expand Down
Loading