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.

Sign up for GitHub

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

Jump to bottom

Medical - Improve Epi status message in the event of critical injury #83

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Medical - Improve Epi status message in the event of critical injury #83

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6d3dcab
Added damageManager method to determine if a patient can be healed wi…
alexgibbs606 Jul 9, 2024
5ca9ab7
Added new failreason for epi - critical injury
alexgibbs606 Jul 9, 2024
43e2f80
Updated method for determining if epi can be administered.
alexgibbs606 Jul 9, 2024
21dc7fb
Adjusted epi application logic to expect non-healable critical injuries
alexgibbs606 Jul 10, 2024
3afaf71
Correcting message localization addition of critical injury message
alexgibbs606 Jul 10, 2024
f15a738
Updating epi fail message to better convey patient condition
alexgibbs606 Jul 20, 2024
9af24c7
Addressed PR requests. Localization changes not included.
alexgibbs606 Aug 6, 2024
0ee9674
Re-added morphine description and updated new injury message
alexgibbs606 Aug 6, 2024
18c20cd
Updated CanBeHealed maxHeal default to .999 (any damage)
alexgibbs606 Aug 6, 2024
d640d9a
Updated failReason to match localization variable change.
alexgibbs606 Aug 6, 2024
cbecdf9
Updated localization table key to match it's reference in the Epi use…
alexgibbs606 Aug 6, 2024
589a9bf
Clarifying general too injured and med facility too injured message t…
alexgibbs606 Aug 6, 2024
c6927eb
Updated the canbehealed method to check if at a medical facility inst…
alexgibbs606 Aug 6, 2024
27209ce
Merge branch 'master' of github.com:acemod/ACE-Anvil
alexgibbs606 Aug 12, 2024
5743d5e
Streamlined maxHeal comprehension
alexgibbs606 Aug 12, 2024
20b5460
Resolved styleguide formatting
alexgibbs606 Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions addons/core/Configs/ACE/Settings.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
ACE_SettingsConfig {
m_aInitialModSettings {
alexgibbs606 marked this conversation as resolved.
Show resolved Hide resolved
ACE_Medical_Settings "{61CB603BF1458464}" {
m_bSecondChanceOnHeadEnabled 1
m_bHealSupplyUsageEnabled 0
}
}
}
8 changes: 4 additions & 4 deletions addons/medical/Language/ACE_Medical_localization.cs_cz.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Aplikovat epinefrin"
"Too injured - Requires medical facility"
"Bez bolestí"
"Při vědomí"
"Příliš zraněný"
"Zvyšuje pravděpodobnost probuzení se z bezvědomí"
"Zmírňuje silné bolesti"
"Aplikováno pacientům v bezvědomí."
"Epinefrin"
"Bez bolestí"
"Zmírňuje silné bolesti"
"Aplikováno pacientům v silných bolestech."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.de_de.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Epinephrin injizieren"
"Too injured - Requires medical facility"
"Kein Schmerz"
"Nicht bewusstlos"
"Zu verletzt"
"Erhöht die Wahrscheinlichkeit des Aufwachens"
"Lindert starke Schmerzen"
"Verabreicht an bewusstlose Patienten."
"Epinephrin"
"Verabreicht an Patienten mit akuten Schmerzen."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.en_us.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.es_es.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.fr_fr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Injecter de l'adrénaline"
"Too injured - Requires medical facility"
"Ne ressent pas de douleur"
"Pas inconscient"
"Trop grièvement blessé"
"Augmente les chances de reprise de connaissance"
"Allège une douleur violente"
"Administrée à des patients inconscients."
"Adrénaline"
"Administrée à des patients ressentant une douleur violente."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.it_it.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.ja_jp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.ko_kr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.pl_pl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.pt_br.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.ru_ru.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
18 changes: 7 additions & 11 deletions addons/medical/Language/ACE_Medical_localization.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ StringTable {
Author "kexanone"
LastChanged "apollo-jk"
}
CustomStringTableItem "{61D51487241F1A28}" {
Id "ACE_Medical-FailReason_CriticallyInjured"
alexgibbs606 marked this conversation as resolved.
Show resolved Hide resolved
Target_en_us "Too injured - Requires medical facility"
alexgibbs606 marked this conversation as resolved.
Show resolved Hide resolved
Modified 1641677954
Author "AleX"
LastChanged "AleX"
}
CustomStringTableItem "{60C8CE8D36767C39}" {
Id "ACE_Medical-FailReason_NoPain"
Target_en_us "Not in pain"
Expand Down Expand Up @@ -81,16 +88,5 @@ StringTable {
Author "kexanone"
LastChanged "apollo-jk"
}
}
CustomStringTableItem "{5E101C5589E004EE}" {
Id "ACE_Medical-Item_Morphine_Description"
alexgibbs606 marked this conversation as resolved.
Show resolved Hide resolved
Target_en_us "Administered to patients in severe pain."
Target_fr_fr "Administrée à des patients ressentant une douleur violente."
Target_de_de "Verabreicht an Patienten mit akuten Schmerzen."
Target_cs_cz "Aplikováno pacientům v silných bolestech."
Modified 1623770742
Author "kexanone"
LastChanged "apollo-jk"
}
}
}
4 changes: 2 additions & 2 deletions addons/medical/Language/ACE_Medical_localization.uk_ua.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
StringTableRuntime {
Ids {
"ACE_Medical-EpinephrineInjectionAction"
"ACE_Medical-FailReason_CriticallyInjured"
"ACE_Medical-FailReason_NoPain"
"ACE_Medical-FailReason_NotUnconscious"
"ACE_Medical-FailReason_TooInjured"
"ACE_Medical-InfoWidget_Epinephrine"
"ACE_Medical-InfoWidget_Morphine"
"ACE_Medical-Item_Epinephrine_Description"
"ACE_Medical-Item_Epinephrine_Name"
"ACE_Medical-Item_Morphine_Description"
}
Texts {
"Inject epinephrine"
"Too injured - Requires medical facility"
"Not in pain"
"Not unconscious"
"Too injured"
"Increases wake-up chance"
"Alleviates severe pain"
"Administered to unconscious patients."
"Epinephrine"
"Administered to patients in severe pain."
}
}
Loading