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

[Adv. Medical] New module options #1579

Merged
merged 3 commits into from Jun 13, 2015
Merged

[Adv. Medical] New module options #1579

merged 3 commits into from Jun 13, 2015

Conversation

ulteq
Copy link
Contributor

@ulteq ulteq commented Jun 11, 2015

  • Add a module option for healHitPointAfterAdvBandage
  • Add a module option to chose between pain suppression and pain removal.

@ulteq ulteq added kind/enhancement Release Notes: **IMPROVED:** status/WIP labels Jun 11, 2015
@ulteq ulteq added this to the 3.1.0 milestone Jun 11, 2015
@ulteq ulteq removed the status/WIP label Jun 11, 2015
@ulteq ulteq changed the title Added Adv. Medical module option 'healHitPointAfterAdvBandage': [Adv. Medical] New module options Jun 11, 2015
// Suppress the pain
_painSuppress = _target getvariable [QGVAR(painSuppress), 0];
_target setvariable [QGVAR(painSuppress), (_painSuppress + _painReduce) max 0];
} else {
Copy link
Contributor

Choose a reason for hiding this comment

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

I would suggest to move the pain suppress above the if statement and do this instead:

if (!GVAR(painIsOnlySuppressed)) then {
    _pain = _target getvariable [QGVAR(pain), 0];
    _target setvariable [QGVAR(pain), (_pain - _painReduce) max 0, true];
};

That has the benefit of still suppressing pain when it's added after morphine has been given.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed.

thojkooi added a commit that referenced this pull request Jun 13, 2015
[Adv. Medical]  New module options
@thojkooi thojkooi merged commit ce908f0 into master Jun 13, 2015
@thojkooi thojkooi deleted the medicalModuleOptions branch June 13, 2015 11:37
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.

None yet

2 participants