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

Medical - Fix #8389 #8390

Merged
merged 3 commits into from
Aug 23, 2021
Merged

Medical - Fix #8389 #8390

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16961ae
fix implicit dependency between medical damage and medical engine
LinkIsGrim Aug 23, 2021
2c200f0
move stringtable
LinkIsGrim Aug 23, 2021
60e7305
valve pls fix
LinkIsGrim Aug 23, 2021
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
9 changes: 0 additions & 9 deletions addons/medical_damage/initSettings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,3 @@
[0, 1, 1, 2, true],
true
] call CBA_fnc_addSetting;

[
QEGVAR(medical,enableVehicleCrashes),
"CHECKBOX",
[LSTRING(EnableVehicleCrashes_DisplayName), LSTRING(EnableVehicleCrashes_Description)],
ELSTRING(medical,Category),
true,
true
] call CBA_fnc_addSetting;
12 changes: 0 additions & 12 deletions addons/medical_damage/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,17 +717,5 @@
<Spanish>La probabilidad de morir a causa de una herida fatal.</Spanish>
<French>La probabilité de mourir lors d'une "blessure mortelle".\nUne blessure mortelle est définie par des dommages importants à la tête ou au cœur.</French>
</Key>
<Key ID="STR_ACE_Medical_Damage_EnableVehicleCrashes_DisplayName">
<English>Enable Vehicle Crash Damage</English>
<Russian>Включить урон при аварии в транспортном средстве.</Russian>
<Spanish>Activar daño por accidente de vehículo</Spanish>
<French>Blessures de collision (véhicules)</French>
</Key>
<Key ID="STR_ACE_Medical_Damage_EnableVehicleCrashes_Description">
<English>Controls whether crew receives damage from vehicle collisions.</English>
<Russian>Контролирует, получает ли экипаж урон от столкновения транспортного средства.</Russian>
<Spanish>Controla si la tripulación recibe daño debido a colisiones en vehículo.</Spanish>
<French>Définit si les passagers à bord des véhicules peuvent être blessés en cas d'accident.</French>
</Key>
</Package>
</Project>
2 changes: 2 additions & 0 deletions addons/medical_engine/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp"
PREP_RECOMPILE_END;

#include "initSettings.sqf"

// Define "Constants" variables (both are macros defined in script_macros_medical.hpp, look there for actual variable names)
if (isNil QUOTE(HEAD_DAMAGE_THRESHOLD)) then {HEAD_DAMAGE_THRESHOLD = HEAD_DAMAGE_THRESHOLD_DEFAULT};
if (isNil QUOTE(ORGAN_DAMAGE_THRESHOLD)) then {ORGAN_DAMAGE_THRESHOLD = ORGAN_DAMAGE_THRESHOLD_DEFAULT};
Expand Down
8 changes: 8 additions & 0 deletions addons/medical_engine/initSettings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
QEGVAR(medical,enableVehicleCrashes),
"CHECKBOX",
[LSTRING(EnableVehicleCrashes_DisplayName), LSTRING(EnableVehicleCrashes_Description)],
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess we have to move the stringtables over as well

ELSTRING(medical,Category),
true,
true
] call CBA_fnc_addSetting;
17 changes: 17 additions & 0 deletions addons/medical_engine/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Medical_Damage">
LinkIsGrim marked this conversation as resolved.
Show resolved Hide resolved
<Key ID="STR_ACE_Medical_Engine_EnableVehicleCrashes_DisplayName">
<English>Enable Vehicle Crash Damage</English>
<Russian>Включить урон при аварии в транспортном средстве.</Russian>
<Spanish>Activar daño por accidente de vehículo</Spanish>
<French>Blessures de collision (véhicules)</French>
</Key>
<Key ID="STR_ACE_Medical_Engine_EnableVehicleCrashes_Description">
<English>Controls whether crew receives damage from vehicle collisions.</English>
<Russian>Контролирует, получает ли экипаж урон от столкновения транспортного средства.</Russian>
<Spanish>Controla si la tripulación recibe daño debido a colisiones en vehículo.</Spanish>
<French>Définit si les passagers à bord des véhicules peuvent être blessés en cas d'accident.</French>
</Key>
</Package>
</Project>