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

Disabled pain effect while unconscious #1492

Merged
merged 2 commits into from
Jun 4, 2015
Merged

Disabled pain effect while unconscious #1492

merged 2 commits into from
Jun 4, 2015

Conversation

GitHawk
Copy link
Contributor

@GitHawk GitHawk commented Jun 3, 2015

Limited _strength of painEffect to 0.1 so a player does not have to watch a flashing screen while he can't do anything about it.
Otherwise we need to include a serious epilepsy warning! See http://en.wikipedia.org/wiki/Photosensitive_epilepsy

Limited _strength to 0.1 so a player does not have to watch a flashing
screen while he can't do anything about it. Otherwise we need to include
a serious epilepsy warning!
@thojkooi
Copy link
Contributor

thojkooi commented Jun 3, 2015

It might be better to not play any pain effects while unconscious.

@jonpas
Copy link
Member

jonpas commented Jun 3, 2015

It might be better to not play any pain effects while unconscious.

It does sound way better, you can't see anything anyways... (practically).

@ulteq
Copy link
Contributor

ulteq commented Jun 3, 2015

It might be better to not play any pain effects while unconscious.

Yes, please.

@GitHawk
Copy link
Contributor Author

GitHawk commented Jun 3, 2015

Ok, will change it.

If the player is unconscious the pain effect is disabled.
@GitHawk
Copy link
Contributor Author

GitHawk commented Jun 3, 2015

@Glowbal Now the effect is disabled.
The code alignment in diffview looks wierd. I moved the previous code in the else branch of the unconscious check.

@GitHawk GitHawk changed the title Limited strength of pain effect while unconscious Disabled pain effect while unconscious Jun 3, 2015
@ulteq
Copy link
Contributor

ulteq commented Jun 3, 2015

The code alignment in diffview looks wierd.

You should use 4 spaces instead of tabs.

@ulteq ulteq added the kind/enhancement Release Notes: **IMPROVED:** label Jun 3, 2015
@GitHawk
Copy link
Contributor Author

GitHawk commented Jun 3, 2015

You should use 4 spaces instead of tabs.

I am using spaces but the diffview matches the wrong lines. Old line 167 is now at 174

@nicolasbadano
Copy link
Contributor

I am using spaces but the diffview matches the wrong lines. Old line 167 is now at 174

Yeah, don't worry about it. This is just github being weird, and happens often. Unfortunately it makes code much harder to review, but tough luck.

@thojkooi
Copy link
Contributor

thojkooi commented Jun 4, 2015

I will take a look at this today.

@thojkooi thojkooi added this to the 3.1.0 milestone Jun 4, 2015
@GitHawk
Copy link
Contributor Author

GitHawk commented Jun 4, 2015

@Glowbal Can you merge, so I can work on other stuff?

@jonpas
Copy link
Member

jonpas commented Jun 4, 2015

@GitHawk that's the point of Git(Hub), make branches and you can work on infinite stuff without waiting for merges. In fact, you should really make all your pull requests on a separate (non-master) branch, do that for each feature/fix/whatever you are working on and pull request from that.

thojkooi added a commit that referenced this pull request Jun 4, 2015
Disabled pain effect while unconscious
@thojkooi thojkooi merged commit e103007 into acemod:master Jun 4, 2015
@thojkooi
Copy link
Contributor

thojkooi commented Jun 4, 2015

Thank you @GitHawk

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants