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

Clean new zeus module config and functions

Browse Source 
Adds function headers, stringtables and renames some display control classes.
This commit is contained in:
SilentSpike 2016-05-18 16:16:35 +01:00
parent 81d854c56a
commit 8a70cfbcd8
10 changed files with 213 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
addons/zeus/CfgVehicles.hpp
View File

@ -91,38 +91,26 @@ class CfgVehicles {
displayName = CSTRING(ModuleAddSpareTrack_DisplayName);
function = QFUNC(moduleAddSpareTrack);
icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa));//@todo
class ModuleDescription {
description = CSTRING(ModuleAddSpareTrack_Description);
sync[] = {};
};
};
class GVAR(moduleAddSpareWheel): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = CSTRING(ModuleAddSpareWheel_DisplayName);
function = QFUNC(moduleAddSpareWheel);
icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa));//@todo
class ModuleDescription {
description = CSTRING(ModuleAddSpareWheel_Description);
sync[] = {};
};
};
class GVAR(moduleCaptive): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = CSTRING(ModuleCaptive_DisplayName);
function = QFUNC(moduleCaptive);
icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Captive_ca.paa));
class ModuleDescription {
description = "Flips the capture state of the specified unit.";
sync[] = {};
};
};
class GVAR(moduleGlobalSetSkill): GVAR(moduleBase) {
displayName = "Global AI Skill";
displayName = CSTRING(ModuleGlobalSetSkill_DisplayName);
curatorInfoType = QGVAR(RscGlobalSetSkill);
};
class GVAR(moduleGroupSide): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = "Group Side";
displayName = CSTRING(ModuleGroupSide_DisplayName);
curatorInfoType = QGVAR(RscGroupSide);
};
class GVAR(moduleSetMedic): GVAR(moduleBase) {
@ -130,44 +118,28 @@ class CfgVehicles {
displayName = CSTRING(ModuleSetMedic_DisplayName);
function = QFUNC(moduleSetMedic);
icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa));
class ModuleDescription {
description = "";
sync[] = {};
};
};
class GVAR(moduleSetMedicalFacility): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = CSTRING(ModuleSetMedicalFacility_DisplayName);
function = QFUNC(moduleSetMedicalFacility);
icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa));
class ModuleDescription {
description = "";
sync[] = {};
};
};
class GVAR(moduleSetMedicalVehicle): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = CSTRING(ModuleSetMedicalVehicle_DisplayName);
function = QFUNC(moduleSetMedicalVehicle);
icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa));
class ModuleDescription {
description = "";
sync[] = {};
};
};
class GVAR(moduleSurrender): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = CSTRING(ModuleSurrender_DisplayName);
function = QFUNC(moduleSurrender);
icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Surrender_ca.paa));
class ModuleDescription {
description = "Flips the surrender state of the specified unit.";
sync[] = {};
};
};
class GVAR(moduleTeleportPlayers): GVAR(moduleBase) {
curatorCanAttach = 1;
displayName = "Teleport Players";
displayName = CSTRING(ModuleTeleportPlayers_DisplayName);
curatorInfoType = QGVAR(RscTeleportPlayers);
};
class GVAR(moduleUnconscious): GVAR(moduleBase) {
@ -175,9 +147,5 @@ class CfgVehicles {
displayName = CSTRING(ModuleUnconscious_DisplayName);
function = QFUNC(moduleUnconscious);
icon = QUOTE(PATHTOF(UI\Icon_Module_Zeus_Unconscious_ca.paa));
class ModuleDescription {
description = "Flips the unconscious state of the specified unit.";
sync[] = {};
};
};
};

17
addons/zeus/functions/fnc_moduleGlobalSetSkill.sqf
View File

@ -1,3 +1,20 @@
/*
* Author: SilentSpike
* PV event handler to update the AI skill on all machines when set by zeus module
*
* Arguments:
* 0: Variable name <STRING>
* 1: Variable new value <ANY>
*
* Return Value:
* None <NIL>
*
* Example:
* "ace_zeus_GlobalSkillAI" addPublicVariableEventHandler ace_zeus_fnc_moduleGlobalSetSkill
*
* Public: No
*/
#include "script_component.hpp"
_this params ["_varName","_varValue"];

18
addons/zeus/functions/fnc_moduleTeleportPlayers.sqf
View File

@ -1,3 +1,21 @@
/*
* Author: SilentSpike
* Zeus module function to teleport players on dialog confirmation
*
* Arguments:
* 0: Teleport to <OBJECT>
* 1: Player UID <STRING>
* 2: Teleport group <BOOL>
*
* Return Value:
* None <NIL>
*
* Example:
* [player, "5854854754", false] call ace_zeus_fnc_moduleTeleportPlayers
*
* Public: No
*/
#include "script_component.hpp"
params ["_logic","_uid","_group"];

16
addons/zeus/functions/fnc_ui_globalSetSkill.sqf
View File

@ -1,3 +1,19 @@
/*
* Author: PabstMirror
* Initalises the `global skill` zeus module display
*
* Arguments:
* 0: globalSetSkill controls group <CONTROL>
*
* Return Value:
* None <NIL>
*
* Example:
* onSetFocus = "_this call ace_zeus_fnc_ui_globalSetSkill"
*
* Public: No
*/
#include "script_component.hpp"
disableSerialization;

21
addons/zeus/functions/fnc_ui_groupSide.sqf
View File

@ -1,3 +1,19 @@
/*
* Author: SilentSpike
* Initalises the `group side` zeus module display
*
* Arguments:
* 0: groupSide controls group <CONTROL>
*
* Return Value:
* NONE <NIL>
*
* Example:
* onSetFocus = "_this call ace_zeus_fnc_ui_groupSide"
*
* Public: No
*/
#include "script_component.hpp"
#define IDCs [31201,31200,31202,31203]
@ -27,6 +43,9 @@ private _fnc_errorAndClose = {
};
switch (false) do {
case !(isNull _unit): {
[LSTRING(NothingSelected)] call _fnc_errorAndClose;
};
case (_unit isKindOf "CAManBase"): {
[LSTRING(OnlyInfantry)] call _fnc_errorAndClose;
};
@ -34,7 +53,7 @@ switch (false) do {
[LSTRING(OnlyAlive)] call _fnc_errorAndClose;
};
case (_side in [west,east,independent,civilian]): {
["Unit must belong to an appropriate side"] call _fnc_errorAndClose;
[LSTRING(OnlySpecificSide)] call _fnc_errorAndClose;
};
};

20
addons/zeus/functions/fnc_ui_teleportPlayers.sqf
View File

@ -1,3 +1,19 @@
/*
* Author: SilentSpike
* Initalises the `teleport players` zeus module display
*
* Arguments:
* 0: teleportPlayers controls group <CONTROL>
*
* Return Value:
* NONE <NIL>
*
* Example:
* onSetFocus = "_this call ace_zeus_fnc_ui_teleportPlayers"
*
* Public: No
*/
#include "script_component.hpp"
disableSerialization;
@ -21,7 +37,7 @@ private _listbox = _display displayCtrl 16189;
} forEach allPlayers;
_listbox lbSetCurSel 0;
(_display displayCtrl 16188) cbSetChecked (_logic setVariable ["tpGroup",false]);
(_display displayCtrl 16188) cbSetChecked (_logic getVariable ["tpGroup",false]);
private _fnc_onUnload = {
params ["_display"];
@ -35,7 +51,7 @@ private _fnc_onUnload = {
private _fnc_onConfirm = {
params [["_ctrlButtonOK", controlNull, [controlNull]]];
private _display = ctrlparent _ctrlButtonOK;
if (isNull _display) exitWith {};

19
addons/zeus/functions/fnc_ui_vehCargo.sqf
View File

@ -1,3 +1,20 @@
/*
* Author: PabstMirror
* Initalises the ace_cargo attribute of the zeus vehicle attributes display
* (the display shown on double click)
*
* Arguments:
* 0: ace_cargo controls group <CONTROL>
*
* Return Value:
* None <NIL>
*
* Example:
* onSetFocus = "_this call ace_zeus_fnc_ui_vehCargo"
*
* Public: No
*/
#include "script_component.hpp"
params ["_control"];
@ -9,7 +26,7 @@ TRACE_1("",_veh);
private _loaded = _veh getVariable [QEGVAR(cargo,loaded), []];
TRACE_1("",_loaded);
lbClear ((ctrlParent _control) displayCtrl 80086);
_control ctrlRemoveAllEventHandlers "setFocus";
{
((ctrlParent _control) displayCtrl 80086) lbAdd (str _x);

19
addons/zeus/functions/fnc_zeusAttributes.sqf
View File

@ -1,3 +1,22 @@
/*
* Author: PabstMirror
* Dummy function to include BIS script file.
* Used in initalisation of zeus attribute displays.
*
* Arguments:
* 0: UI event string <STRING>
* 1: UI event parameters <ARRAY>
* 2: Display class name <STRING>
*
* Return Value:
* None <NIL>
*
* Example:
* onLoad = "['onLoad',_this,'RscDisplayExample'] call ace_zeus_fnc_zeusAttributes"
*
* Public: No
*/
#include "script_component.hpp"
TRACE_1("params",_this);

80
addons/zeus/stringtable.xml
View File

@ -181,6 +181,48 @@
<Russian>Пленный (вкл./выкл.)</Russian>
<Italian>Apri Catturato</Italian>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_DisplayName">
<English>Global AI Skill</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_general">
<English>General Skill</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_general_desc">
<English>Changes: general, commanding, courage</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_accuracy">
<English>Accuracy</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_accuracy_desc">
<English>Changes: aimingAccuracy</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_handling">
<English>Weapon Handling</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_handling_desc">
<English>Changes: aimingShake, aimingSpeed, reloadSpeed</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_spotting">
<English>Spotting</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_spotting_desc">
<English>Changes: spotDistance, spotTime</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_cover">
<English>Seek Cover</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_cover_desc">
<English>Should AI seek cover</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_combat">
<English>Auto Combat</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_combat_desc">
<English>Should AI automatically switch to combat mode</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGroupSide_DisplayName">
<English>Group Side</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleSurrender_DisplayName">
<English>Toggle Surrender</English>
<Polish>Przełącz kapitulację</Polish>
@ -193,6 +235,21 @@
<Russian>Сдавшийся (вкл./выкл.)</Russian>
<Italian>Apri Resa</Italian>
</Key>
<Key ID="STR_ACE_Zeus_ModuleTeleportPlayers_DisplayName">
<English>Teleport Players</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleTeleportPlayers_player">
<English>Player</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleTeleportPlayers_player_desc">
<English>Teleport selected player to module position</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleTeleportPlayers_group">
<English>Teleport Group</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleTeleportPlayers_group_desc">
<English>Teleports all units in group</English>
</Key>
<Key ID="STR_ACE_Zeus_ModuleUnconscious_DisplayName">
<English>Toggle Unconscious</English>
<Polish>Przełącz nieprzytomność</Polish>
@ -244,15 +301,6 @@
<Italian>Aggiungi Ruota di Scorta</Italian>
<Spanish>Agregar rueda de auxilio</Spanish>
</Key>
<Key ID="STR_ACE_Zeus_ModuleAddSpareWheel_Description">
<English>Adds a Spare Wheel to the vehicle</English>
<Portuguese>Adiciona uma roda sobressalente ao veículo</Portuguese>
<Polish>Dodaje koło zapasowe do pojazdu</Polish>
<Russian>Добавляет запасное колесо в транспорт</Russian>
<Czech>Přidá rezervní kolo do vozidla</Czech>
<Italian>Aggiungi una ruota di scorta al veicolo</Italian>
<Spanish>Agrega una rueda de auxilio al vehículo</Spanish>
</Key>
<Key ID="STR_ACE_Zeus_ModuleAddSpareTrack_DisplayName">
<English>Add Spare Track</English>
<Portuguese>Adicionar esteira sobressalente</Portuguese>
@ -262,15 +310,6 @@
<Italian>Aggiungi Cingolo di Scorta</Italian>
<Spanish>Agregar oruga de repuesto</Spanish>
</Key>
<Key ID="STR_ACE_Zeus_ModuleAddSpareTrack_Description">
<English>Adds a Spare Track to the vehicle</English>
<Portuguese>Adiciona uma esteira sobressalente ao veículo</Portuguese>
<Polish>Dodaje zapasową gąsienicę do pojazdu</Polish>
<Russian>Добавляет запасную гусеницу в транспорт</Russian>
<Czech>Přidá náhradní pás do vozidla</Czech>
<Italian>Aggiungi un cingolo di scorta al veicolo</Italian>
<Spanish>Agrega una oruga de repuesto al vehículo</Spanish>
</Key>
<Key ID="STR_ACE_Zeus_OnlyAlive">
<English>Unit must be alive</English>
<French>Utiliser uniquement sur une unité vivante</French>
@ -345,6 +384,9 @@
<Russian>Юнит не должен быть пленным</Russian>
<Italian>L'unità non dev'essere un prigioniero</Italian>
</Key>
<Key ID="STR_ACE_Zeus_OnlySpecificSide">
<English>Unit must belong to an appropriate side</English>
</Key>
<Key ID="STR_ACE_Zeus_NothingSelected">
<English>Place on a unit</English>
<French>Rien sous le curseur</French>
@ -388,4 +430,4 @@
<Italian>Aggiungi ogni oggetto creato a tutti i Curatori in missione</Italian>
</Key>
</Package>
</Project>
</Project>

46
addons/zeus/ui/RscAttributes.hpp
View File

@ -38,15 +38,15 @@ class GVAR(RscGlobalSetSkill): RscDisplayAttributes {
class controls {
class Title1: RscText {
idc = -1;
text = "General Skill";
toolTip = "Changes: general, commanding, courage";
text = CSTRING(ModuleGlobalSetSkill_general);
toolTip = CSTRING(ModuleGlobalSetSkill_general_desc);
x = 0;
y = 0;
w = W_PART(10);
h = H_PART(1);
colorBackground[] = {0,0,0,0.5};
};
class Value1: RscXSliderH {
class General: RscXSliderH {
idc = 16184;
x = W_PART(10.1);
y = 0;
@ -55,41 +55,41 @@ class GVAR(RscGlobalSetSkill): RscDisplayAttributes {
};
class Title2: Title1 {
idc = -1;
text = "Accuracy";
toolTip = "Changes: aimingAccuracy";
text = CSTRING(ModuleGlobalSetSkill_accuracy);
toolTip = CSTRING(ModuleGlobalSetSkill_accuracy_desc);
y = H_PART(1.1);
};
class Value2: Value1 {
class Accuracy: General {
idc = 16185;
y = H_PART(1.1);
};
class Title3: Title1 {
idc = -1;
text = "Weapon Handling";
toolTip = "Changes: aimingShake, aimingSpeed, reloadSpeed";
text = CSTRING(ModuleGlobalSetSkill_handling);
toolTip = CSTRING(ModuleGlobalSetSkill_handling_desc);
y = H_PART(2.2);
};
class Value3: Value1 {
class Handling: General {
idc = 16186;
y = H_PART(2.2);
};
class Title4: Title1 {
idc = -1;
text = "Spotting";
toolTip = "Changes: spotDistance, spotTime";
text = CSTRING(ModuleGlobalSetSkill_spotting);
toolTip = CSTRING(ModuleGlobalSetSkill_spotting_desc);
y = H_PART(3.3);
};
class Value4: Value1 {
class Spotting: General {
idc = 16187;
y = H_PART(3.3);
};
class Title5: Title1 {
idc = -1;
text = "Seek Cover";
toolTip = "Will AI seek cover";
text = CSTRING(ModuleGlobalSetSkill_cover);
toolTip = CSTRING(ModuleGlobalSetSkill_cover_desc);
y = H_PART(4.4);
};
class Value5: RscCheckBox {
class Cover: RscCheckBox {
idc = 16188;
x = W_PART(10.1);
y = H_PART(4.4);
@ -98,11 +98,11 @@ class GVAR(RscGlobalSetSkill): RscDisplayAttributes {
};
class Title6: Title5 {
idc = -1;
text = "AUTOCOMBAT";
toolTip = "Will AI automatically switch to combat mode";
text = CSTRING(ModuleGlobalSetSkill_combat);
toolTip = CSTRING(ModuleGlobalSetSkill_combat_desc);
y = H_PART(5.5);
};
class Value6: Value5 {
class Combat: Cover {
idc = 16189;
y = H_PART(5.5);
};
@ -123,7 +123,7 @@ class GVAR(RscGroupSide): RscDisplayAttributes {
class Title: Title {};
class Content: Content {
class Controls {
class GroupSide: RscControlsGroupNoScrollbars {
class groupSide: RscControlsGroupNoScrollbars {
onSetFocus = QUOTE(_this call FUNC(ui_groupSide));
idc = 26422;
x = 0;
@ -211,8 +211,8 @@ class GVAR(RscTeleportPlayers): RscDisplayAttributes {
class controls {
class Title: RscText {
idc = -1;
text = "Teleport Player";
toolTip = "Teleport selected player to module position";
text = CSTRING(ModuleTeleportPlayers_player);
toolTip = CSTRING(ModuleTeleportPlayers_player_desc);
x = 0;
y = 0;
w = W_PART(26);
@ -228,8 +228,8 @@ class GVAR(RscTeleportPlayers): RscDisplayAttributes {
};
class Label: Title {
idc = -1;
text = "Teleport Group";
toolTip = "Teleports all units in group";
text = CSTRING(ModuleTeleportPlayers_group);
toolTip = CSTRING(ModuleTeleportPlayers_group_desc);
y = H_PART(7.1);
w = W_PART(10);
};