More types of alcohol #35164

Brytenwalda · 2019-10-30T12:56:58Z

Summary

SUMMARY: Content "Several new types of alcohol."

Purpose of change

This change is small but surely very significant for all of us alcoholics out there. It will add variety to our travels.

Describe the solution

I added several types of whisky and fortified wines (sherry and madeira).
I also added it to proper item groups and made it spawn in mansions.

Describe alternatives you've considered

Testing

Everything should be working just fine. It's a very small change.

curstwist · 2019-10-30T13:16:15Z

Make sure your put them into some item_groups so they can spawn.

I'd also request you add them to this specific flask item_group:
https://github.com/CleverRaven/Cataclysm-DDA/blob/d560dfc47119623f97c2e17332238169a5e98fe0/data/json/itemgroups/food_service.json

    "id": "flask_liquor",
    "type": "item_group",
    "subtype": "distribution",
    "items": [
      [ "flask_hip", 100 ],
      { "item": "whiskey", "prob": 40, "container-item": "flask_hip" },
      { "item": "vodka", "prob": 30, "container-item": "flask_hip" },
      { "item": "gin", "prob": 20, "container-item": "flask_hip" },
      { "item": "rum", "prob": 20, "container-item": "flask_hip" },
      { "item": "tequila", "prob": 20, "container-item": "flask_hip" },
      { "item": "brandy", "prob": 10, "container-item": "flask_hip" },
      { "item": "moonshine", "prob": 5, "container-item": "flask_hip" }
    ]
  }

ghost · 2019-10-30T13:20:48Z

Needs a linting

Brytenwalda · 2019-10-30T13:51:38Z

Make sure your put them into some item_groups so they can spawn.

I'd also request you add them to this specific flask item_group:
https://github.com/CleverRaven/Cataclysm-DDA/blob/d560dfc47119623f97c2e17332238169a5e98fe0/data/json/itemgroups/food_service.json

    "id": "flask_liquor",
    "type": "item_group",
    "subtype": "distribution",
    "items": [
      [ "flask_hip", 100 ],
      { "item": "whiskey", "prob": 40, "container-item": "flask_hip" },
      { "item": "vodka", "prob": 30, "container-item": "flask_hip" },
      { "item": "gin", "prob": 20, "container-item": "flask_hip" },
      { "item": "rum", "prob": 20, "container-item": "flask_hip" },
      { "item": "tequila", "prob": 20, "container-item": "flask_hip" },
      { "item": "brandy", "prob": 10, "container-item": "flask_hip" },
      { "item": "moonshine", "prob": 5, "container-item": "flask_hip" }
    ]
  }

Thanks! I'll add them soon.

…into alcohol

Night-Pryanik · 2019-10-30T15:56:48Z

I'm ok with madeira and sherry, but do we really need two more varieties of whiskey? We already have whiskey in the game after all.

Brytenwalda · 2019-10-30T18:58:29Z

I'm ok with madeira and sherry, but do we really need two more varieties of whiskey? We already have whiskey in the game after all.

We already have many different types of wine, why can’t we have more types of whiskey?

Also, there are many variants of things already in game, like books, that are collectibles. The same can be said about whiskey. Collecting different kinds can be an interesting challenge.

FuelType-Memes · 2019-10-30T21:27:19Z

Is it possible to use snippet_category to add different varieties of liquids?

curstwist · 2019-10-30T21:43:49Z

Is it possible to use snippet_category to add different varieties of liquids?

I've tried this using tea varieties. It sort of works but not really. You can spawn them in with the snippet but once you stack bottles of the teas they all take on a single snippet.

I made an issue but it became stale and closed.

Davi-DeGanne · 2019-11-03T21:56:48Z

data/json/items/comestibles/alcohol.json

