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

Added shared logistics categories

Browse Source
This commit is contained in:
jonpas 2015-08-18 05:26:55 +02:00
parent 42bd8751aa
commit b627e32a00
13 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/cargo/ACE_Settings.hpp
View File

@ -4,6 +4,6 @@ class ACE_Settings {
description = CSTRING(ModuleSettings_enable_Description); description = CSTRING(ModuleSettings_enable_Description);
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 1;
category = CSTRING(settingsCategory); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
}; };

2
addons/cargo/CfgVehicles.hpp
View File

@ -4,7 +4,7 @@ class CfgVehicles {
scope = 2; scope = 2;
displayName = CSTRING(SettingsModule_DisplayName); displayName = CSTRING(SettingsModule_DisplayName);
icon = QUOTE(PATHTOF(UI\Icon_Module_Cargo_ca.paa)); icon = QUOTE(PATHTOF(UI\Icon_Module_Cargo_ca.paa));
category = "ACE"; category = "ACE_Logistics";
function = QFUNC(moduleSettings); function = QFUNC(moduleSettings);
functionPriority = 1; functionPriority = 1;
isGlobal = 1; isGlobal = 1;

5
addons/cargo/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"> <Project name="ACE">
<Package name="Cargo"> <Package name="Cargo">
<Key ID="STR_ACE_Cargo_loadObject"> <Key ID="STR_ACE_Cargo_loadObject">
@ -16,9 +16,6 @@
<Key ID="STR_ACE_Cargo_labelSpace"> <Key ID="STR_ACE_Cargo_labelSpace">
<English>Cargo space left: %1</English> <English>Cargo space left: %1</English>
</Key> </Key>
<Key ID="STR_ACE_Cargo_settingsCategory">
<English>Cargo</English>
</Key>
<Key ID="STR_ACE_Cargo_ModuleSettings_enable"> <Key ID="STR_ACE_Cargo_ModuleSettings_enable">
<English>Enable Cargo</English> <English>Enable Cargo</English>
</Key> </Key>

3
addons/main/CfgModuleCategories.hpp
View File

@ -5,4 +5,7 @@ class CfgFactionClasses {
priority = 2; priority = 2;
side = 7; side = 7;
}; };
class ACE_Logistics: ACE {
displayName = CSTRING(Category_Logistics);
};
}; };

5
addons/main/CfgVehicleClasses.hpp Normal file
View File

@ -0,0 +1,5 @@
class CfgVehicleClasses {
class ACE_Logistics_Items {
displayName = CSTRING(Category_Logistics);
};
};

3
addons/main/config.cpp
View File

@ -1,4 +1,4 @@
#include "script_component.hpp" #include "script_component.hpp"
class CfgPatches { class CfgPatches {
class ADDON { class ADDON {
@ -587,3 +587,4 @@ class CfgSettings {
}; };
#include "CfgModuleCategories.hpp" #include "CfgModuleCategories.hpp"
#include "CfgVehicleClasses.hpp"

8
addons/main/stringtable.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Main">
<Key ID="STR_ACE_Main_Category_Logistics">
<English>ACE Logistics</English>
</Key>
</Package>
</Project>

5
addons/optionsmenu/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"> <Project name="ACE">
<Package name="OptionsMenu"> <Package name="OptionsMenu">
<Key ID="STR_ACE_OptionsMenu_OpenConfigMenu"> <Key ID="STR_ACE_OptionsMenu_OpenConfigMenu">
@ -349,5 +349,8 @@
<English>All Categories</English> <English>All Categories</English>
<Polish>Wszystkie kategorie</Polish> <Polish>Wszystkie kategorie</Polish>
</Key> </Key>
<Key ID="STR_ACE_OptionsMenu_CategoryLogistics">
<English>Logistics</English>
</Key>
</Package> </Package>
</Project> </Project>

16
addons/repair/ACE_Settings.hpp
View File

@ -5,7 +5,7 @@ class ACE_Settings {
typeName = "BOOL"; typeName = "BOOL";
isClientSettable = 1; isClientSettable = 1;
value = 1; value = 1;
category = CSTRING(categoryName); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
class GVAR(engineerSetting_Repair) { class GVAR(engineerSetting_Repair) {
displayName = CSTRING(enginerSetting_Repair_name); displayName = CSTRING(enginerSetting_Repair_name);
@ -13,7 +13,7 @@ class ACE_Settings {
typeName = "SCALAR"; typeName = "SCALAR";
value = 1; value = 1;
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)}; values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
category = CSTRING(categoryName); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
class GVAR(engineerSetting_Wheel) { class GVAR(engineerSetting_Wheel) {
displayName = CSTRING(enginerSetting_Wheel_name); displayName = CSTRING(enginerSetting_Wheel_name);
@ -21,21 +21,21 @@ class ACE_Settings {
typeName = "SCALAR"; typeName = "SCALAR";
value = 0; value = 0;
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)}; values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
category = CSTRING(categoryName); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
class GVAR(repairDamageThreshold) { class GVAR(repairDamageThreshold) {
displayName = CSTRING(repairDamageThreshold_name); displayName = CSTRING(repairDamageThreshold_name);
description = CSTRING(repairDamageThreshold_description); description = CSTRING(repairDamageThreshold_description);
typeName = "SCALAR"; typeName = "SCALAR";
value = 0.6; value = 0.6;
category = CSTRING(categoryName); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
class GVAR(repairDamageThreshold_Engineer) { class GVAR(repairDamageThreshold_Engineer) {
displayName = CSTRING(repairDamageThreshold_Engineer_name); displayName = CSTRING(repairDamageThreshold_Engineer_name);
description = CSTRING(repairDamageThreshold_Engineer_description); description = CSTRING(repairDamageThreshold_Engineer_description);
typeName = "SCALAR"; typeName = "SCALAR";
value = 0.4; value = 0.4;
category = CSTRING(categoryName); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
class GVAR(consumeItem_ToolKit) { class GVAR(consumeItem_ToolKit) {
displayName = CSTRING(consumeItem_ToolKit_name); displayName = CSTRING(consumeItem_ToolKit_name);
@ -43,7 +43,7 @@ class ACE_Settings {
typeName = "SCALAR"; typeName = "SCALAR";
value = 1; value = 1;
values[] = {ECSTRING(common,No), ECSTRING(common,Yes)}; values[] = {ECSTRING(common,No), ECSTRING(common,Yes)};
category = CSTRING(categoryName); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
class GVAR(fullRepairLocation) { class GVAR(fullRepairLocation) {
displayName = CSTRING(fullRepairLocation); displayName = CSTRING(fullRepairLocation);
@ -51,7 +51,7 @@ class ACE_Settings {
typeName = "SCALAR"; typeName = "SCALAR";
value = 2; value = 2;
values[] = {CSTRING(useAnywhere), CSTRING(repairVehicleOnly), CSTRING(repairFacilityOnly), CSTRING(vehicleAndFacility), ECSTRING(common,Disabled)}; values[] = {CSTRING(useAnywhere), CSTRING(repairVehicleOnly), CSTRING(repairFacilityOnly), CSTRING(vehicleAndFacility), ECSTRING(common,Disabled)};
category = CSTRING(categoryName); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
class GVAR(engineerSetting_fullRepair) { class GVAR(engineerSetting_fullRepair) {
displayName = CSTRING(engineerSetting_fullRepair_name); displayName = CSTRING(engineerSetting_fullRepair_name);
@ -59,6 +59,6 @@ class ACE_Settings {
typeName = "SCALAR"; typeName = "SCALAR";
value = 3; value = 3;
values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)}; values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
category = CSTRING(categoryName); category = ECSTRING(OptionsMenu,CategoryLogistics);
}; };
}; };

5
addons/repair/CfgVehicleClasses.hpp
View File

@ -1,5 +0,0 @@
class CfgVehicleClasses {
class GVAR(items) {
displayName = "ACE";
};
};

15
addons/repair/CfgVehicles.hpp
View File

@ -16,12 +16,11 @@
class CfgVehicles { class CfgVehicles {
class ACE_Module; class ACE_Module;
// @todo localization for all the modules
class ACE_moduleRepairSettings: ACE_Module { class ACE_moduleRepairSettings: ACE_Module {
scope = 2; scope = 2;
displayName = CSTRING(moduleName); displayName = CSTRING(moduleName);
icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa)); //@todo icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa));
category = "ACE"; category = "ACE_Logistics";
function = QFUNC(moduleRepairSettings); function = QFUNC(moduleRepairSettings);
functionPriority = 1; functionPriority = 1;
isGlobal = 1; isGlobal = 1;
@ -103,7 +102,7 @@ class CfgVehicles {
scope = 2; scope = 2;
displayName = CSTRING(AssignEngineerRole_Module_DisplayName); displayName = CSTRING(AssignEngineerRole_Module_DisplayName);
icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa)); icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa));
category = "ACE"; category = "ACE_Logistics";
function = QFUNC(moduleAssignEngineer); function = QFUNC(moduleAssignEngineer);
functionPriority = 10; functionPriority = 10;
isGlobal = 2; isGlobal = 2;
@ -147,7 +146,7 @@ class CfgVehicles {
scope = 2; scope = 2;
displayName = CSTRING(AssignRepairVehicle_Module_DisplayName); displayName = CSTRING(AssignRepairVehicle_Module_DisplayName);
icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa)); icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa));
category = "ACE"; category = "ACE_Logistics";
function = QFUNC(moduleAssignRepairVehicle); function = QFUNC(moduleAssignRepairVehicle);
functionPriority = 10; functionPriority = 10;
isGlobal = 2; isGlobal = 2;
@ -254,7 +253,7 @@ class CfgVehicles {
icon = "iconObject_circle"; icon = "iconObject_circle";
mapSize = 0.7; mapSize = 0.7;
accuracy = 0.2; accuracy = 0.2;
vehicleClass = QGVAR(items); vehicleClass = "ACE_Logistics_Items";
destrType = "DesturctNo"; destrType = "DesturctNo";
}; };
@ -264,7 +263,7 @@ class CfgVehicles {
author = "Hawkins"; author = "Hawkins";
scope = 2; scope = 2;
model = QUOTE(PATHTOF(data\ace_track.p3d)); model = QUOTE(PATHTOF(data\ace_track.p3d));
displayName = "$STR_ACE_Repair_SpareTrack"; displayName = CSTRING(SpareTrack);
}; };
class ACE_Wheel: ACE_RepairItem_Base { class ACE_Wheel: ACE_RepairItem_Base {
@ -273,7 +272,7 @@ class CfgVehicles {
author = "Hawkins"; author = "Hawkins";
scope = 2; scope = 2;
model = QUOTE(PATHTOF(data\ace_wheel.p3d)); model = QUOTE(PATHTOF(data\ace_wheel.p3d));
displayName = "$STR_ACE_Repair_SpareWheel"; displayName = CSTRING(SpareWheel);
picture = QUOTE(PATHTOF(ui\tire_ca.paa)); picture = QUOTE(PATHTOF(ui\tire_ca.paa));
}; };

11
addons/repair/config.cpp
View File

@ -12,11 +12,8 @@ class CfgPatches {
}; };
}; };
#include "CfgEventHandlers.hpp"
#include "CfgActions.hpp"
#include "CfgVehicleClasses.hpp"
#include "CfgVehicles.hpp"
#include "ACE_Settings.hpp"
#include "ACE_Repair.hpp" #include "ACE_Repair.hpp"
#include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp"
#include "CfgActions.hpp"
#include "CfgVehicles.hpp"

3
addons/repair/stringtable.xml
View File

@ -635,8 +635,5 @@
<Key ID="STR_ACE_Repair_AssignRepairFacility_Module_Description"> <Key ID="STR_ACE_Repair_AssignRepairFacility_Module_Description">
<English>Assign one or multiple objects as a repair Facility</English> <English>Assign one or multiple objects as a repair Facility</English>
</Key> </Key>
<Key ID="STR_ACE_Repair_categoryName">
<English>Vehicle Repair</English>
</Key>
</Package> </Package>
</Project> </Project>