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

Extracts and Concentrates pt 1 #37936

Merged

Conversation

NastyNate2612
Copy link
Contributor

@NastyNate2612 NastyNate2612 commented Feb 11, 2020

added butane can, plastic gasket, and dab pen on/off items

Summary

SUMMARY: Content "part 1 of my extracts and concentrates mod adding into mainline"

Describe the solution

-plastic gasket: single use item used in various recipes
-butane can: explosive item used in crafting recipes, will rework soon to adding butane as an ammo type and making butane tanks refillable etc.
-dab pen on/off: battery operated device used for consuming distillate cartridges

Describe alternatives you've considered

i tried making the dab pen a couple different ways (categorizing it as a comestible, like the ecig, or like a tool using the consume drug action. this seems to be the best method for now.

Testing

All fully tested, crafted items and tested usage

Additional context

im gonna add everything in groups and add all the recipes in at the end. descriptions are subject to change

added butane can, plastic gasket, and dab pen on/off items
@NastyNate2612
Copy link
Contributor Author

uggghhh i suck at writing these PR's. anyways heres part 1 of my many parts to be added in

@NastyNate2612
Copy link
Contributor Author

Explosive data on the butane is accurate in case anyone was wondering

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact labels Feb 11, 2020
add . and -

Co-Authored-By: matskuman5 <[email protected]>
Copy link
Member

@I-am-Erk I-am-Erk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly just string cleanup

Imma wanna see that gasket show up in a bunch of furniture and item recipes/deconstructions in the future! That's not exclusively your job though. In future PRs we should slip it into a few of the lab and medical machines.

data/json/items/tool/misc.json Outdated Show resolved Hide resolved
data/json/items/tool/misc.json Outdated Show resolved Hide resolved
data/json/items/tool/misc.json Outdated Show resolved Hide resolved
data/json/items/tool/misc.json Outdated Show resolved Hide resolved
data/json/items/tool/misc.json Outdated Show resolved Hide resolved
data/json/items/tool/misc.json Outdated Show resolved Hide resolved
data/json/items/tool/misc.json Outdated Show resolved Hide resolved
data/json/items/tool/misc.json Outdated Show resolved Hide resolved
"color": "dark_gray",
"looks_like": "plastic_chunk",
"weight": "20 g",
"volume": "250 ml",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a huge gasket, how big is this intended to be? That would be something you'd see in, like, large industrial machinery

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I'll have to weigh a few and see what they r and then calculate volume

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

theres about 3 different size gaskets for the closed look extractors, 6" wide diameter, 4" wide, and 2" wide. the 6" wide one is pretty large, we could probably drop the volume down to 180ml but the weight should stay the same or increased actually. still havent weighed one yet, ill get to that later this evening.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whats the weight/volume on a plastic chunk? i didnt think about being able to get more than 1 gasket out of a plastic chunk but that might be a possiblilty

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

theres about 3 different size gaskets for the closed look extractors, 6" wide diameter, 4" wide, and 2" wide. the 6" wide one is pretty large, we could probably drop the volume down to 180ml but the weight should stay the same or increased actually. still havent weighed one yet, ill get to that later this evening.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need a whole ton of different gaskets. Just choose a medium number and abstract it from there, as we do with things like hinges.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check it now and tell me what you think. i dropped weight down to 5g and volume down to 60ml, also gave a small "//" description.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops i mean 30ml :-)

data/json/items/tool/misc.json Outdated Show resolved Hide resolved
@I-am-Erk I-am-Erk changed the title Update misc.json Extracts and Concentrates pt 1 Feb 12, 2020
@NastyNate2612
Copy link
Contributor Author

I marked all the items with the "eac" prefix since all the items were leaving my mod folder. Im ok with changing all the names to common names, please add my name to the credits as author for this extraction system if so. I'm quite proud of this work considering I didnt know anything about modding json files before attempting it. About 60+hrs of work here.

@I-am-Erk
Copy link
Member

We don't really have credits in game, but your name will be forever emblazoned in the humorously named Git Blame for this.

@I-am-Erk
Copy link
Member

If your mod is cu

@I-am-Erk I-am-Erk closed this Feb 12, 2020
@I-am-Erk I-am-Erk reopened this Feb 12, 2020
@NastyNate2612
Copy link
Contributor Author

?? Cu?

@I-am-Erk
Copy link
Member

I meant to cancel that and clicked "close and comment" by accident, then forgot I'd commented.

I was going to say that if your mod is already circulating, you could consider adding item migrations to it so that the items in the mod will change to match the item ID's in the game, but then I rethought it and figured we should discuss that later after these items start merging.

@NastyNate2612
Copy link
Contributor Author

Ahh ok I gotcha. Whenever u merge I'll just change the id names on the mod to reflect the same so theres no issues and I'll put up a post telling people its merged and obsolete or something like that

Copy link
Member

@I-am-Erk I-am-Erk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep looks good now. Will merge it as soon as stable hits.

@ZhilkinSerg ZhilkinSerg changed the base branch from master to dev March 16, 2020 12:03
@ZhilkinSerg ZhilkinSerg merged commit 3b2d6bc into CleverRaven:dev Mar 16, 2020
@ZhilkinSerg ZhilkinSerg mentioned this pull request Mar 16, 2020
13 tasks
ZhilkinSerg pushed a commit that referenced this pull request Mar 17, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 17, 2020
@NastyNate2612 NastyNate2612 deleted the Extracts-and-Concentrates-pt-1 branch March 18, 2020 00:33
ZhilkinSerg pushed a commit that referenced this pull request Mar 18, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 29, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 1, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 1, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 2, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants