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

Improvements to vitals and display #6444

Merged
merged 5 commits into from
Jul 18, 2018
Merged

Conversation

TheMagnetar
Copy link
Member

@TheMagnetar TheMagnetar commented Jul 17, 2018

When merged this pull request will:

  • Fixes some undeclared variables
  • Adds advanced diagnose: hemorrhage classes.
  • Original idea for displaying hemorrhage classes belongs to @Arcanum417

@TheMagnetar TheMagnetar added this to the Medical Rewrite milestone Jul 17, 2018
_genericMessages pushBack [localize ELSTRING(medical,Status_Lost_Blood), [1, 0.1, 0.1, 1]];
// Show more information if advancedDiagnose is enabled
if (EGVAR(medical,advancedDiagnose)) then {
if (GET_HEMORRHAGE(_target) == 1) then {
Copy link
Contributor

Choose a reason for hiding this comment

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

This should probably be a switch statement.

@thojkooi thojkooi added the kind/enhancement Release Notes: **IMPROVED:** label Jul 18, 2018
@@ -1031,6 +1031,15 @@
<Chinesesimp>大量失血中</Chinesesimp>
<Chinese>大量失血中</Chinese>
</Key>
<Key ID="STR_ACE_Medical_Status_Lost_Blood2">
<English>Lost some blood Class II Hemorrhage</English>
Copy link
Member

Choose a reason for hiding this comment

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

Haven't seen how it looks in game, but it seems odd to me that the class directly runs on from the description in these strings

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the messages will be fine if we remove the class bit.

@thojkooi thojkooi changed the base branch from medical-rewrite-restructure to medical-rewrite July 18, 2018 18:25
@thojkooi thojkooi merged commit 3054803 into medical-rewrite Jul 18, 2018
@thojkooi thojkooi deleted the VitalsAndDisplay-rw branch July 18, 2018 19:38
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
- Improvements to vitals and display
- Fixes some undeclared variables
- Adds advanced diagnose: hemorrhage classes.
- Original idea for displaying hemorrhage classes belongs to @Arcanum417
@PabstMirror PabstMirror modified the milestones: Medical Rewrite, 3.13.0 Dec 30, 2019
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
Development

Successfully merging this pull request may close these issues.

4 participants