Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Repair specialist rename, fixes #3186 (#5248)

Browse Source 
* Changed name

* Fixed Enginner only german and removed big letters

* Added docs + PR fixes #3186

* Removed other languages

* Fixed request and added comment

* Replace all usage of term "Specialist"
This commit is contained in:
Phyma 2017-06-08 19:10:35 +02:00 committed by PabstMirror
parent d1f4b90714
commit 55df8bca53
6 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/repair/ACE_Settings.hpp
View File

@ -12,7 +12,7 @@ class ACE_Settings {
description = CSTRING(enginerSetting_Repair_description);
typeName = "SCALAR";
value = 1;
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_AdvancedOnly)};
category = ECSTRING(OptionsMenu,CategoryLogistics);
};
class GVAR(engineerSetting_wheel) {
@ -20,7 +20,7 @@ class ACE_Settings {
description = CSTRING(enginerSetting_Wheel_description);
typeName = "SCALAR";
value = 0;
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_AdvancedOnly)};
category = ECSTRING(OptionsMenu,CategoryLogistics);
};
class GVAR(repairDamageThreshold) {
@ -58,7 +58,7 @@ class ACE_Settings {
description = CSTRING(engineerSetting_fullRepair_description);
typeName = "SCALAR";
value = 2;
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_AdvancedOnly)};
category = ECSTRING(OptionsMenu,CategoryLogistics);
};
class GVAR(addSpareParts) {

2
addons/repair/CfgEden.hpp
View File

@ -21,7 +21,7 @@ class Cfg3DEN {
h = "5 * (pixelH * pixelGrid * 0.50)";
rows = 1;
columns = 4;
strings[] = {"$STR_3DEN_Attributes_Lock_Default_text", CSTRING(AssignEngineerRole_role_none), CSTRING(AssignEngineerRole_role_engineer), CSTRING(AssignEngineerRole_role_specialist)};
strings[] = {"$STR_3DEN_Attributes_Lock_Default_text", CSTRING(AssignEngineerRole_role_none), CSTRING(AssignEngineerRole_role_engineer), CSTRING(AssignEngineerRole_role_advanced)};
};
};
};

8
addons/repair/CfgVehicles.hpp
View File

@ -38,7 +38,7 @@ class CfgVehicles {
class values {
class anyone { name = CSTRING(engineerSetting_anyone); value = 0; };
class Engineer { name = CSTRING(engineerSetting_EngineerOnly); value = 1; default = 1; };
class Special { name = CSTRING(engineerSetting_RepairSpecialistOnly); value = 2; };
class Advanced { name = CSTRING(engineerSetting_AdvancedOnly); value = 2; };
};
};
class engineerSetting_Wheel {
@ -48,7 +48,7 @@ class CfgVehicles {
class values {
class anyone { name = CSTRING(engineerSetting_anyone); value = 0; default = 1; };
class Engineer { name = CSTRING(engineerSetting_EngineerOnly); value = 1; };
class Special { name = CSTRING(engineerSetting_RepairSpecialistOnly); value = 2; };
class Advanced { name = CSTRING(engineerSetting_AdvancedOnly); value = 2; };
};
};
class repairDamageThreshold {
@ -91,7 +91,7 @@ class CfgVehicles {
class values {
class anyone { name = CSTRING(engineerSetting_anyone); value = 0; };
class Engineer { name = CSTRING(engineerSetting_EngineerOnly); value = 1; };
class Special { name = CSTRING(engineerSetting_RepairSpecialistOnly); value = 2; default = 1;};
class Advanced { name = CSTRING(engineerSetting_AdvancedOnly); value = 2; default = 1;};
};
};
class addSpareParts {
@ -150,7 +150,7 @@ class CfgVehicles {
default = 1;
};
class doctor {
name = CSTRING(AssignEngineerRole_role_specialist);
name = CSTRING(AssignEngineerRole_role_advanced);
value = 2;
};
};

2
addons/repair/functions/fnc_getPostRepairDamage.sqf
View File

@ -22,7 +22,7 @@ TRACE_1("params",_unit);
if (([_unit] call FUNC(isInRepairFacility) || {[_unit] call FUNC(isNearRepairVehicle)})) exitWith {0};
private _class = _unit getVariable ["ACE_IsEngineer", getNumber (configFile >> "CfgVehicles" >> typeOf _unit >> "engineer")];
//If specialist or more qualified than min, then use engineer threshold:
//If advanced or more qualified than min, then use engineer threshold:
if ((_class isEqualTo 2) || {[_unit, GVAR(engineerSetting_Repair) + 1] call FUNC(isEngineer)}) exitWith {
(GVAR(repairDamageThreshold_Engineer) min GVAR(repairDamageThreshold))
};

31
addons/repair/stringtable.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="repair">
<Key ID="STR_ACE_Repair_SpareTrack">
@ -954,18 +954,8 @@
<Japanese>工兵のみ</Japanese>
<Korean>오직 정비공만</Korean>
</Key>
<Key ID="STR_ACE_Repair_engineerSetting_RepairSpecialistOnly">
<English>Repair Specialist only</English>
<German>Nur Reparaturspezialist</German>
<Polish>Tylko inżynierowie</Polish>
<Portuguese>Somente especialista em reparos</Portuguese>
<Russian>Только ремонтные специалисты</Russian>
<Czech>Pouze specialista na opravování</Czech>
<Spanish>Solo especialista en reparación</Spanish>
<Italian>Solo Specialista Riparazioni</Italian>
<French>Spécialistes de réparation seulement</French>
<Japanese>専門兵のみ</Japanese>
<Korean>오직 정비 특기만</Korean>
<Key ID="STR_ACE_Repair_engineerSetting_AdvancedOnly">
<English>Advanced Engineer only</English>
</Key>
<Key ID="STR_ACE_Repair_enginerSetting_Wheel_name">
<English>Allow Wheel</English>
@ -1240,18 +1230,9 @@
<Japanese>専門兵</Japanese>
<Korean>정비공</Korean>
</Key>
<Key ID="STR_ACE_Repair_AssignEngineerRole_role_specialist">
<English>Specialist</English>
<German>Reparaturspezialist</German>
<Polish>Inżynier</Polish>
<Portuguese>Especialista</Portuguese>
<Russian>Специалист</Russian>
<Czech>Specialista</Czech>
<Spanish>Especialista</Spanish>
<Italian>Specialista Riparazioni</Italian>
<French>Spécialiste</French>
<Japanese>工兵として単体、複数ユニットを割り当てます。</Japanese>
<Korean>정비 특기</Korean>
<Key ID="STR_ACE_Repair_AssignEngineerRole_role_advanced">
<!-- Advanced Engineer is to long for some fields so it it shorted to Adv. -->
<English>Adv. Engineer</English>
</Key>
<Key ID="STR_ACE_Repair_AssignEngineerRole_Module_Description">
<English>Assign one or multiple units as an engineer</English>

1
docs/team.md
View File

@ -110,6 +110,7 @@ tpM | ACSE Dev Lead - Sounds, SME
* OnkelDisMaster
* oscarmolinadev
* PaxJaromeMalues
* Phyma
* pokertour
* Professor
* rakowozz