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
Merged
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c9bd835
Update misc.json
NastyNate2612 Feb 11, 2020
b48671a
Update data/json/items/tool/misc.json
NastyNate2612 Feb 12, 2020
da34608
changed description
NastyNate2612 Feb 13, 2020
7805dbf
change id
NastyNate2612 Feb 13, 2020
a75b5a8
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
0c3b6ae
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
71ff690
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
ad632b0
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
1d43955
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
99ea497
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
a0493b5
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
7b9c681
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
66658b5
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
9206d87
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
c7d696e
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
136fb24
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
9159fef
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
2bdb768
Update data/json/items/tool/misc.json
NastyNate2612 Feb 13, 2020
cf9b571
Apply suggestions from code review
NastyNate2612 Feb 13, 2020
23cd381
changed gasket_plastic weight and added "//" info
NastyNate2612 Feb 13, 2020
0eb17d8
Update misc.json
NastyNate2612 Feb 13, 2020
b0dc264
Update misc.json
NastyNate2612 Feb 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 105 additions & 0 deletions data/json/items/tool/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,31 @@
"color": "yellow",
"flags": [ "WATCH", "ALARMCLOCK" ]
},
{
"type": "TOOL",
"id": "eac_butane_can",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"name": "can of butane",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"name_plural": "cans of butane",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"description": "A typical can of butane that you would normally use to fill a lighter, buuuuut there might be another use... ",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"symbol": "!",
"color": "dark_gray",
"looks_like": "spray_can",
"weight": "420 g",
"volume": "500 ml",
"price": 1500,
"initial_charges": 30,
"max_charges": 30,
"charges_per_use": 1,
"material": "steel",
"flags": [ "EXPLOSIVE", "EXPLODES" ],
"explosion": {
"power": 4503,
"distance_factor": 0.1,
"fire": true,
"shrapnel": { "casing_mass": 50, "fragment_mass": 0.05, "recovery": 0 }
},
"explode_in_fire": true
},
{
"id": "cow_bell",
"type": "TOOL",
Expand All @@ -58,6 +83,70 @@
"color": "brown",
"use_action": "BELL"
},
{
"type": "TOOL",
"id": "eac_dab_pen",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"name": "dab pen",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"name_plural": "dab pens",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"description": "A battery operated dab pen used for smoking cannabis distillate cartridges. ",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"symbol": "!",
"color": "dark_gray",
"looks_like": "ecig",
"weight": "20 g",
"volume": "100 ml",
"price": 2500,
"material": "plastic",
"ammo": "battery",
"magazines": [
[
"battery",
[ "light_minus_battery_cell", "light_minus_disposable_cell", "light_battery_cell", "light_disposable_cell" ]
]
],
"charges_per_use": 1,
"max_charges": 100,
"use_action": {
"target": "eac_dab_pen_on",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"msg": "You turn on the dab pen.",
"active": true,
"need_charges": 1,
"need_charges_msg": "The dab pen's batteries need more charge. ",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"type": "transform"
}
},
{
"type": "TOOL",
"id": "eac_dab_pen_on",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"name": "dab pen (on)",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"name_plural": "dab pens (on)",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"description": "dab pen (on), now all you need is a distillate cartridge and you're ready to rock and roll. ",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"symbol": "!",
"color": "dark_gray",
"looks_like": "ecig",
"weight": "20 g",
"volume": "100 ml",
"price": 2500,
"material": "plastic",
"ammo": "battery",
"power_draw": 9000,
"revert_to": "eac_dab_pen",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"magazines": [
[
"battery",
[ "light_minus_battery_cell", "light_minus_disposable_cell", "light_battery_cell", "light_disposable_cell" ]
]
],
"charges_per_use": 1,
"max_charges": 100,
"use_action": {
"target": "eac_dab_pen",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"msg": "You turn off the dab pen.",
"active": false,
"need_charges": 0,
"need_charges_msg": "The dab pen's batteries need more charge. ",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"type": "transform"
}
},
{
"id": "e_tool",
"type": "TOOL",
Expand Down Expand Up @@ -345,6 +434,22 @@
"weight": "600 g",
"flags": [ "TRADER_AVOID" ]
},
{
"type": "TOOL",
"id": "eac_gasket_plastic",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"name": "plastic gasket",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"name_plural": "plastic gaskets",
NastyNate2612 marked this conversation as resolved.
Show resolved Hide resolved
"description": " A single-use plastic gasket.",
"symbol": "(",
"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 :-)

"price": 500,
"to_hit": 10,
"bashing": 1,
"material": "plastic"
},
{
"id": "permanent_marker",
"type": "TOOL",
Expand Down