+  {
+    "type": "COMESTIBLE",
+    "id": "single_pot_whiskey",
+    "name": "single pot still irish whiskey",
+    "name_plural": "single pot still irish whiskey",
+    "weight": "33 g",
+    "color": "brown",
+    "addiction_type": "alcohol",
+    "use_action": "ALCOHOL",
+    "stim": -12,
+    "container": "bottle_glass",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": -12,
+    "healthy": -2,
+    "addiction_potential": 5,
+    "calories": 79,
+    "description": "A bottle of fine Irish whiskey.",
+    "price": 2600,
+    "material": "alcohol",
+    "volume": "250 ml",
+    "flags": [ "EATEN_COLD" ],
+    "freezing_point": -22,
+    "phase": "liquid",
+    "charges": 7,
+    "fun": 20
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cheap_whiskey",
+    "name": "cheap whiskey",
+    "name_plural": "cheap whiskey",
+    "weight": "33 g",
+    "color": "brown",
+    "addiction_type": "alcohol",
+    "use_action": "ALCOHOL",
+    "stim": -12,
+    "container": "bottle_glass",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": -12,
+    "healthy": -2,
+    "addiction_potential": 5,
+    "calories": 79,
+    "description": "A bottle of cheap whiskey.",
+    "price": 1800,
+    "material": "alcohol",
+    "volume": "250 ml",
+    "flags": [ "EATEN_COLD" ],
+    "freezing_point": -22,
+    "phase": "liquid",
+    "charges": 7,
+    "fun": 12
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "canadian_whiskey",
+    "name": "canadian whiskey",
+    "name_plural": "canadian whiskey",
+    "weight": "33 g",
+    "color": "brown",
+    "addiction_type": "alcohol",
+    "use_action": "ALCOHOL",
+    "stim": -12,
+    "container": "bottle_glass",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": -12,
+    "healthy": -2,
+    "addiction_potential": 5,
+    "calories": 79,
+    "description": "A bottle of fine Canadian whiskey.",
+    "price": 2400,
+    "material": "alcohol",
+    "volume": "250 ml",
+    "flags": [ "EATEN_COLD" ],
+    "freezing_point": -22,
+    "phase": "liquid",
+    "charges": 7,
+    "fun": 17
+  },


Please add "copy-from": "whiskey" to these three items and remove the redundant entries.

Read doc/JSON_INHERITANCE.md for more information.

Davi-DeGanne · 2019-11-03T22:01:45Z

data/json/items/comestibles/alcohol.json

+    "type": "COMESTIBLE",
+    "id": "bristol_sherry",
+    "name": "bristol sherry",
+    "name_plural": "sherry_bristol",
+    "weight": "120 g",
+    "color": "brown",
+    "addiction_type": "alcohol",
+    "use_action": "ALCOHOL",
+    "stim": -12,
+    "container": "bottle_glass",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": -12,
+    "healthy": -2,
+    "addiction_potential": 5,
+    "calories": 99,
+    "description": "Finest sherry straight from Bristol.  Adorned with a Royal Purveyor's mark.",
+    "price": 2800,
+    "material": "alcohol",
+    "volume": "750 ml",
+    "flags": [ "EATEN_COLD" ],
+    "freezing_point": -22,
+    "phase": "liquid",
+    "charges": 7,
+    "fun": 18
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "madeira",
+    "name": "madera",
+    "name_plural": "madeira",
+    "weight": "120 g",
+    "color": "brown",
+    "addiction_type": "alcohol",
+    "use_action": "ALCOHOL",
+    "stim": -12,
+    "container": "bottle_glass",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": -12,
+    "healthy": -2,
+    "addiction_potential": 5,
+    "calories": 99,
+    "description": "Fortified wine from Madeira.  A true Royal Navy drink.",
+    "price": 2400,
+    "material": "alcohol",
+    "volume": "750 ml",
+    "flags": [ "EATEN_COLD" ],
+    "freezing_point": -22,
+    "phase": "liquid",
+    "charges": 7,
+    "fun": 15
+  },


Again, please have these two items inherit from sherry.

Kodiologist · 2019-11-04T03:21:49Z

Don't forget to capitalize proper nouns (e.g., "irish" should be "Irish"), and using the word "bottle" in descriptions isn't a great idea, because the descriptions apply to the liquids no matter what container you put them in.

stale · 2019-12-04T04:19:55Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not 'bump' or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

kevingranade · 2019-12-09T01:18:37Z

I'd rather merge this and bolt on the inheritance stuff later than just can it.

Jovus · 2019-12-09T01:48:22Z

