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

Adds additional female clothing variety and "SKINTIGHT" flag. #4504

Merged
merged 42 commits into from Nov 23, 2013

Conversation

Projects
None yet
7 participants
@freezerbunny
Copy link
Contributor

commented Nov 19, 2013

Update: "SKINTIGHT" will negate layering penalty for wearing that object, but only if we aren't already wearing a skintight object on that body part. I have added the flag to everything that makes sense to have it.

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented Nov 19, 2013

Awesome!

Only issue I can see here is adding underwear. The clothing layer system doesn't much approve of undergarments, and tends to levy big penalties for wearing many layers at once.

"id" : "union_suit",
"name" : "union suit",
"weight" : 168,
"id" : "bra",

This comment has been minimized.

Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 19, 2013

Member

This ought to add a point or two of storage. IRL we tend to use it like an extra set of secure pockets. Classy, right?

This comment has been minimized.

Copy link
@freezerbunny

freezerbunny Nov 19, 2013

Author Contributor

Interesting to note, I'll add that in!

@freezerbunny

This comment has been minimized.

Copy link
Contributor Author

commented Nov 19, 2013

Thanks Rivet.

I agree with your points. The main idea behind their inclusion (other than the RP factor) is that it will identify more zombies and bodies as female. Right now you rarely see a zombie that has a skirt, tights, or a dress, etc.

This will improve gender equality!

It'll also function as a way to add small units of warmth to bring you just above threshold where, should you put on something else, you may add too much warmth.

@MisterFelixFox

This comment has been minimized.

Copy link
Contributor

commented Nov 19, 2013

Be sure to update the recipes as well -- tailoring can make long underwear bottoms and union suits, but with them as a different item, it may break some things. Don't forgot about the long underwear top, too.

@AnderHammer

This comment has been minimized.

Copy link
Contributor

commented Nov 19, 2013

Long underwear is already implemented. The diff might just be displaying screwy things.

@freezerbunny

This comment has been minimized.

Copy link
Contributor Author

commented Nov 19, 2013

Union suit and long underwear etc. weren't changed. As @AnderHammer says, the diff display is just showing it weird.

@@ -1987,6 +2001,7 @@
["hoodie", 65],
["under_armor", 20],
["jersey", 40]
["camisole", 60],

This comment has been minimized.

Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 19, 2013

Member

I haven't opened this up in N++ yet, but I think that this comma is unneeded.

This comment has been minimized.

Copy link
@freezerbunny

freezerbunny Nov 19, 2013

Author Contributor

Au contraire, I think I missed one out.

@MisterFelixFox

This comment has been minimized.

Copy link
Contributor

commented Nov 19, 2013

Ah, okay -- better safe than sorry

@kevingranade

This comment has been minimized.

Copy link
Member

commented Nov 19, 2013

The rationale for not having underwear is twofold:
As Rivet points out the encumbrance system is a bit overly-agressive about layering.
The other issues is I wanted to opt-out of the potential for pervy weirdness around underwear stuff, but that's a mild issue, and with the depiction of clothing becoming more and more complete, the absence of underwear might be starting to become a noticeable issue, so there's that.
Very minor additional issue, the primary benefit of underwear, comfort, isn't represented.

I'm not saying not to add this, just that's the previous rationale.

Also, you can see the "Merge with caution!" and "X Failed -- Merged build finished." messages, follow the details link to Jenkins, and click on "Command Line" to the upper left. This shows that the game compiled correctly, but failed to parse the json files. Please load your new files into the game to check for syntax errors before PRing it (or if you want feedback before it's ready, mark it [WIP]).

@freezerbunny

This comment has been minimized.

Copy link
Contributor Author

commented Nov 19, 2013

@kevingranade Thanks.

I agree with some of your points. I just find it a little strange that my character doesn't wear anything under her clothes, although I agree the inclusion of these objects could lead to strange behavior.

As for the encumbrance system, that's been resolved by setting it to 0 coverage and 0 material thickness. It will still impart warmth, however.

@kevingranade

This comment has been minimized.

Copy link
Member

commented Nov 19, 2013

0 coverage/0 thickness doesn't make it unencumbering, the only way to do that is to make it not cover any bodyparts, which will also prevent warmth. Might be fixable with a tweak to the encumbrance code, might not.

@freezerbunny

This comment has been minimized.

Copy link
Contributor Author

commented Nov 19, 2013

Ah yeah, retested and you're right.

Adding a "SKINTIGHT" flag that will reduce layering penalty by .5. Combined with "FITS" it will completely negate the layer penalty for that object.

@freezerbunny

This comment has been minimized.

Copy link
Contributor Author

commented Nov 21, 2013

Male underwear added too, including the typical white vest worn under your regular clothes.

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented Nov 22, 2013

Male underwear added too, including the typical white vest worn under your regular clothes.

All the packages at the store call those 'undershirts' not 'white vests' because a vest is a form of outerwear.

@freezerbunny

This comment has been minimized.

Copy link
Contributor Author

commented Nov 22, 2013

Alrighty. My mother calls them vests you see.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Nov 22, 2013

OK, here I thought the tank top & camo tank top were undershirts. Wev.

@freezerbunny

This comment has been minimized.

Copy link
Contributor Author

commented Nov 22, 2013

Should be all done now. Enjoy.
Additions:

  • female/male underwear
  • denim shorts
  • knee high boots
  • leggings/stockings
  • proper compression top/shorts
  • a leather belt
  • camisole
@narc0tiq

This comment has been minimized.

Copy link
Contributor

commented Nov 23, 2013

Heh. Sometimes, github, your auto-linking is just silly.

narc0tiq added a commit that referenced this pull request Nov 23, 2013

@narc0tiq narc0tiq merged commit c7ae036 into CleverRaven:master Nov 23, 2013

1 check passed

default Build finished.
Details

@freezerbunny freezerbunny deleted the freezerbunny:female-clothing branch Dec 2, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.