From 6972af9d0b62efc2b517c7aa3cfe3cbffd195d56 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Thu, 19 Jan 2017 15:30:27 -0600 Subject: [PATCH] Settings and string changes --- addons/medical/ACE_Settings.hpp | 77 +++++++++++++++++---------------- addons/medical/CfgVehicles.hpp | 72 +++++++++++++++--------------- 2 files changed, 73 insertions(+), 76 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 2453c79dba..febac24fa5 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -17,8 +17,8 @@ class ACE_Settings { /* @todo class GVAR(enableFor) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_enableFor_DisplayName); - description = CSTRING(AdvancedMedicalSettings_enableFor_Description); + displayName = CSTRING(MedicalSettings_enableFor_DisplayName); + description = CSTRING(MedicalSettings_enableFor_Description); value = 1; typeName = "SCALAR"; values[] = {"Players only", "Players and AI"}; @@ -40,37 +40,37 @@ class ACE_Settings { }; class GVAR(advancedBandages) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_advancedBandages_DisplayName); - description = CSTRING(AdvancedMedicalSettings_advancedBandages_Description); + displayName = CSTRING(MedicalSettings_advancedBandages_DisplayName); + description = CSTRING(MedicalSettings_advancedBandages_Description); typeName = "BOOL"; value = 1; }; class GVAR(advancedMedication) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_advancedMedication_DisplayName); - description = CSTRING(AdvancedMedicalSettings_advancedMedication_Description); + displayName = CSTRING(MedicalSettings_advancedMedication_DisplayName); + description = CSTRING(MedicalSettings_advancedMedication_Description); typeName = "BOOL"; value = 1; }; class GVAR(advancedDiagnose) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_advancedDiagnose_DisplayName); - description = CSTRING(AdvancedMedicalSettings_advancedDiagnose_Description); + displayName = CSTRING(MedicalSettings_advancedDiagnose_DisplayName); + description = CSTRING(MedicalSettings_advancedDiagnose_Description); typeName = "BOOL"; value = 1; }; class GVAR(woundReopening) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_enableAdvancedWounds_DisplayName); - description = CSTRING(AdvancedMedicalSettings_enableAdvancedWounds_Description); + displayName = CSTRING(MedicalSettings_enableAdvancedWounds_DisplayName); + description = CSTRING(MedicalSettings_enableAdvancedWounds_Description); typeName = "BOOL"; value = 1; }; /* @todo class GVAR(enableVehicleCrashes) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_enableVehicleCrashes_DisplayName); - description = CSTRING(AdvancedMedicalSettings_enableVehicleCrashes_Description); + displayName = CSTRING(MedicalSettings_enableVehicleCrashes_DisplayName); + description = CSTRING(MedicalSettings_enableVehicleCrashes_Description); typeName = "BOOL"; value = 1; }; @@ -128,56 +128,56 @@ class ACE_Settings { }; class GVAR(medicSetting_Epi) { category = CSTRING(Category_Medical); - displayName = CSTRING(BasicMedicalSettings_medicSetting_Epi_DisplayName); - description = CSTRING(BasicMedicalSettings_medicSetting_Epi_Description); + displayName = CSTRING(MedicalSettings_medicSetting_Epi_DisplayName); + description = CSTRING(MedicalSettings_medicSetting_Epi_Description); typeName = "SCALAR"; value = 0; values[] = {"Anyone", "Medics only", "Doctors only"}; }; class GVAR(medicSetting_Medkit) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_medicSetting_Medkit_DisplayName); - description = CSTRING(AdvancedMedicalSettings_medicSetting_Medkit_Description); + displayName = CSTRING(MedicalSettings_medicSetting_Medkit_DisplayName); + description = CSTRING(MedicalSettings_medicSetting_Medkit_Description); typeName = "SCALAR"; value = 0; values[] = {"Anyone", "Medics only", "Doctors only"}; }; class GVAR(medicSetting_PAK) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_medicSetting_PAK_DisplayName); - description = CSTRING(AdvancedMedicalSettings_medicSetting_PAK_Description); + displayName = CSTRING(MedicalSettings_medicSetting_PAK_DisplayName); + description = CSTRING(MedicalSettings_medicSetting_PAK_Description); typeName = "SCALAR"; value = 0; values[] = {"Anyone", "Medics only", "Doctors only"}; }; class GVAR(medicSetting_SurgicalKit) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_medicSetting_SurgicalKit_DisplayName); - description = CSTRING(AdvancedMedicalSettings_medicSetting_SurgicalKit_Description); + displayName = CSTRING(MedicalSettings_medicSetting_SurgicalKit_DisplayName); + description = CSTRING(MedicalSettings_medicSetting_SurgicalKit_Description); typeName = "SCALAR"; value = 0; values[] = {"Anyone", "Medics only", "Doctors only"}; }; class GVAR(consumeItem_Medkit) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_consumeItem_Medkit_DisplayName); - description = CSTRING(AdvancedMedicalSettings_consumeItem_Medkit_Description); + displayName = CSTRING(MedicalSettings_consumeItem_Medkit_DisplayName); + description = CSTRING(MedicalSettings_consumeItem_Medkit_Description); typeName = "SCALAR"; value = 1; values[] = {"No", "Yes"}; }; class GVAR(consumeItem_PAK) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_consumeItem_PAK_DisplayName); - description = CSTRING(AdvancedMedicalSettings_consumeItem_PAK_Description); + displayName = CSTRING(MedicalSettings_consumeItem_PAK_DisplayName); + description = CSTRING(MedicalSettings_consumeItem_PAK_Description); typeName = "SCALAR"; value = 1; values[] = {"No", "Yes"}; }; class GVAR(consumeItem_SurgicalKit) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_consumeItem_SurgicalKit_DisplayName); - description = CSTRING(AdvancedMedicalSettings_consumeItem_SurgicalKit_Description); + displayName = CSTRING(MedicalSettings_consumeItem_SurgicalKit_DisplayName); + description = CSTRING(MedicalSettings_consumeItem_SurgicalKit_Description); typeName = "SCALAR"; value = 1; values[] = {"No", "Yes"}; @@ -188,36 +188,36 @@ class ACE_Settings { description = CSTRING(BasicMedicalSettings_useLocation_Epi_Description); typeName = "SCALAR"; value = 0; - values[] = {CSTRING(AdvancedMedicalSettings_anywhere), CSTRING(AdvancedMedicalSettings_vehicle), CSTRING(AdvancedMedicalSettings_facility), CSTRING(AdvancedMedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)}; + values[] = {ECSTRING(common,Anywhere), ECSTRING(common,Vehicle), CSTRING(MedicalSettings_facility), CSTRING(MedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)}; }; class GVAR(useLocation_Medkit) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_useLocation_Medkit_DisplayName); - description = CSTRING(AdvancedMedicalSettings_useLocation_Medkit_Description); + displayName = CSTRING(MedicalSettings_useLocation_Medkit_DisplayName); + description = CSTRING(MedicalSettings_useLocation_Medkit_Description); typeName = "SCALAR"; value = 0; - values[] = {CSTRING(AdvancedMedicalSettings_anywhere), CSTRING(AdvancedMedicalSettings_vehicle), CSTRING(AdvancedMedicalSettings_facility), CSTRING(AdvancedMedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)}; + values[] = {ECSTRING(common,Anywhere), ECSTRING(common,Vehicle), CSTRING(MedicalSettings_facility), CSTRING(MedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)}; }; class GVAR(useLocation_PAK) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_useLocation_PAK_DisplayName); - description = CSTRING(AdvancedMedicalSettings_useLocation_PAK_Description); + displayName = CSTRING(MedicalSettings_useLocation_PAK_DisplayName); + description = CSTRING(MedicalSettings_useLocation_PAK_Description); typeName = "SCALAR"; value = 0; - values[] = {CSTRING(AdvancedMedicalSettings_anywhere), CSTRING(AdvancedMedicalSettings_vehicle), CSTRING(AdvancedMedicalSettings_facility), CSTRING(AdvancedMedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)}; + values[] = {ECSTRING(common,Anywhere), ECSTRING(common,Vehicle), CSTRING(MedicalSettings_facility), CSTRING(MedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)}; }; class GVAR(useLocation_SurgicalKit) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_useLocation_SurgicalKit_DisplayName); - description = CSTRING(AdvancedMedicalSettings_useLocation_SurgicalKit_Description); + displayName = CSTRING(MedicalSettings_useLocation_SurgicalKit_DisplayName); + description = CSTRING(MedicalSettings_useLocation_SurgicalKit_Description); typeName = "SCALAR"; value = 0; - values[] = {CSTRING(AdvancedMedicalSettings_anywhere), CSTRING(AdvancedMedicalSettings_vehicle), CSTRING(AdvancedMedicalSettings_facility), CSTRING(AdvancedMedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)}; + values[] = {ECSTRING(common,Anywhere), ECSTRING(common,Vehicle), CSTRING(MedicalSettings_facility), CSTRING(MedicalSettings_vehicleAndFacility), ECSTRING(common,Disabled)}; }; class GVAR(remainingDamage_Medkit) { category = CSTRING(Category_Medical); - displayName = CSTRING(AdvancedMedicalSettings_remainingDamage_Medkit_DisplayName); - description = CSTRING(AdvancedMedicalSettings_remainingDamage_Medkit_Description); + displayName = CSTRING(MedicalSettings_remainingDamage_Medkit_DisplayName); + description = CSTRING(MedicalSettings_remainingDamage_Medkit_Description); typeName = "SCALAR"; value = 0.1; }; @@ -231,6 +231,7 @@ class ACE_Settings { }; class GVAR(allowUnconsciousAnimationOnTreatment) { category = CSTRING(Category_Medical); + displayName = CSTRING(MedicalSettings_allowUnconsciousAnimationOnTreatment_DisplayName); typeName = "BOOL"; value = 0; }; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index e7ff5dc8af..2a3ce6629b 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -115,10 +115,9 @@ class CfgVehicles { displayName = CSTRING(MedicalSettings_fatalInjuryCondition_DisplayName); description = CSTRING(MedicalSettings_fatalInjuryCondition_Description); typeName = "SCALAR"; - //values[] = {"Always", "In Cardiac Arrest", "Never"}; class values { class always { - name = CSTRING(MedicalSettings_fatalInjuryCondition_Always); + name = ECSTRING(common,Always); value = 0; default = 1; }; @@ -127,7 +126,7 @@ class CfgVehicles { value = 1; }; class never { - name = CSTRING(MedicalSettings_fatalInjuryCondition_Never); + name = ECSTRING(common,Never); value = 1; }; }; @@ -142,40 +141,38 @@ class CfgVehicles { displayName = CSTRING(MedicalSettings_medicSetting_PainVisualization_DisplayName); description = CSTRING(MedicalSettings_medicSetting_PainVisualization_Description); typeName = "SCALAR"; - //values[] = {"Anyone", "Medics only", "Doctors only"}; class values { class anyone { - name = "Anyone"; + name = CSTRING(MedicalSettings_anyone); value = 0; default = 1; }; class onlymedics { - name = "Medics only"; + name = CSTRING(MedicalSettings_Medic); value = 1; }; class onlydoctors { - name = "Doctors only"; + name = CSTRING(MedicalSettings_Special); value = 2; }; }; }; class medicSetting_Epi { - displayName = CSTRING(BasicMedicalSettings_medicSetting_Epi_DisplayName); - description = CSTRING(BasicMedicalSettings_medicSetting_Epi_Description); + displayName = CSTRING(MedicalSettings_medicSetting_Epi_DisplayName); + description = CSTRING(MedicalSettings_medicSetting_Epi_Description); typeName = "SCALAR"; - //values[] = {"Anyone", "Medics only", "Doctors only"}; class values { class anyone { - name = "Anyone"; + name = CSTRING(MedicalSettings_anyone); value = 0; default = 1; }; class onlymedics { - name = "Medics only"; + name = CSTRING(MedicalSettings_Medic); value = 1; }; class onlydoctors { - name = "Doctors only"; + name = CSTRING(MedicalSettings_Special); value = 2; }; }; @@ -184,19 +181,18 @@ class CfgVehicles { displayName = CSTRING(MedicalSettings_medicSetting_Medkit_DisplayName); description = CSTRING(MedicalSettings_medicSetting_Medkit_Description); typeName = "SCALAR"; - //values[] = {"Anyone", "Medics only", "Doctors only"}; class values { class anyone { - name = "Anyone"; + name = CSTRING(MedicalSettings_anyone); value = 0; default = 1; }; class onlymedics { - name = "Medics only"; + name = CSTRING(MedicalSettings_Medic); value = 1; }; class onlydoctors { - name = "Doctors only"; + name = CSTRING(MedicalSettings_Special); value = 2; }; }; @@ -207,7 +203,7 @@ class CfgVehicles { typeName = "SCALAR"; class values { class anyone { - name = "Anyone"; + name = CSTRING(MedicalSettings_anyone); value = 0; default = 1; }; @@ -216,7 +212,7 @@ class CfgVehicles { value = 1; }; class onlydoctors { - name = "Doctors only"; + name = CSTRING(MedicalSettings_Special); value = 2; }; }; @@ -227,16 +223,16 @@ class CfgVehicles { typeName = "SCALAR"; class values { class anyone { - name = "Anyone"; + name = CSTRING(MedicalSettings_anyone); value = 0; default = 1; }; class onlymedics { - name = "Medics only"; + name = CSTRING(MedicalSettings_Medic); value = 1; }; class onlydoctors { - name = "Doctors only"; + name = CSTRING(MedicalSettings_Special); value = 2; }; }; @@ -247,11 +243,11 @@ class CfgVehicles { typeName = "SCALAR"; class values { class no { - name = "No"; + name = ECSTRING(common,No); value = 0; }; class yes { - name = "Yes"; + name = ECSTRING(common,Yes); value = 1; default = 1; }; @@ -263,11 +259,11 @@ class CfgVehicles { typeName = "SCALAR"; class values { class no { - name = "No"; + name = ECSTRING(common,No); value = 0; }; class yes { - name = "Yes"; + name = ECSTRING(common,Yes); value = 1; default = 1; }; @@ -279,11 +275,11 @@ class CfgVehicles { typeName = "SCALAR"; class values { class no { - name = "No"; + name = ECSTRING(common,No); value = 0; }; class yes { - name = "Yes"; + name = ECSTRING(common,Yes); value = 1; default = 1; }; @@ -295,12 +291,12 @@ class CfgVehicles { typeName = "SCALAR"; class values { class anywhere { - name = CSTRING(MedicalSettings_anywhere); + name = ECSTRING(common,Anywhere); value = 0; default = 1; }; class vehicle { - name = CSTRING(MedicalSettings_vehicle); + name = ECSTRING(common,Vehicle); value = 1; }; class facility { @@ -323,12 +319,12 @@ class CfgVehicles { typeName = "SCALAR"; class values { class anywhere { - name = CSTRING(MedicalSettings_anywhere); + name = ECSTRING(common,Anywhere); value = 0; default = 1; }; class vehicle { - name = CSTRING(MedicalSettings_vehicle); + name = ECSTRING(common,Vehicle); value = 1; }; class facility { @@ -351,12 +347,12 @@ class CfgVehicles { typeName = "SCALAR"; class values { class anywhere { - name = CSTRING(MedicalSettings_anywhere); + name = ECSTRING(common,Anywhere); value = 0; default = 1; }; class vehicle { - name = CSTRING(MedicalSettings_vehicle); + name = ECSTRING(common,Vehicle); value = 1; }; class facility { @@ -379,12 +375,12 @@ class CfgVehicles { typeName = "SCALAR"; class values { class anywhere { - name = CSTRING(MedicalSettings_anywhere); + name = ECSTRING(common,Anywhere); value = 0; default = 1; }; class vehicle { - name = CSTRING(MedicalSettings_vehicle); + name = ECSTRING(common,Vehicle); value = 1; }; class facility { @@ -462,12 +458,12 @@ class CfgVehicles { typeName = "SCALAR"; class values { class no { - name = "No"; + name = ECSTRING(common,No); value = 0; default = 1; }; class yes { - name = "Yes"; + name = ECSTRING(common,Yes); value = 1; }; };