Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add settings to toggle attributes #716

Merged
merged 14 commits into from
May 21, 2023
Merged

Add settings to toggle attributes #716

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
662fec2
add settings
ampersand38 Mar 16, 2023
6bb8c52
Merge remote-tracking branch 'upstream/master' into toggle-attributes…
ampersand38 Apr 2, 2023
d90f1c2
German translation
Kexanone Apr 17, 2023
140012c
Merge remote-tracking branch 'upstream/master' into toggle-attributes…
ampersand38 Apr 28, 2023
5d1bd38
object and group attributes, settings page
ampersand38 Apr 28, 2023
9c4fc44
remove Original
ampersand38 Apr 28, 2023
709154b
fixed indent
ampersand38 Apr 28, 2023
a8883ae
remove waypoint
ampersand38 Apr 28, 2023
1d59cd5
enableExecute
ampersand38 Apr 28, 2023
dee82e0
removed tooltips
ampersand38 May 20, 2023
bf49779
remote tooltip
ampersand38 May 20, 2023
f5274f0
waypoints
ampersand38 May 20, 2023
18cce2e
Add remaining attributes
mharis001 May 21, 2023
92bbe3d
Use EGVAR
mharis001 May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/attributes/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ GVAR(previousMarkerColors) = [] call CBA_fnc_createNamespace;

// Initialize the core/default attributes
#include "initAttributes.sqf"
#include "initSettings.sqf"

ADDON = true;
61 changes: 35 additions & 26 deletions addons/attributes/initAttributes.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Object",
"STR_A3_Arsenal",
{_entity call EFUNC(common,openArsenal)},
{alive _entity && {_entity isKindOf "CAManBase"}},
{GVAR(enableArsenal) && {alive _entity} && {_entity isKindOf "CAManBase"}},
true
] call FUNC(addButton);

Expand All @@ -23,7 +23,7 @@
};
},
{name _entity},
{alive _entity && {_entity isKindOf "CAManBase"}}
{GVAR(enableName) && {alive _entity} && {_entity isKindOf "CAManBase"}}
] call FUNC(addAttribute);

[
Expand All @@ -37,7 +37,7 @@
} forEach call EFUNC(common,getSelectedUnits);
},
{skill _entity},
{alive _entity && {!isNull group _entity && {side _entity != sideLogic}}}
{GVAR(enableSkill) && {alive _entity} && {!isNull group _entity && {side _entity != sideLogic}}}
] call FUNC(addAttribute);

[
Expand All @@ -52,7 +52,7 @@
} forEach SELECTED_OBJECTS;
},
{1 - damage _entity},
{alive _entity}
{GVAR(enableHealth) && {alive _entity}}
] call FUNC(addAttribute);

[
Expand All @@ -66,7 +66,7 @@
} forEach call EFUNC(common,getSelectedVehicles);
},
{fuel _entity},
{alive _entity && {getNumber (configOf _entity >> "fuelCapacity") > 0}}
{GVAR(enableFuel) && {alive _entity} && {getNumber (configOf _entity >> "fuelCapacity") > 0}}
] call FUNC(addAttribute);

[
Expand All @@ -80,7 +80,7 @@
} forEach call EFUNC(common,getSelectedVehicles);
},
{_entity call EFUNC(common,getVehicleAmmo)},
{alive _entity && {_entity call EFUNC(common,getVehicleAmmo) != -1}}
{GVAR(enableAmmo) && {alive _entity} && {_entity call EFUNC(common,getVehicleAmmo) != -1}}
] call FUNC(addAttribute);

[
Expand All @@ -102,7 +102,7 @@
} forEach call EFUNC(common,getSelectedUnits);
},
{rank _entity},
{alive _entity && {_entity isKindOf "CAManBase"}}
{GVAR(enableRank) && {alive _entity && {_entity isKindOf "CAManBase"}}}
] call FUNC(addAttribute);

[
Expand All @@ -121,7 +121,7 @@
} forEach call EFUNC(common,getSelectedUnits);
},
{toUpper unitPos _entity},
{alive _entity && {_entity isKindOf "CAManBase"}}
{GVAR(enableStance) && {alive _entity} && {_entity isKindOf "CAManBase"}}
] call FUNC(addAttribute);

[
Expand All @@ -140,7 +140,7 @@
} forEach call EFUNC(common,getSelectedVehicles);
},
{locked _entity},
{alive _entity && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
{GVAR(enableVehicleLock) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
] call FUNC(addAttribute);

[
Expand All @@ -157,7 +157,7 @@
} forEach call EFUNC(common,getSelectedVehicles);
},
{isEngineOn _entity},
{alive _entity && {getNumber (configOf _entity >> "fuelCapacity") > 0} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
{GVAR(enableEngine) && {alive _entity} && {getNumber (configOf _entity >> "fuelCapacity") > 0} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
] call FUNC(addAttribute);

[
Expand All @@ -182,7 +182,7 @@
} forEach call EFUNC(common,getSelectedVehicles);
},
{isLightOn _entity},
{alive _entity && {"true" configClasses (configOf _entity >> "Reflectors") isNotEqualTo []} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
{GVAR(enableLights) && {alive _entity} && {"true" configClasses (configOf _entity >> "Reflectors") isNotEqualTo []} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
] call FUNC(addAttribute);

[
Expand All @@ -195,7 +195,7 @@
[_buildings, _value] call EFUNC(building_markers,set);
},
{_entity getVariable [QEGVAR(building_markers,marker), ""] != ""},
{_entity isKindOf "Building"}
{GVAR(enableBuildingMarker) && _entity isKindOf "Building"}
] call FUNC(addAttribute);

[
Expand All @@ -207,7 +207,7 @@
[QEGVAR(common,setPlateNumber), [_entity, _value], _entity] call CBA_fnc_targetEvent;
},
{getPlateNumber _entity},
{alive _entity && {getText (configOf _entity >> "PlateInfos" >> "name") in selectionNames _entity}}
{GVAR(enablePlateNumber) && {alive _entity} && {getText (configOf _entity >> "PlateInfos" >> "name") in selectionNames _entity}}
] call FUNC(addAttribute);

[
Expand Down Expand Up @@ -249,7 +249,7 @@
{
_entity getVariable [QGVAR(respawnPos), []] param [0, sideEmpty]
},
{alive _entity && {canMove _entity} && {_entity isKindOf "AllVehicles"} && {!(_entity isKindOf "Animal")}}
{GVAR(enableRespawn) && {alive _entity} && {canMove _entity} && {_entity isKindOf "AllVehicles"} && {!(_entity isKindOf "Animal")}}
] call FUNC(addAttribute);

[
Expand Down Expand Up @@ -298,7 +298,7 @@

_respawnID
},
{_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}
{GVAR(enableRespawn) && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}
] call FUNC(addAttribute);

[
Expand All @@ -322,7 +322,8 @@
},
{
[isDamageAllowed _entity, simulationEnabled _entity, !isObjectHidden _entity]
}
},
{GVAR(enableStates)}
] call FUNC(addAttribute);

[
Expand All @@ -348,7 +349,7 @@
};
},
{""},
{IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}
{GVAR(enableDebugConsole) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}}
] call FUNC(addAttribute);

// - Group --------------------------------------------------------------------
Expand All @@ -361,7 +362,8 @@
QGVAR(edit),
nil,
{_entity setGroupIdGlobal [_value]},
{groupID _entity}
{groupID _entity},
{GVAR(enableGroupID)}
] call FUNC(addAttribute);

[
Expand All @@ -376,7 +378,8 @@
} forEach units _x;
} forEach SELECTED_GROUPS;
},
{skill leader _entity}
{skill leader _entity},
{GVAR(enableGroupSkill)}
] call FUNC(addAttribute);

[
Expand All @@ -399,7 +402,8 @@
[QEGVAR(common,setFormation), [_x, _value], _x] call CBA_fnc_targetEvent;
} forEach SELECTED_GROUPS;
},
{formation _entity}
{formation _entity},
{GVAR(enableGroupFormation)}
] call FUNC(addAttribute);

[
Expand All @@ -418,7 +422,8 @@
[QEGVAR(common,setBehaviour), [_x, _value], _x] call CBA_fnc_targetEvent;
} forEach SELECTED_GROUPS;
},
{behaviour leader _entity}
{behaviour leader _entity},
{GVAR(enableGroupBehaviour)}
] call FUNC(addAttribute);

[
Expand All @@ -437,7 +442,8 @@
[QEGVAR(common,setCombatMode), [_x, _value], _x] call CBA_fnc_targetEvent;
} forEach SELECTED_GROUPS;
},
{combatMode _entity}
{combatMode _entity},
{GVAR(enableGroupCombatMode)}
] call FUNC(addAttribute);

[
Expand All @@ -454,7 +460,8 @@
[QEGVAR(common,setSpeedMode), [_x, _value], _x] call CBA_fnc_targetEvent;
} forEach SELECTED_GROUPS;
},
{speedMode _entity}
{speedMode _entity},
{GVAR(enableGroupSpeed)}
] call FUNC(addAttribute);

[
Expand All @@ -474,7 +481,8 @@
} forEach units _x;
} forEach SELECTED_GROUPS;
},
{toUpper unitPos leader _entity}
{toUpper unitPos leader _entity},
{GVAR(enableGroupStance)}
] call FUNC(addAttribute);

[
Expand All @@ -500,7 +508,7 @@
};
},
{""},
{IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}
{GVAR(enableDebugConsole) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}}
] call FUNC(addAttribute);

// - Waypoint -----------------------------------------------------------------
Expand All @@ -518,7 +526,8 @@
_x setWaypointType _type;
if (_type == "SCRIPTED") then {_x setWaypointScript _script};
} forEach SELECTED_WAYPOINTS;
}
},
{GVAR(enableWpName)}
] call FUNC(addAttribute);

[
Expand Down
Loading