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

Add cordless drills to "power tools" itemgroup, create corded power drills #68021

Merged
merged 6 commits into from
Sep 7, 2023

Conversation

dchieh222
Copy link
Contributor

@dchieh222 dchieh222 commented Sep 6, 2023

Summary

Content "Add cordless drills to "power tools" itemgroup and create corded power drills"

Purpose of change

This adds cordless drills to the "power tools" itemgroup, so they will spawn correctly in hardware stores as expected.
This also adds corded drills, as well as to the recipes where they should be in, with the same cost as the cordless cousins.

Describe the solution

This allows cordless drills, a common item, to appear in hardware stores and hardware superstores as might be plausibly expected. This also creates a corded power drill item which functions similarly but without a battery.

Describe alternatives you've considered

Convince myself that cordless drills are not power tools. Submit this PR as a one-line change to add cordless drills to power tools.

Testing

This was tested locally and found to work as expected. Corded power tools also behaved as expected, with functionality enabled only after being plugged in.

Additional context

- modified corded power drill to be able to be used for recipes which also use a cordless power drill in the same capacity
- it should appear in itemgroups where cordless power drills may also appear
- power tools now have drills, both cordless and corded as appropriate
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON SDL: Tiles / Sound Tiles visual interface and sounds. Spawn Creatures, items, vehicles, locations appearing on map astyled astyled PR, label is assigned by github actions labels Sep 6, 2023
data/json/items/tool/workshop.json Outdated Show resolved Hide resolved
data/json/items/tool/workshop.json Outdated Show resolved Hide resolved
data/json/recipes/ammo/components.json Outdated Show resolved Hide resolved
data/json/recipes/ammo/components.json Outdated Show resolved Hide resolved
data/json/requirements/toolsets.json Outdated Show resolved Hide resolved
data/json/requirements/toolsets.json Outdated Show resolved Hide resolved
data/json/requirements/toolsets.json Outdated Show resolved Hide resolved
@dchieh222
Copy link
Contributor Author

I will lint the json in the morning.

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 6, 2023
…eds two spaces between sentences).

Added a bit more description for the power drill.
@dchieh222
Copy link
Contributor Author

Can someone rerun the tests? Thanks.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 7, 2023
@Maleclypse Maleclypse merged commit b5d9625 into CleverRaven:master Sep 7, 2023
@dchieh222 dchieh222 deleted the drillbranch branch September 8, 2023 01:44
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 [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions SDL: Tiles / Sound Tiles visual interface and sounds. Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants