Merge branch 'master' into master-merge

dgibso29 · Jan 5, 2022 · c4bffba · c4bffba
2 parents af86109 + 200d38f
commit c4bffba
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 0 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -69,6 +69,7 @@ Codingboy
 Coren <[email protected]>
 Crusty
 dabako <[email protected]>
+C0kkie
 dgibso29 <[email protected]>
 Dharma Bellamkonda <[email protected]>
 Dimaslg <[email protected]>

diff --git a/addons/medical_treatment/initSettings.sqf b/addons/medical_treatment/initSettings.sqf
@@ -29,6 +29,16 @@
     QGVAR(woundReopenChance),
     "SLIDER",
     [LSTRING(WoundReopenChance_DisplayName), LSTRING(WoundReopenChance_Description)],
+
+    [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
+    [0, 5, 1, 2],
+    true
+] call CBA_settings_fnc_init;
+
+[
+    QGVAR(clearTraumaAfterBandage),
+    "CHECKBOX",
+    [LSTRING(ClearTraumaAfterBandage_DisplayName), LSTRING(ClearTraumaAfterBandage_Description)],
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0, 5, 1, 2],
     true

diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml
@@ -140,6 +140,7 @@
             <Spanish>Habilitada y pueden reabrirse</Spanish>
             <German>Aktiviert und können sich wieder öffnen</German>
             <Chinesesimp>已启用 &amp; 可以伤口开裂</Chinesesimp>
+
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_WoundReopenChance_DisplayName">
             <English>Wound Reopening Coefficient</English>
@@ -152,6 +153,7 @@
             <Turkish>Yara Yeniden Açılma Katsayısı</Turkish>
             <Spanish>Coeficiente de reapertura de heridas</Spanish>
             <Chinesesimp>伤口开裂系数</Chinesesimp>
+
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_WoundReopenChance_Description">
             <English>Coefficient for controlling the wound reopening chance. The final reopening chance is determined by multiplying this value with the specific reopening chance for the wound type and bandage used.</English>
@@ -201,6 +203,43 @@
             <Polish>Po zszyciu</Polish>
             <Chinesesimp>缝合后</Chinesesimp>
         </Key>
+        <Key ID="STR_ACE_Medical_Treatment_ClearTraumaAfterBandage_DisplayName">
+            <English>Clear Trauma After Bandage</English>
+            <Japanese>治療後に外傷を削除</Japanese>
+            <Chinese>包紮即痊癒</Chinese>
+            <French>Guérir les blessures pansées</French>
+            <Czech>Odebrat úraz po obvázání</Czech>
+            <Polish>Usuń uraz po zabandażowaniu</Polish>
+            <Italian>Rimozione ferite bendate</Italian>
+            <German>Entferne Trauma nach Bandagierung.</German>
+            <Russian>Удалять травму после перевязки</Russian>
+        </Key>
+        <Key ID="STR_ACE_Medical_Treatment_ClearTraumaAfterBandage_Description">
+            <English>Controls whether fully bandaged body parts are healed.</English>
+            <Japanese>全ての傷に対して包帯を巻いた部分を治癒するかどうかを決定します。</Japanese>
+            <Polish>Kontroluje czy w pełni zabandażowane części ciała są uleczone.</Polish>
+            <French>Définit s'il faut guérir les parties du corps entièrement bandées.</French>
+            <Italian>Controlla se le parti del corpo completamente bendate sono guarite.</Italian>
+            <German>Kontrolliert, ob voll bandagierte Körperteile geheilt werden.</German>
+            <Chinese>控制說當傷口處理好的時候是否直接痊癒。</Chinese>
+            <Czech>Nastavuje zda jsou plně obvázané části těla vyléčena.</Czech>
+            <Russian>Контролирует то, что полностью перевязанные раны целиком исцеляют часть тела.</Russian>
+        </Key>
+        <Key ID="STR_ACE_Medical_Treatment_LocationsBoostTraining_DisplayName">
+            <English>Locations Boost Training</English>
+            <Czech>Zdravotnická místa zvyšují zdravotnickou úrovně</Czech>
+            <Italian>Sedi per potenziare la formazione</Italian>
+            <German>Örtliche Trainingssteigerung</German>
+            <Spanish>Ubicación mejora entrenamiento.</Spanish>
+            <Polish>Miejsca zwiększają wyszkolenie</Polish>
+            <Portuguese>Localização melhora treinamento</Portuguese>
+            <French>Le lieu améliore l'efficacité</French>
+            <Russian>Места ускоренного обучения</Russian>
+            <Japanese>衛生能力の上昇位置</Japanese>
+            <Korean>교육 증가 지역</Korean>
+            <Chinesesimp>受所在位置影响提升医疗能力</Chinesesimp>
+            <Chinese>受所在位置影響提升醫療能力</Chinese>
+        </Key>
         <Key ID="STR_ACE_Medical_Treatment_LocationsBoostTraining_Description">
             <English>Boost medical training when in medical vehicles or facilities. Untrained becomes medic, medic becomes doctor.</English>
             <Japanese>衛生車両か施設では衛生能力を上昇します。未訓練では衛生兵に、衛生兵では医師になります。</Japanese>