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

Update washboard length #68713

Merged
merged 1 commit into from
Oct 21, 2023
Merged

Conversation

Bobtron
Copy link
Contributor

@Bobtron Bobtron commented Oct 17, 2023

Summary

Bugfixes "Update washboard length to be the same as washing kit"

Purpose of change

A 'washboard' is 50 cm long, cut from a 'plank', while a 'washing kit' is 40 cm long. A washing kit is made from a washboard and a scrubbing tool in 1 second (no time to cut). This change reduces the length of a washboard to 40 cm for consistency. See additional context for recipes and item jsons.

Describe the solution

Reduce the length of the washboard to 40 cm.

Describe alternatives you've considered

Increase the length of the washing kit. (50 cm would make it hard to store)
Increase the time it takes to make washing kit, and add a "CUT" quality similar to washboard recipe. (seems excessive for creating a washing kit)

Testing

JSON only change, ran ./cataclysm-tiles in git repo with updated json files to verify change

Additional context

First PR using github and with CDDA repo, let me know if theres anything I need to do differently

Washboard + Washing Kit recipes

  {
    "type": "recipe",
    "activity_level": "MODERATE_EXERCISE",
    "result": "washboard",
    "category": "CC_OTHER",
    "subcategory": "CSC_OTHER_TOOLS",
    "skill_used": "fabrication",
    "difficulty": 1,
    "time": "25 m",
    "autolearn": true,
    "proficiencies": [ { "proficiency": "prof_carving" } ],
    "qualities": [ { "id": "CUT", "level": 2 } ],
    "components": [ [ [ "2x4", 1 ] ] ]
  }

{
    "type": "recipe",
    "activity_level": "NO_EXERCISE",
    "result": "wash_kit",
    "category": "CC_OTHER",
    "subcategory": "CSC_OTHER_TOOLS",
    "skill_used": "survival",
    "reversible": true,
    "time": "1 s",
    "autolearn": true,
    "components": [ [ [ "washboard", 1 ] ], [ [ "sponge", 1 ], [ "cotton_patchwork", 1 ], [ "brush", 1 ], [ "dish_towel", 1 ] ] ]
  }

Washboard + Washing Kit items (pre change)

{
    "id": "washboard",
    "type": "TOOL",
    "name": { "str": "washboard" },
    "description": "A wooden washboard.  You can use it to wash filthy clothing if it's supplied with cleansing agent.",
    "weight": "1160 g",
    "volume": "900 ml",
    "longest_side": "50 cm",
    "price": 1000,
    "price_postapoc": 50,
    "to_hit": -1,
    "material": [ "wood" ],
    "symbol": ";",
    "color": "white",
    "use_action": [ "WASH_SOFT_ITEMS" ],
    "flags": [ "ALLOWS_REMOTE_USE" ]
  },
  {
    "id": "wash_kit",
    "type": "TOOL",
    "name": { "str": "washing kit" },
    "description": "A combination of a washboard and a scrubbing tool.  Everything you need to clean items after the apocalypse.",
    "weight": "866 g",
    "volume": "2246 ml",
    "longest_side": "40 cm",
    "price": 0,
    "price_postapoc": 50,
    "material": [ "wood", "plastic" ],
    "symbol": "%",
    "color": "yellow",
    "use_action": [ "WASH_ALL_ITEMS" ],
    "flags": [ "ALLOWS_REMOTE_USE", "NO_SALVAGE" ]
  }

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON <Bugfix> This is a fix for a bug (or closes open issue) new contributor json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Oct 17, 2023
@Maleclypse Maleclypse merged commit 882f5d9 into CleverRaven:master Oct 21, 2023
24 of 25 checks passed
@Bobtron Bobtron deleted the WashboardLength branch October 21, 2023 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions new contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants