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 vibrator #7683

Merged
merged 5 commits into from May 21, 2014

Conversation

Projects
None yet
@KA101
Copy link
Contributor

commented May 18, 2014

Inspired by CreamyGoodness mistaking the mp3 player's morale boost for something high-powered.

How you work your tension out is left up to the player, but it's a very good battery-morale conversion. (It's inferior to Marloss Bliss, if you're curious what I was using as a comparison.)

Adds fatigue on a 1:1 basis with morale, though, so you can't buzz around constantly. (I don't think they're loud enough to merit attaching a sound, and user noise is likewise left to the player's imagination.)

KA101 added some commits May 18, 2014

First stage
Working.  Doesn't spawn nor is it at all balanced.
Balancing and spawn points
Made the fatigue 1:1 with morale, and added spawns to bedrooms,
dressers, lab dorms, behind the counter, the pawnshop of course, and
consumer-electronic stores.
@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented May 18, 2014

In before flamewar.

On a more serious note, I'm on board with this PR. Seems like a good clean counterpart to all the drugs and booze for downtime morale boosting activities.

Clarify language
Yeah, I copied a lot from the handheld game.  Still no need to leave
fodder for the pruriently-inclined.
@Wishbringer

This comment has been minimized.

Copy link
Contributor

commented May 18, 2014

This only work on women? Otherwise it's disgusting!
Or is this not the kind of vibrator I was thinking about. :)

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented May 18, 2014

You decide. The description leaves it up to your imagination.

Nerf and underwater-compatibility
This knocks the vibrator down to being made of aluminum rather than
steel (steel vibes make a surprisingly durable weapon!), but adds full
SCUBA support as well as the Gills support.

If you need to de-stress underwater, we've got you covered.
@2birdie

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

Aw ye.

@@ -8,7 +8,7 @@

enum activity_type {
ACT_NULL = 0,
ACT_RELOAD, ACT_READ, ACT_GAME, ACT_WAIT, ACT_CRAFT, ACT_LONGCRAFT,
ACT_RELOAD, ACT_READ, ACT_GAME, ACT_VIBE, ACT_WAIT, ACT_CRAFT, ACT_LONGCRAFT,

This comment has been minimized.

Copy link
@kevingranade

kevingranade May 19, 2014

Member

Need to add an id string for each activity to support stable saving/loading, until then we need to append to the activity_type list to avoid making people's activity change when loading an old save. This for example would have turned wait into vibe...

This comment has been minimized.

Copy link
@KA101

KA101 May 19, 2014

Author Contributor

Thanks. Was afraid I'd have some sort of sequence problem so tried to match to where things were in the list. (So I had the Other sequence problem instead. Gagh.) Will fix.

@tyrael93

This comment has been minimized.

Copy link

commented May 19, 2014

why
why in the world would you do this

@John-Candlebury

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

Why would you even? I mean, please no.

Can you just make it a personal mod post it in the forums and call it a day?

Please do that instead I am begging you.

@tyrael93

This comment has been minimized.

Copy link

commented May 19, 2014

DDA: magic and vibrators

I just wanted to use a fucking different viewport for the original cata
Just-
I give up.

@narc0tiq

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

I had thought about something like this before, but came to the conclusion that we're not making a porn roguelike (though those do exist, oddly enough). I'd honestly rather not see this in mainline Cataclysm.

Only my opinion, though.

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented May 19, 2014

Go back and re-read the (incredibly vague) text strings. It's only pornographic if you want it to be. It could just as easily be a neck massager, the way it's described.

The name might be a bit loaded. Perhaps something like 'personal massager' would be better?

@narc0tiq

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

Ah, that looks fine, then. Objection withdrawn.

@MisterFelixFox

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

I suppose a change of name to "personal massager" due to the implications of "vibrator" for most people

@Zireael07

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

Personal massager sounds better.

@John-Candlebury

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

Go back and re-read the (incredibly vague) text strings. It's only pornographic if you want it to be. It could just as easily be a neck massager, the way it's described.

The name might be a bit loaded. Perhaps something like 'personal massager' would be better?

If you also change the strings and description to imply that what you are using is actually a neck massager I have no qualms whatsoever.

I mean do we really want DDA to be the kind of game in which you masturbate mid-battle to gain combat bonuses? And it is apparently a serious question.

@kevingranade

This comment has been minimized.

Copy link
Member

commented May 19, 2014

Mid-battle is not an option, any more than reading a book would be.
If you want your objection to carry any weight, it needs to be a bit more
substantiative than, "I don't like it", or "do you really want the game to
be ?".

@MisterFelixFox

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

Even if the wordings are ambiguous, I guarantee that the majority of people will see it as a sex toy. Even typing just 'vibrator' into Google will give you search results for vibrator sex toys. I oppose the addition of the item as-is due to the majority association of a vibrator as a sex toy and the societal taboo of depicting sexual acts in video games (by association with the first point).

Were this item named 'personal massager' instead, there would be no concerns of players associating a vibrator item as the sex toy of the same name.

@Izicata

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

Right, a "personal massager". Googling "personal massager" also brings up sex toys.

@MisterFelixFox

This comment has been minimized.

Copy link
Contributor

commented May 19, 2014

Maybe just "massager" then

@kevingranade

This comment has been minimized.

Copy link
Member

commented May 19, 2014

I have no respect for 'societal taboos', you're going to need a better
argument than that.
Just to get it out of the way, assertions that, 'it will make the game
unpopular' aren't going to get you anywhere either.
I have no interest in making dda a porn game, but i have just as little
interest in keeping things out of the game simply because it will offend
someone.

@kevingranade

This comment has been minimized.

Copy link
Member

commented May 20, 2014

No one has made a credible argument against, so it is one-sided I guess,
but that's not my doing.

@Wishbringer

This comment has been minimized.

Copy link
Contributor

commented May 20, 2014

I'm 99.999% with you Kevin.
I find social/cultural/religious limitations/taboos a curious phenomenon (social-engineering/brainwashing).
Although my perspective is as an outsider peering through a telescope at humanity.
Lets hit some zombies with that thing, like in Saints Row. :)

@Zaweri

This comment has been minimized.

Copy link
Contributor

commented May 20, 2014

Sigh
Nobody made a big deal from the massager in Dead Rising series or in the GTA series. No whining.

Relocate player_activity tag
Thanks for the check, Kevin.
@Senrain

This comment has been minimized.

Copy link
Contributor

commented May 20, 2014

Eh, don't see why not, maybe a bigger moral boost if you have the bad back trait?

@KA101

This comment has been minimized.

Copy link
Contributor Author

commented May 21, 2014

It's already a pretty big morale boost; any other thoughts?

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented May 21, 2014

Is this ready to be merged?

@kevingranade kevingranade merged commit 7c0bb73 into CleverRaven:master May 21, 2014

1 check passed

default This has been rescheduled for testing as the 'master' branch has been updated.
@Zireael07

This comment has been minimized.

Copy link
Contributor

commented May 21, 2014

@Senrain : I like the bad back idea.

@moist-zombie

This comment has been minimized.

Copy link

commented May 21, 2014

Now just lemme at those scented candles (seriously, scented candles isn't the worst idea, haha.. Anything that smells better than putrefying flesh is sure to make you happier).. Hit the liquor store for a nice bottle of wine and I'll be ready to unwind in style ;)

@KA101 KA101 deleted the KA101:vibes branch May 21, 2014

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.