From 3bfac35b65438017c9e157c2e2a48830643aebac Mon Sep 17 00:00:00 2001 From: SzwedzikPL Date: Sun, 7 Feb 2016 23:56:45 +0100 Subject: [PATCH 1/3] ace repair and medical attributes --- addons/medical/CfgEden.hpp | 48 ++++++++++++++++++++++++++++++++++ addons/medical/config.cpp | 2 +- addons/medical/stringtable.xml | 8 ++++++ addons/repair/CfgEden.hpp | 48 ++++++++++++++++++++++++++++++++++ addons/repair/config.cpp | 1 + 5 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 addons/medical/CfgEden.hpp create mode 100644 addons/repair/CfgEden.hpp diff --git a/addons/medical/CfgEden.hpp b/addons/medical/CfgEden.hpp new file mode 100644 index 0000000000..2c8c614a3d --- /dev/null +++ b/addons/medical/CfgEden.hpp @@ -0,0 +1,48 @@ +class Cfg3DEN { + class Object { + class AttributeCategories { + class StateSpecial { + class Attributes { + class ACE_IsMedic { + property = QUOTE(ACE_IsMedic); + value = 0; + control = "Combo"; + displayName = CSTRING(AssignMedicRoles_role_DisplayName); + tooltip = CSTRING(Attributes_isMedic_Description); + expression = QUOTE(_this setVariable [ARR_2(QUOTE(QGVAR(medicClass)),_value)];); + typeName = "NUMBER"; + condition = "objectBrain"; + defaultValue = 0; + class values { + class none {name = CSTRING(AssignMedicRoles_role_none); value = 0; default = 1;}; + class medic {name = CSTRING(AssignMedicRoles_role_medic); value = 1; default = 0;}; + class doctor {name = CSTRING(AssignMedicRoles_role_doctor); value = 2; default = 0;}; + }; + }; + class ACE_isMedicalVehicle { + property = QUOTE(ACE_isMedicalVehicle); + value = 0; + control = "CheckboxNumber"; + displayName = CSTRING(AssignMedicVehicle_enabled_DisplayName) + tooltip = CSTRING(Attributes_isMedicalVehicle_Description) + expression = QUOTE(_this setVariable [ARR_2(QUOTE(QGVAR(medicClass)),_value)];); + typeName = "NUMBER"; + condition = "objectVehicle"; + defaultValue = 0; + }; + class ACE_isMedicalFacility { + property = QUOTE(ACE_isMedicalFacility); + value = 0; + control = "Checkbox"; + displayName = CSTRING(AssignMedicalFacility_enabled_DisplayName) + tooltip = CSTRING(AssignMedicalFacility_enabled_Description) + expression = QUOTE(_this setVariable [ARR_2(QUOTE(QGVAR(isMedicalFacility)),_value)];); + typeName = "BOOL"; + condition = "(1 - objectBrain) * (1 - objectVehicle)"; + defaultValue = "false"; + }; + }; + }; + }; + }; +}; diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp index 910a086364..d40fb9e6a6 100644 --- a/addons/medical/config.cpp +++ b/addons/medical/config.cpp @@ -18,8 +18,8 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" #include "CfgSounds.hpp" +#include "CfgEden.hpp" #include "ACE_Medical_Treatments.hpp" #include "ACE_Settings.hpp" #include "UI\RscTitles.hpp" #include "UI\triagecard.hpp" - diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index f603344b98..676c69f892 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -3890,6 +3890,14 @@ Нет жгута на этой части тела! Não existe nenhum torniquete nesta parte do corpo! Žádné škrtidlo na této části těla! + + + Medical training + Wyszkolenie medyczne + + + Whatever or not the objects will be a medical vehicle. + Czy pojazdy ma być pojazdem medycznym? \ No newline at end of file diff --git a/addons/repair/CfgEden.hpp b/addons/repair/CfgEden.hpp new file mode 100644 index 0000000000..b35d654774 --- /dev/null +++ b/addons/repair/CfgEden.hpp @@ -0,0 +1,48 @@ +class Cfg3DEN { + class Object { + class AttributeCategories { + class StateSpecial { + class Attributes { + class ACE_IsEngineer { + property = QUOTE(ACE_IsEngineer); + value = 0; + control = "Combo"; + displayName = CSTRING(AssignEngineerRole_role_DisplayName); + tooltip = CSTRING(AssignEngineerRole_role_Description); + expression = "_this setVariable ['%s',_value];"; + typeName = "NUMBER"; + condition = "objectBrain"; + defaultValue = 0; + class values { + class none {name = CSTRING(AssignEngineerRole_role_none); value = 0; default = 1;}; + class engineer {name = CSTRING(AssignEngineerRole_role_engineer); value = 1; default = 0;}; + class specialist {name = CSTRING(AssignEngineerRole_role_specialist); value = 2; default = 0;}; + }; + }; + class ACE_isRepairVehicle { + property = QUOTE(ACE_isRepairVehicle); + value = 0; + control = "CheckboxNumber"; + displayName = CSTRING(AssignRepairVehicle_role_DisplayName) + tooltip = CSTRING(AssignRepairVehicle_role_Description) + expression = "_this setVariable ['%s',_value];"; + typeName = "NUMBER"; + condition = "objectVehicle"; + defaultValue = 0; + }; + class ACE_isRepairFacility { + property = QUOTE(ACE_isRepairFacility); + value = 0; + control = "CheckboxNumber"; + displayName = CSTRING(AssignRepairFacility_role_DisplayName) + tooltip = CSTRING(AssignRepairFacility_role_Description) + expression = "_this setVariable ['%s',_value];"; + typeName = "NUMBER"; + condition = "(1 - objectBrain) * (1 - objectVehicle)"; + defaultValue = 0; + }; + }; + }; + }; + }; +}; diff --git a/addons/repair/config.cpp b/addons/repair/config.cpp index 2e991b54a6..d377342adf 100644 --- a/addons/repair/config.cpp +++ b/addons/repair/config.cpp @@ -17,3 +17,4 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgActions.hpp" #include "CfgVehicles.hpp" +#include "CfgEden.hpp" From 94ea26c7b9daee70d06f02e3eecd8d0158b13464 Mon Sep 17 00:00:00 2001 From: SzwedzikPL Date: Mon, 8 Feb 2016 00:14:55 +0100 Subject: [PATCH 2/3] typo fix --- addons/medical/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 676c69f892..8c6d7aeb49 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -3896,7 +3896,7 @@ Wyszkolenie medyczne - Whatever or not the objects will be a medical vehicle. + Whether or not the object will be a medical vehicle. Czy pojazdy ma być pojazdem medycznym? From 0c80551fd86a718058fd9f729f9773f041285de8 Mon Sep 17 00:00:00 2001 From: SzwedzikPL Date: Wed, 10 Feb 2016 01:17:18 +0100 Subject: [PATCH 3/3] ace attribute category, lower case classes --- addons/common/CfgEden.hpp | 11 +++++++++++ addons/common/config.cpp | 3 ++- addons/medical/CfgEden.hpp | 14 +++++++------- addons/repair/CfgEden.hpp | 14 +++++++------- 4 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 addons/common/CfgEden.hpp diff --git a/addons/common/CfgEden.hpp b/addons/common/CfgEden.hpp new file mode 100644 index 0000000000..1b833b0342 --- /dev/null +++ b/addons/common/CfgEden.hpp @@ -0,0 +1,11 @@ +class Cfg3DEN { + class Object { + class AttributeCategories { + class ace_attributes { + displayName = CSTRING(Options); + collapsed = 1; + class Attributes {}; + }; + }; + }; +}; diff --git a/addons/common/config.cpp b/addons/common/config.cpp index f78e19d063..8050943803 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -24,6 +24,7 @@ class CfgPatches { #include "CfgMoves.hpp" #include "CfgVoice.hpp" #include "CfgUnitInsignia.hpp" +#include "CfgEden.hpp" class ACE_Rsc_Display_Base { idd = -1; @@ -79,7 +80,7 @@ class CfgUIGrids { displayName = "ACE Hint"; description = "Textual in game feedback to the player."; preview = "\a3\Ui_f\data\GUI\Cfg\UIGrids\grid_hint_ca.paa"; - saveToProfile[] = {0,1}; + saveToProfile[] = {0,1}; }; }; }; diff --git a/addons/medical/CfgEden.hpp b/addons/medical/CfgEden.hpp index 2c8c614a3d..1b5919d287 100644 --- a/addons/medical/CfgEden.hpp +++ b/addons/medical/CfgEden.hpp @@ -1,10 +1,10 @@ class Cfg3DEN { class Object { class AttributeCategories { - class StateSpecial { + class ace_attributes { class Attributes { - class ACE_IsMedic { - property = QUOTE(ACE_IsMedic); + class ace_isMedic { + property = QUOTE(ace_isMedic); value = 0; control = "Combo"; displayName = CSTRING(AssignMedicRoles_role_DisplayName); @@ -19,8 +19,8 @@ class Cfg3DEN { class doctor {name = CSTRING(AssignMedicRoles_role_doctor); value = 2; default = 0;}; }; }; - class ACE_isMedicalVehicle { - property = QUOTE(ACE_isMedicalVehicle); + class ace_isMedicalVehicle { + property = QUOTE(ace_isMedicalVehicle); value = 0; control = "CheckboxNumber"; displayName = CSTRING(AssignMedicVehicle_enabled_DisplayName) @@ -30,8 +30,8 @@ class Cfg3DEN { condition = "objectVehicle"; defaultValue = 0; }; - class ACE_isMedicalFacility { - property = QUOTE(ACE_isMedicalFacility); + class ace_isMedicalFacility { + property = QUOTE(ace_isMedicalFacility); value = 0; control = "Checkbox"; displayName = CSTRING(AssignMedicalFacility_enabled_DisplayName) diff --git a/addons/repair/CfgEden.hpp b/addons/repair/CfgEden.hpp index b35d654774..085b298e46 100644 --- a/addons/repair/CfgEden.hpp +++ b/addons/repair/CfgEden.hpp @@ -1,10 +1,10 @@ class Cfg3DEN { class Object { class AttributeCategories { - class StateSpecial { + class ace_attributes { class Attributes { - class ACE_IsEngineer { - property = QUOTE(ACE_IsEngineer); + class ace_isEngineer { + property = QUOTE(ace_isEngineer); value = 0; control = "Combo"; displayName = CSTRING(AssignEngineerRole_role_DisplayName); @@ -19,8 +19,8 @@ class Cfg3DEN { class specialist {name = CSTRING(AssignEngineerRole_role_specialist); value = 2; default = 0;}; }; }; - class ACE_isRepairVehicle { - property = QUOTE(ACE_isRepairVehicle); + class ace_isRepairVehicle { + property = QUOTE(ace_isRepairVehicle); value = 0; control = "CheckboxNumber"; displayName = CSTRING(AssignRepairVehicle_role_DisplayName) @@ -30,8 +30,8 @@ class Cfg3DEN { condition = "objectVehicle"; defaultValue = 0; }; - class ACE_isRepairFacility { - property = QUOTE(ACE_isRepairFacility); + class ace_isRepairFacility { + property = QUOTE(ace_isRepairFacility); value = 0; control = "CheckboxNumber"; displayName = CSTRING(AssignRepairFacility_role_DisplayName)