Did this also involve changing the appropriate recipes to account for the new alcohol types? I'm thinking specifically of strong mixed alcohol and ethanol, which lead to ether.

Davi-DeGanne · 2019-12-09T02:16:21Z

Looks like no. I added your point to a new issue that summarizes the changes that still ought to be made to these new items.

Brytenwalda added 2 commits October 30, 2019 12:49

Update alcohol.json

b295c67

Update alcohol.json

caa9c7c

Brytenwalda changed the title ~~Alcohol~~ More alcohol Oct 30, 2019

Brytenwalda changed the title ~~More alcohol~~ More types of alcohol Oct 30, 2019

Brytenwalda added 5 commits October 30, 2019 12:58

Update alcohol.json

31c8dc1

Update alcohol.json

e24c6f4

Update alcohol.json

f7de64e

Update alcohol.json

ffa152c

Update alcohol.json

403bd03

curstwist added [JSON] Changes (can be) made in JSON Items: Food / Vitamins Comestibles and drinks Items / Item Actions / Item Qualities Items and how they work and interact labels Oct 30, 2019

Update alcohol.json

8b5fea2

Brytenwalda added 6 commits October 30, 2019 14:03

Spawn

caa892e

Merge branch 'alcohol' of https://github.com/Brytenwalda/Cataclysm-DDA …

98c95e7

…into alcohol

Update food_service.json

eb074ad

Update mansion.json

676eb60

Update alcohol.json

f1f9258

Update alcohol.json

359e09f

Brytenwalda mentioned this pull request Oct 31, 2019

alcohol list revamp and move from item_groups.json to food.json #35178

Closed

Davi-DeGanne suggested changes Nov 3, 2019

View reviewed changes

stale bot added the stale Closed for lack of activity, but still valid. label Dec 4, 2019

weekly-digest bot mentioned this pull request Dec 8, 2019

Weekly Digest (1 December, 2019 - 8 December, 2019) #35955

Closed

stale bot removed the stale Closed for lack of activity, but still valid. label Dec 9, 2019

kevingranade merged commit 3e41421 into CleverRaven:master Dec 9, 2019

Davi-DeGanne mentioned this pull request Dec 9, 2019

Wrap up loose ends for new alcohols from #35164 #35973

Closed

weekly-digest bot mentioned this pull request Dec 15, 2019

Weekly Digest (8 December, 2019 - 15 December, 2019) #36128

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More types of alcohol #35164

More types of alcohol #35164

Brytenwalda commented Oct 30, 2019 •

edited

Loading

curstwist commented Oct 30, 2019

ghost commented Oct 30, 2019

Brytenwalda commented Oct 30, 2019

Night-Pryanik commented Oct 30, 2019

Brytenwalda commented Oct 30, 2019 •

edited

Loading

FuelType-Memes commented Oct 30, 2019

curstwist commented Oct 30, 2019 •

edited

Loading

Davi-DeGanne Nov 3, 2019

Davi-DeGanne Nov 3, 2019

Kodiologist commented Nov 4, 2019

stale bot commented Dec 4, 2019

kevingranade commented Dec 9, 2019

Jovus commented Dec 9, 2019

Davi-DeGanne commented Dec 9, 2019

More types of alcohol #35164

More types of alcohol #35164

Conversation

Brytenwalda commented Oct 30, 2019 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

curstwist commented Oct 30, 2019

ghost commented Oct 30, 2019

Brytenwalda commented Oct 30, 2019

Night-Pryanik commented Oct 30, 2019

Brytenwalda commented Oct 30, 2019 • edited Loading

FuelType-Memes commented Oct 30, 2019

curstwist commented Oct 30, 2019 • edited Loading

Davi-DeGanne Nov 3, 2019

Choose a reason for hiding this comment

Davi-DeGanne Nov 3, 2019

Choose a reason for hiding this comment

Kodiologist commented Nov 4, 2019

stale bot commented Dec 4, 2019

kevingranade commented Dec 9, 2019

Jovus commented Dec 9, 2019

Davi-DeGanne commented Dec 9, 2019

Brytenwalda commented Oct 30, 2019 •

edited

Loading

Brytenwalda commented Oct 30, 2019 •

edited

Loading

curstwist commented Oct 30, 2019 •

edited

Loading