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

Adding a bong and its spawn conditions #78342

Merged
merged 28 commits into from
Dec 7, 2024

Conversation

SJTheNewOne
Copy link
Contributor

@SJTheNewOne SJTheNewOne commented Dec 4, 2024

Summary

Content "Add water pipe and spawns"

Purpose of change

Adding a water pipe, also known as a "bong" to the game - an item that can be used for smoking, and also can contain some water. This specific example is based off of mass-manufactured water pipes which are often found in headshops, sold under the pretense of being used for tobacco - even in legalized areas, you find bongs being sold with labels saying something to the effect of 'tobacco use only' due to manufacture often taking place in countries where cannabis is highly illegal.

Describe the solution

Adds a tool with the capacity to hold 500 ml of liquid, be used for smoking, boiling, and other purposes. A merger between a 0.5 liter jar and a tobacco pipe, code-wise.

Describe alternatives you've considered

Suffering through my stoner character using a dry pipe. Clearly, this breaks my immersion.

Testing

I tested cooking (was able to boil water and make soup without crashes), containing (held items just fine), smoking, and spawning. It can be used without issue when full of liquid, replicating the actual process of smoking with a water pipe.

Additional context

This was a modding experiment that got approval from the community and people asked if I would add it. I decided to give it a swing.

Screenshot 2024-12-04 111042
Screenshot 2024-12-04 120953
Screenshot 2024-12-04 124032
Screenshot 2024-12-04 131804
Screenshot 2024-12-04 110946

This adds a new item, the water pipe, which represents glass water pipes, also known as "Bongs" and spawn conditions for them.
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Spawn Creatures, items, vehicles, locations appearing on map new contributor labels Dec 4, 2024
SJTheNewOne and others added 8 commits December 4, 2024 14:20
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Dec 4, 2024
@RedMisao
Copy link
Contributor

RedMisao commented Dec 5, 2024

I wasn't aware this was not already present in game.
Also, are these fragile? I've seen videos where these things seem to be indestructible.

@SJTheNewOne
Copy link
Contributor Author

SJTheNewOne commented Dec 5, 2024

I wasn't aware this was not already present in game. Also, are these fragile? I've seen videos where these things seem to be indestructible.

Yeah I was surprised too. As for indestructibility, I only really have my own anecdotes but I've had enough sheepish people walk up to me saying "yeah...I broke my bong...." when I worked in the cannabis industry that I cannot imagine it would last long being used as a bludgeon. Thick glass can only get you so far.

Added variants
Upped spawn in 'stoner' group.
@SJTheNewOne
Copy link
Contributor Author

SJTheNewOne commented Dec 5, 2024

I adjusted the spawn value (its in the drugs_stash and stoner item groups, below is a screenshot of the stoner item group) and added variants, simply for flavour purposes.
Screenshot 2024-12-04 203321
Screenshot 2024-12-04 212806
Screenshot 2024-12-04 212827

data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 5, 2024
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
Copy link
Contributor

github-actions bot commented Dec 5, 2024

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A handblown water pipe, also known as a 'bong'. Lovingly crafted by an artisan, a true fusion of aesthetic sensibilities and stoner functionalities.
  • A mass-manufactured water pipe, otherwise known as a 'bong'. It is colored with the 'rasta' pattern of red, yellow, and green.
  • handblown bong
  • handblown bongs
  • rasta bong
  • rasta bongs

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

data/json/items/tool/smoking.json Outdated Show resolved Hide resolved
@SJTheNewOne SJTheNewOne requested a review from Karol1223 December 7, 2024 00:27
Copy link
Contributor

@Karol1223 Karol1223 left a comment

Choose a reason for hiding this comment

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

Seems fine to me so far. I'd also ask for a disassembly to go in hand with other simple glass items (so blind easy, 1 second, throwing it on the ground to shatter it to shards) but it's not technically necessary to go through.

@Maleclypse Maleclypse merged commit df0d134 into CleverRaven:master Dec 7, 2024
23 of 24 checks passed
@Maleclypse
Copy link
Member

Seems fine to me so far. I'd also ask for a disassembly to go in hand with other simple glass items (so blind easy, 1 second, throwing it on the ground to shatter it to shards) but it's not technically necessary to go through.

I figure this can be a followup PR as it looks like this person was a new contributor and had to request test approvals each time they updated the PR.

@SJTheNewOne SJTheNewOne deleted the chrisisthataweed branch December 8, 2024 03:16
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 Map / Mapgen Overmap, Mapgen, Map extras, Map display new contributor Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants