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

SUS Bathroom, Part 1 #34738

Merged
merged 47 commits into from
Dec 16, 2019
Merged

Conversation

xanderrootslayer
Copy link
Contributor

@xanderrootslayer xanderrootslayer commented Oct 14, 2019

Summary

SUMMARY: FEATURES "13 new items, complete with crafting and disassembling, are being added with future plans to designate spawn locations. Improvised Shaving Kit has slightly more plausible contents."

Purpose of change

"The Specific Use Storage project started by I-Am-Erk aims to make residential houses more realistic by adding plausible clutter times to houses. The project started with adding plates, dishes and utensils to kitchens, but it needs more content all the time. Bathrooms are a natural next step due to the sheer amount of plastic rubbish they accumulate. Also, this adds a few mechanical items which are useless without a power grid, but can still be scrapped for parts.

Describe the solution

Adding item spawns will take quite a bit of testing, so we need the items to exist in the game's files first. Never make a pull request bigger than your own head.

Describe alternatives you've considered

Attempting to release all the intended changes at once would delay any features or content considerably. Also, the Soap Dish is completely pointless but it's funny.

Testing

The usual, create a Black Belt, spawn in the items and make sure all the interactions are possible.

xanderrootslayer and others added 29 commits June 4, 2019 14:45
ExpandedPrisonBreak Jul 05
adding a few clutter items. This first half is introducing the items, their craft recipes and their uncraft recipes.
@anothersimulacrum
Copy link
Member

*started by @I-am-Erk

more unique ASCII symbols for items
orange is not a creative color
I'm surprised it was running at all before I fixed that.
hair dryers are not weapons
oh.
@anothersimulacrum anothersimulacrum mentioned this pull request Oct 27, 2019
@xanderrootslayer xanderrootslayer marked this pull request as ready for review November 24, 2019 02:25
@kevingranade
Copy link
Member

This needs double spaces after periods throughout.

@I-am-Erk
Copy link
Member

If no one objects I will clean up the remaining problems so this can be merged for the sus expansion project

eg. makes hair dryer results consistent with what you'd get from a desk fan, since many components are the same plus a heating element. Adjusts deconstruction time; very little can be deconstructed in a single second, even a razor.
@I-am-Erk
Copy link
Member

OK, this is largely ready to merge now. I don't see any reason it needs to be in the feature freeze, it doesn't add any features.

@I-am-Erk I-am-Erk removed 0.E Feature Freeze <Enhancement / Feature> New features, or enhancements on existing labels Dec 12, 2019
Comment on lines 521 to 523
[ [ "identification_module", 1 ] ],
[ [ "pathfinding_module", 1 ] ],
[ [ "sensor_module", 1 ] ],
Copy link

@ghost ghost Dec 13, 2019

Choose a reason for hiding this comment

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

Why are robot deconstruction recipes in here? Rebase needed? 🤔

[
  {
    "id": "base_toiletries",
    "name": "generic grooming",
    "type": "GENERIC",
    "description": "generic item template",
    "symbol": "+",
    "color": "blue",
    "price": 200,
    "price_postapoc": 0,
    "weight": 100,
    "volume": "50 ml",
    "material": "plastic",
    "bashing": 1,
    "to_hit": -1
  },
  {
    "id": "soap_holder",
    "name": { "str": "soap dish", "str_pl": "soap dishes" },
    "type": "GENERIC",
    "description": "A shallow dish for holding a bar of soap.  It has ridges to help drain water away from the dish.  Not the most exciting of items.",
    "symbol": "-",
    "copy-from": "base_toiletries"
  },
  {
    "id": "razor_shaving",
    "name": "shaving razor",
    "type": "GENERIC",
    "description": "A razor blade on a comfortable handle.  Much easier to shave with than a loose razor.",
    "symbol": "t",
    "copy-from": "base_toiletries",
    "price": 800,
    "price_postapoc": 1200,
    "//": "the end of the world doesn't mean everyone is okay with having ZZ Top beards.  disposable razors are a hot commodity.  The razor also loses the Cutting 1 quality.  Don't ask how we confirmed this.",
    "weight": 110,
    "material": [ "plastic", "steel" ],
    "cutting": 2
  },
  {
    "id": "toothbrush_plain",
    "name": { "str": "toothbrush", "str_pl": "toothbrushes" },
    "type": "GENERIC",
    "description": "A plastic brush with soft bristles for cleaning your teeth.",
    "symbol": "/",
    "copy-from": "base_toiletries",
    "snippet_category": [
      {
        "id": "tbrush1",
        "text": "A plastic brush with soft bristles for cleaning your teeth.  It has a cheap, blocky handle and is likely meant to be disposable."
      },
      {
        "id": "tbrush2",
        "text": "A combination toothbrush and gum massager.  It has an ergonomic silicone grip.  Luxurious!"
      },
      {
        "id": "tbrush3",
        "text": "A plastic brush with soft bristles for cleaning your teeth.  The blue and white pattern on the handle implies cleanliness."
      },
      {
        "id": "tbrush4",
        "text": "A short toothbrush designed for children.  It has a wide-eyed cartoon pony on the handle."
      },
      {
        "id": "tbrush5",
        "text": "A short toothbrush designed for children.  It has a grinning red racecar on the handle."
      }
    ]
  },
  {
    "id": "hairbrush",
    "name": { "str": "hairbrush", "str_pl": "hairbrushes" },
    "type": "GENERIC",
    "description": "An instrument of hair torture.",
    "symbol": "/",
    "copy-from": "base_toiletries",
    "snippet_category": [
      { "id": "hbrush1", "text": "An instrument of hair torture.  There are round safety tips on the bristles." },
      { "id": "hbrush2", "text": "An old-fashioned hair-straightening device with a faux-wood handle." },
      { "id": "hbrush3", "text": "A soft, cushioned hairbrush.  The shiny chrome design appears modern." },
      { "id": "hbrush4", "text": "A tacky kid's hairbrush.  The cartoon whale on the handle seems friendly enough." }
    ]
  },
  {
    "id": "curler_hair",
    "name": "hair curler",
    "type": "GENERIC",
    "description": "A soft plastic cylinder you can wrap a lock of your hair around to curl it.",
    "copy-from": "base_toiletries",
    "symbol": ",",
    "weight": 20,
    "volume": "25 ml",
    "container": "box_small"
  },
  {
    "id": "string_floss",
    "name": { "str": "dental floss", "str_pl": "rolls of dental floss" },
    "type": "GENERIC",
    "description": "Twenty-five yards of finely waxed thread wound up inside a plastic container.  Perfect for picking bits of smoked meat out of your teeth.  Disassemble to use the thread for something else.",
    "copy-from": "base_toiletries",
    "symbol": "~",
    "material": [ "plastic", "cotton" ]
  },
  {
    "id": "comb_pocket",
    "name": "comb",
    "type": "GENERIC",
    "description": "A grooming tool with teeth for straightening your hair.",
    "symbol": "/",
    "copy-from": "base_toiletries",
    "snippet_category": [
      { "id": "pcomb1", "text": "Somehow, a few teeth have already broken off the end of this otherwise pristine comb." },
      {
        "id": "pcomb2",
        "text": "A grooming tool with teeth for straightening your hair.  This one is narrow, black and austere."
      },
      { "id": "pcomb3", "text": "A comb made of soft plastic.  Its tortoiseshell pattern makes it seem antique." },
      { "id": "pcomb4", "text": "A comb which folds on a hinge, in case you want to look like a greaser." }
    ]
  },
  {
    "id": "plunger_toilet",
    "name": "toilet plunger",
    "type": "GENERIC",
    "description": "A rubber-tipped tool for unclogging pipes, or a club for an immature survivor.",
    "symbol": "p",
    "color": "red",
    "price": 800,
    "price_postapoc": 50,
    "weight": 590,
    "volume": "2100 ml",
    "//": "the volume is pretty bulky, but this is an old fashioned model.",
    "material": [ "wood", "plastic" ],
    "bashing": 5,
    "to_hit": -1
  },
  {
    "id": "plunger_futuristic",
    "name": "professional plunger",
    "type": "GENERIC",
    "description": "This hollow plastic toilet plunger's bell compresses like an accordion.  It is efficient at its intended purpose, and complete rubbish as a weapon.",
    "symbol": "p",
    "color": "black",
    "price": 1590,
    "price_postapoc": 10,
    "weight": 680,
    "volume": "2400 ml",
    "material": "plastic",
    "bashing": 2,
    "to_hit": -1
  },
  {
    "id": "toilet_paper",
    "name": { "str": "toilet paper", "str_pl": "rolls of toilet paper" },
    "type": "GENERIC",
    "description": "A luxurious remnant of civilization.",
    "symbol": "~",
    "color": "white",
    "container": "box_medium",
    "price": 89,
    "price_postapoc": 180,
    "weight": 227,
    "volume": 1,
    "material": "paper",
    "to_hit": -2,
    "snippet_category": [
      {
        "id": "tpaper1",
        "text": "Imagine the thinnest, most disposable paper you could possibly make.  Now imagine something thinner than that."
      },
      {
        "id": "tpaper2",
        "text": "This roll of toilet paper is two-ply and quilted, for vandalizing houses more comfortably than ever."
      },
      { "id": "tpaper3", "text": "This brand of toilet paper is designed to dissolve completely in water!" },
      { "id": "tpaper4", "text": "Images of your least favorite politician are printed on each individual sheet." },
      {
        "id": "tpaper5",
        "text": "A luxurious remnant of civilization.  The splinters of unprocessed wood visible in this one make it seem less luxurious, though."
      }
    ]
  },
  {
    "id": "hair_dryer",
    "name": "hair dryer",
    "type": "GENERIC",
    "description": "This tool dries your hair by pushing air through a coil of hot wires.  Without a funtioning power grid, it is a motorized paper weight.",
    "symbol": "(",
    "color": "black",
    "price": 2100,
    "price_postapoc": 0,
    "weight": 680,
    "volume": 2,
    "material": [ "plastic", "steel" ],
    "bashing": 3,
    "to_hit": -1
  },
  {
    "id": "curling_iron",
    "name": "curling iron",
    "type": "GENERIC",
    "description": "A wand made of heat-resistant ceramics.  When plugged into an outlet, it is hot enough to shape your hair into curls.  Too bad the power's out.",
    "symbol": "/",
    "color": "magenta",
    "price": 2500,
    "price_postapoc": 0,
    "weight": 590,
    "volume": 1,
    "material": [ "ceramic", "steel" ],
    "bashing": 3,
    "to_hit": 1
  },
  {
    "id": "brush_toilet",
    "name": { "str": "toilet brush", "str_pl": "toilet brushes" },
    "type": "GENERIC",
    "description": "Zombies cannot be intimidated or humiliated, so this stiff brush is only useful for scouring toilet bowls.",
    "symbol": "p",
    "color": "white",
    "price": 1700,
    "price_postapoc": 0,
    "weight": 160,
    "volume": 2,
    "material": [ "steel", "plastic" ],
    "bashing": 3,
    "to_hit": 1
  }
]
@I-am-Erk
Copy link
Member

There, let's get these into some danged item groups now!

@I-am-Erk I-am-Erk merged commit cbe8a09 into CleverRaven:master Dec 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants