mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Update common event names to meet new standard
This commit is contained in:
parent
5b8fa4d4f1
commit
9e4fd77745
@ -23,7 +23,6 @@ class ACE_Extensions {
|
|||||||
};
|
};
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
};
|
};
|
@ -21,12 +21,10 @@ class CfgPatches {
|
|||||||
#include "CfgEden.hpp"
|
#include "CfgEden.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
medical_onUnconscious = "ace_unconscious";
|
medical_onUnconscious = "ace_unconscious";
|
||||||
SetSurrendered = QGVAR(setSurrendered);
|
SetSurrendered = QGVAR(setSurrendered);
|
||||||
SetHandcuffed = QGVAR(setHandcuffed);
|
SetHandcuffed = QGVAR(setHandcuffed);
|
||||||
MoveOutCaptive = QGVAR(moveOutCaptive);
|
MoveOutCaptive = QGVAR(moveOutCaptive);
|
||||||
MoveInCaptive = QGVAR(moveInCaptive);
|
MoveInCaptive = QGVAR(moveInCaptive);
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
CaptiveStatusChanged = "ace_captiveStatusChanged";
|
CaptiveStatusChanged = "ace_captiveStatusChanged";
|
||||||
};
|
};
|
||||||
|
@ -26,6 +26,5 @@ class ACE_newEvents {
|
|||||||
AddCargoByClass = "ace_addCargoByClass";
|
AddCargoByClass = "ace_addCargoByClass";
|
||||||
ServerUnloadCargo = QGVAR(serverUnload);
|
ServerUnloadCargo = QGVAR(serverUnload);
|
||||||
UnloadCargo = "ace_unloadCargo";
|
UnloadCargo = "ace_unloadCargo";
|
||||||
hideObjectGlobal = "ace_hideObjectGlobal";
|
|
||||||
cargoAddedByClass = "ace_cargoAddedByClass";
|
cargoAddedByClass = "ace_cargoAddedByClass";
|
||||||
};
|
};
|
||||||
|
@ -35,7 +35,7 @@ _vehicle setVariable [QGVAR(space), _space - _itemSize, true];
|
|||||||
if (_item isEqualType objNull) then {
|
if (_item isEqualType objNull) then {
|
||||||
detach _item;
|
detach _item;
|
||||||
_item attachTo [_vehicle,[0,0,-100]];
|
_item attachTo [_vehicle,[0,0,-100]];
|
||||||
["ace_hideObjectGlobal", [_item, true]] call CBA_fnc_serverEvent;
|
[QEGVAR(common,hideObjectGlobal), [_item, true]] call CBA_fnc_serverEvent;
|
||||||
};
|
};
|
||||||
|
|
||||||
true
|
true
|
||||||
|
@ -89,7 +89,7 @@ if (isServer) then {
|
|||||||
|
|
||||||
|
|
||||||
// Event to log Fix Headbug output
|
// Event to log Fix Headbug output
|
||||||
["HeadbugFixUsed", {
|
[QGVAR(headbugFixUsed), {
|
||||||
params ["_profileName", "_animation"];
|
params ["_profileName", "_animation"];
|
||||||
ACE_LOGINFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation);
|
ACE_LOGINFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation);
|
||||||
}] call CBA_fnc_addEventHandler;
|
}] call CBA_fnc_addEventHandler;
|
||||||
@ -129,8 +129,8 @@ if (isServer) then {
|
|||||||
[QGVAR(systemChatGlobal), {systemChat _this}] call CBA_fnc_addEventHandler;
|
[QGVAR(systemChatGlobal), {systemChat _this}] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
if (isServer) then {
|
if (isServer) then {
|
||||||
["ace_hideObjectGlobal", {(_this select 0) hideObjectGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
|
[QGVAR(hideObjectGlobal), {(_this select 0) hideObjectGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
|
||||||
["ace_enableSimulationGlobal", {(_this select 0) enableSimulationGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
|
[QGVAR(enableSimulationGlobal), {(_this select 0) enableSimulationGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
|
||||||
["ace_setOwner", {(_this select 0) setOwner (_this select 1)}] call CBA_fnc_addEventHandler;
|
["ace_setOwner", {(_this select 0) setOwner (_this select 1)}] call CBA_fnc_addEventHandler;
|
||||||
[QGVAR(serverLog), FUNC(serverLog)] call CBA_fnc_addEventHandler;
|
[QGVAR(serverLog), FUNC(serverLog)] call CBA_fnc_addEventHandler;
|
||||||
};
|
};
|
||||||
@ -143,16 +143,16 @@ if (isServer) then {
|
|||||||
// Synced ACE events
|
// Synced ACE events
|
||||||
// Handle JIP scenario
|
// Handle JIP scenario
|
||||||
if (!isServer) then {
|
if (!isServer) then {
|
||||||
["PlayerJip", {
|
["ace_playerJIP", {
|
||||||
ACE_LOGINFO("JIP event synchronization initialized");
|
ACE_LOGINFO("JIP event synchronization initialized");
|
||||||
["ace_SEH_all", [player]] call CBA_fnc_serverEvent;
|
[QGVAR(SEH_all), [player]] call CBA_fnc_serverEvent;
|
||||||
}] call CBA_fnc_addEventHandler;
|
}] call CBA_fnc_addEventHandler;
|
||||||
} else {
|
} else {
|
||||||
["ace_SEH_all", FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
|
[QGVAR(SEH_all), FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
|
||||||
};
|
};
|
||||||
|
|
||||||
["ace_SEH", FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
|
[QGVAR(SEH), FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
|
||||||
["ace_SEH_s", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
|
[QGVAR(SEH_s), FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
if (isServer) then {
|
if (isServer) then {
|
||||||
[FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
|
[FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
|
||||||
@ -221,7 +221,7 @@ call FUNC(checkFiles);
|
|||||||
[] call FUNC(readSettingsFromParamsArray);
|
[] call FUNC(readSettingsFromParamsArray);
|
||||||
};
|
};
|
||||||
// Event so that ACE_Modules have their settings loaded:
|
// Event so that ACE_Modules have their settings loaded:
|
||||||
["ace_initSettingsFromModules", []] call CBA_fnc_localEvent;
|
[QGVAR(initSettingsFromModules), []] call CBA_fnc_localEvent;
|
||||||
|
|
||||||
if (isServer) then {
|
if (isServer) then {
|
||||||
// Publish all settings data after all configs and modules are read
|
// Publish all settings data after all configs and modules are read
|
||||||
@ -284,7 +284,7 @@ enableCamShake true;
|
|||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
|
|
||||||
// Set the name for the current player
|
// Set the name for the current player
|
||||||
["playerChanged", {
|
["ace_playerChanged", {
|
||||||
params ["_newPlayer","_oldPlayer"];
|
params ["_newPlayer","_oldPlayer"];
|
||||||
|
|
||||||
if (alive _newPlayer) then {
|
if (alive _newPlayer) then {
|
||||||
@ -475,7 +475,7 @@ if (didJip) then {
|
|||||||
// We are jipping! Get ready and wait, and throw the event
|
// We are jipping! Get ready and wait, and throw the event
|
||||||
[{
|
[{
|
||||||
if(!isNull player && GVAR(settingsInitFinished)) then {
|
if(!isNull player && GVAR(settingsInitFinished)) then {
|
||||||
["ace_playerJip", [player]] call CBA_fnc_localEvent;
|
["ace_playerJIP", [player]] call CBA_fnc_localEvent;
|
||||||
[_this select 1] call CBA_fnc_removePerFrameHandler;
|
[_this select 1] call CBA_fnc_removePerFrameHandler;
|
||||||
};
|
};
|
||||||
}, 0, []] call CBA_fnc_addPerFrameHandler;
|
}, 0, []] call CBA_fnc_addPerFrameHandler;
|
||||||
|
@ -21,9 +21,7 @@ class ACE_newEvents {
|
|||||||
blockDamage = QGVAR(blockDamage);
|
blockDamage = QGVAR(blockDamage);
|
||||||
blockEngine = QGVAR(blockEngine);
|
blockEngine = QGVAR(blockEngine);
|
||||||
|
|
||||||
useItem = "ace_useItem";
|
PlayerJip = "ace_playerJIP";
|
||||||
displayTextPicture = "ace_displayTextPicture";
|
|
||||||
displayTextStructured = "ace_displayTextStructured";
|
|
||||||
activeCameraChanged = "ace_activeCameraChanged";
|
activeCameraChanged = "ace_activeCameraChanged";
|
||||||
visibleMapChanged = "ace_visibleMapChanged";
|
visibleMapChanged = "ace_visibleMapChanged";
|
||||||
cameraViewChanged = "ace_cameraViewChanged";
|
cameraViewChanged = "ace_cameraViewChanged";
|
||||||
@ -34,12 +32,19 @@ class ACE_newEvents {
|
|||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
playerVehicleChanged = "ace_playerVehicleChanged";
|
||||||
playerChanged = "ace_playerChanged";
|
playerChanged = "ace_playerChanged";
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
SettingsInitialized = "ace_settingsInitialized";
|
||||||
InitSettingsFromModules = "ace_initSettingsFromModules";
|
|
||||||
SEH_s = "ace_SEH_s";
|
SEH_s = QGVAR(SEH_s);
|
||||||
SEH = "ace_SEH";
|
SEH = QGVAR(SEH);
|
||||||
SEH_all = "ace_SEH_all";
|
SEH_all = QGVAR(SEH_all);
|
||||||
enableSimulationGlobal = "ace_enableSimulationGlobal";
|
setStatusEffect = QGVAR(setStatusEffect);
|
||||||
hideObjectGlobal = "ace_hideObjectGlobal";
|
HeadbugFixUsed = QGVAR(headbugFixUsed);
|
||||||
|
InitSettingsFromModules = QGVAR(initSettingsFromModules);
|
||||||
|
enableSimulationGlobal = QGVAR(enableSimulationGlobal);
|
||||||
|
hideObjectGlobal = QGVAR(hideObjectGlobal);
|
||||||
|
|
||||||
|
useItem = "ace_useItem";
|
||||||
|
displayTextPicture = "ace_displayTextPicture";
|
||||||
|
displayTextStructured = "ace_displayTextStructured";
|
||||||
setVanillaHitPointDamage = "ace_setVanillaHitPointDamage";
|
setVanillaHitPointDamage = "ace_setVanillaHitPointDamage";
|
||||||
setVectorDirAndUp = "ace_setVectorDirAndUp";
|
setVectorDirAndUp = "ace_setVectorDirAndUp";
|
||||||
switchMove = "ace_switchMove";
|
switchMove = "ace_switchMove";
|
||||||
@ -56,10 +61,7 @@ class ACE_newEvents {
|
|||||||
fixPosition = "ace_fixPosition";
|
fixPosition = "ace_fixPosition";
|
||||||
fixFloating = "ace_fixFloating";
|
fixFloating = "ace_fixFloating";
|
||||||
fixCollision = "ace_fixCollision";
|
fixCollision = "ace_fixCollision";
|
||||||
setStatusEffect = QGVAR(setStatusEffect);
|
|
||||||
SettingChanged = "ace_settingChanged";
|
SettingChanged = "ace_settingChanged";
|
||||||
HeadbugFixUsed = "ace_headbugFixUsed";
|
|
||||||
blockDamage = "ace_blockDamage";
|
|
||||||
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
|
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
|
||||||
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
|
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
|
||||||
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
||||||
|
@ -18,7 +18,7 @@ params ["_client"];
|
|||||||
private _eventEntry = HASH_GET(GVAR(syncedEvents),_x);
|
private _eventEntry = HASH_GET(GVAR(syncedEvents),_x);
|
||||||
_eventEntry params ["", "_eventLog"];
|
_eventEntry params ["", "_eventLog"];
|
||||||
|
|
||||||
["ace_SEH_s", [_x, _eventLog], _client] call CBA_fnc_targetEvent;
|
[QGVAR(SEH_s), [_x, _eventLog], _client] call CBA_fnc_targetEvent;
|
||||||
false
|
false
|
||||||
} count (GVAR(syncedEvents) select 0);
|
} count (GVAR(syncedEvents) select 0);
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ if (isServer) then {
|
|||||||
private _eventEntry = HASH_GET(GVAR(syncedEvents),_eventName);
|
private _eventEntry = HASH_GET(GVAR(syncedEvents),_eventName);
|
||||||
_eventEntry params ["", "_eventLog"];
|
_eventEntry params ["", "_eventLog"];
|
||||||
|
|
||||||
["ace_SEH_s", [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
|
[QGVAR(SEH_s), [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
|
||||||
} else {
|
} else {
|
||||||
params ["_eventName", "_eventLog"];
|
params ["_eventName", "_eventLog"];
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
private _unit = ACE_player;
|
private _unit = ACE_player;
|
||||||
private _anim = animationState _unit;
|
private _anim = animationState _unit;
|
||||||
|
|
||||||
["ace_headbugFixUsed", [profileName, _anim]] call CBA_fnc_serverEvent;
|
[QGVAR(headbugFixUsed), [profileName, _anim]] call CBA_fnc_serverEvent;
|
||||||
["ace_headbugFixUsed", [profileName, _anim]] call CBA_fnc_localEvent;
|
[QGVAR(headbugFixUsed), [profileName, _anim]] call CBA_fnc_localEvent;
|
||||||
|
|
||||||
if (_unit != vehicle _unit || {!([_unit, objNull, ["isNotSitting"]] call FUNC(canInteractWith))}) exitWith {false};
|
if (_unit != vehicle _unit || {!([_unit, objNull, ["isNotSitting"]] call FUNC(canInteractWith))}) exitWith {false};
|
||||||
|
|
||||||
|
@ -28,5 +28,5 @@ if !(_reason in _setHiddenReasons) then {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if !(isObjectHidden _unit) then {
|
if !(isObjectHidden _unit) then {
|
||||||
["ace_hideObjectGlobal", [_unit, true]] call CBA_fnc_serverEvent;
|
[QGVAR(hideObjectGlobal), [_unit, true]] call CBA_fnc_serverEvent;
|
||||||
};
|
};
|
||||||
|
@ -17,4 +17,4 @@ params ["_eventName"];
|
|||||||
// Only JIP machines on initialization send this off, requesting sync on events with the serverCommand
|
// Only JIP machines on initialization send this off, requesting sync on events with the serverCommand
|
||||||
if (isServer) exitWith {false};
|
if (isServer) exitWith {false};
|
||||||
|
|
||||||
["ace_SEH_s", [_eventName, ACE_player]] call CBA_fnc_serverEvent;
|
[QGVAR(SEH_s), [_eventName, ACE_player]] call CBA_fnc_serverEvent;
|
||||||
|
@ -23,4 +23,4 @@ if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith {
|
|||||||
|
|
||||||
private _eventData = [_name, _args, _ttl];
|
private _eventData = [_name, _args, _ttl];
|
||||||
|
|
||||||
["ace_SEH", _eventData] call CBA_fnc_globalEvent;
|
[QGVAR(SEH), _eventData] call CBA_fnc_globalEvent;
|
||||||
|
@ -28,5 +28,5 @@ if (_reason in _setHiddenReasons) then {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (_setHiddenReasons isEqualTo []) then {
|
if (_setHiddenReasons isEqualTo []) then {
|
||||||
["ace_hideObjectGlobal", [_unit,false]] call CBA_fnc_serverEvent;
|
[QGVAR(hideObjectGlobal), [_unit,false]] call CBA_fnc_serverEvent;
|
||||||
};
|
};
|
||||||
|
@ -19,7 +19,6 @@ class CfgPatches {
|
|||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
firedNonPlayer = "ace_firedNonPlayer";
|
firedNonPlayer = "ace_firedNonPlayer";
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
};
|
};
|
@ -19,9 +19,6 @@ class CfgPatches {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
medical_onUnconscious = "ace_unconscious";
|
medical_onUnconscious = "ace_unconscious";
|
||||||
playerWeaponChanged = "ace_playerWeaponChanged";
|
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
setDir = "ace_setDir";
|
setDir = "ace_setDir";
|
||||||
fixFloating = "ace_fixFloating";
|
fixFloating = "ace_fixFloating";
|
||||||
fixPosition = "ace_fixPosition";
|
fixPosition = "ace_fixPosition";
|
||||||
|
@ -17,7 +17,3 @@ class CfgPatches {
|
|||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
#include "CfgEventHandlers.hpp"
|
#include "CfgEventHandlers.hpp"
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
|
@ -16,7 +16,6 @@ class CfgPatches {
|
|||||||
#include "CfgAmmo.hpp"
|
#include "CfgAmmo.hpp"
|
||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
|
firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
|
||||||
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
|
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
|
||||||
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
||||||
|
@ -17,7 +17,3 @@ class CfgPatches {
|
|||||||
#include "CfgEventHandlers.hpp"
|
#include "CfgEventHandlers.hpp"
|
||||||
#include "CfgWeapons.hpp"
|
#include "CfgWeapons.hpp"
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
|
@ -271,10 +271,7 @@ class CfgCloudlets {
|
|||||||
};
|
};
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
activeCameraChanged = "ace_activeCameraChanged";
|
|
||||||
cameraViewChanged = "ace_cameraViewChanged";
|
|
||||||
GlassesChanged = "ace_glassesChanged";
|
GlassesChanged = "ace_glassesChanged";
|
||||||
GlassesCracked = "ace_glassesCracked";
|
GlassesCracked = "ace_glassesCracked";
|
||||||
};
|
};
|
||||||
|
@ -28,8 +28,8 @@ GVAR(volumeAttenuation) = 1;
|
|||||||
[FUNC(updateVolume), 1, [false]] call CBA_fnc_addPerFrameHandler;
|
[FUNC(updateVolume), 1, [false]] call CBA_fnc_addPerFrameHandler;
|
||||||
|
|
||||||
// Update veh attunation when player veh changes
|
// Update veh attunation when player veh changes
|
||||||
["ace_playerVehicleChanged", {_this call FUNC(updatePlayerVehAttenuation);}] call CBA_fnc_addEventHandler;
|
["ace_playerVehicleChanged", FUNC(updatePlayerVehAttenuation)] call CBA_fnc_addEventHandler;
|
||||||
["ace_playerTurretChanged", {_this call FUNC(updatePlayerVehAttenuation);}] call CBA_fnc_addEventHandler;
|
["ace_playerTurretChanged", FUNC(updatePlayerVehAttenuation)] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
// Reset deafness on respawn (or remote control player switch)
|
// Reset deafness on respawn (or remote control player switch)
|
||||||
["ace_playerChanged", {
|
["ace_playerChanged", {
|
||||||
|
@ -14,20 +14,8 @@ class CfgPatches {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#include "CfgEventHandlers.hpp"
|
#include "CfgEventHandlers.hpp"
|
||||||
|
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
#include "CfgSounds.hpp"
|
#include "CfgSounds.hpp"
|
||||||
|
|
||||||
#include "CfgWeapons.hpp"
|
#include "CfgWeapons.hpp"
|
||||||
|
|
||||||
#include "CfgAmmo.hpp"
|
#include "CfgAmmo.hpp"
|
||||||
|
|
||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
playerTurretChanged = "ace_playerTurretChanged";
|
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
};
|
|
||||||
|
@ -27,7 +27,6 @@ class ACE_Extensions {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingChanged = "ace_settingChanged";
|
SettingChanged = "ace_settingChanged";
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
interactMenuOpened = "ace_interactMenuOpened";
|
interactMenuOpened = "ace_interactMenuOpened";
|
||||||
clearConditionCaches = QGVAR(clearConditionCaches);
|
clearConditionCaches = QGVAR(clearConditionCaches);
|
||||||
interactMenuClosed = "ace_interactMenuClosed";
|
interactMenuClosed = "ace_interactMenuClosed";
|
||||||
|
@ -21,6 +21,5 @@ class CfgPatches {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
GunLightOff = "ace_gunLightOff";
|
GunLightOff = "ace_gunLightOff";
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
SetHandcuffed = QEGVAR(captives,setHandcuffed);
|
SetHandcuffed = QEGVAR(captives,setHandcuffed);
|
||||||
};
|
};
|
@ -164,7 +164,3 @@ class RscDisplayServerGetReady: RscDisplayGetReady {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
visibleMapChanged = "ace_visibleMapChanged";
|
|
||||||
};
|
|
||||||
|
@ -16,7 +16,3 @@ class CfgPatches {
|
|||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
#include "CfgEventHandlers.hpp"
|
#include "CfgEventHandlers.hpp"
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
|
@ -29,7 +29,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
|
|||||||
[QGVAR(actionPlaceInBodyBag), FUNC(actionPlaceInBodyBag)] call CBA_fnc_addEventHandler;
|
[QGVAR(actionPlaceInBodyBag), FUNC(actionPlaceInBodyBag)] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
//Handle Deleting Bodies on Server:
|
//Handle Deleting Bodies on Server:
|
||||||
if (isServer) then {["ace_playedInBodyBag", FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;};
|
if (isServer) then {["ace_placedInBodyBag", FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;};
|
||||||
|
|
||||||
["ace_unconscious", {
|
["ace_unconscious", {
|
||||||
params ["_unit", "_status"];
|
params ["_unit", "_status"];
|
||||||
@ -295,7 +295,7 @@ GVAR(lastHeartBeatSound) = CBA_missionTime;
|
|||||||
["ace_playerInventoryChanged", FUNC(itemCheck)] call CBA_fnc_addEventHandler;
|
["ace_playerInventoryChanged", FUNC(itemCheck)] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
if (hasInterface) then {
|
if (hasInterface) then {
|
||||||
["PlayerJip", {
|
["ace_playerJIP", {
|
||||||
ACE_LOGINFO("JIP Medical init for player.");
|
ACE_LOGINFO("JIP Medical init for player.");
|
||||||
[player] call FUNC(init);
|
[player] call FUNC(init);
|
||||||
}] call CBA_fnc_addEventHandler;
|
}] call CBA_fnc_addEventHandler;
|
||||||
|
@ -33,7 +33,7 @@ class ACE_newEvents {
|
|||||||
Medical_onItemAddedToTriageCard = "ace_itemAddedToTriageCard";
|
Medical_onItemAddedToTriageCard = "ace_itemAddedToTriageCard";
|
||||||
medical_onLogEntryAdded = "ace_medicalLogEntryAdded";
|
medical_onLogEntryAdded = "ace_medicalLogEntryAdded";
|
||||||
Medical_onHeartRateAdjustmentAdded = "ace_addedHeartRateAdjustment";
|
Medical_onHeartRateAdjustmentAdded = "ace_addedHeartRateAdjustment";
|
||||||
placedInBodyBag = "ace_playedInBodyBag";
|
placedInBodyBag = "ace_placedInBodyBag";
|
||||||
actionPlaceInBodyBag = QGVAR(actionPlaceInBodyBag);
|
actionPlaceInBodyBag = QGVAR(actionPlaceInBodyBag);
|
||||||
treatmentTourniquetLocal = QGVAR(treatmentTourniquetLocal);
|
treatmentTourniquetLocal = QGVAR(treatmentTourniquetLocal);
|
||||||
treatmentIVLocal = QGVAR(treatmentIVLocal);
|
treatmentIVLocal = QGVAR(treatmentIVLocal);
|
||||||
|
@ -47,6 +47,6 @@ private _bodyBag = createVehicle ["ACE_bodyBagObject", _position, [], 0, ""];
|
|||||||
_bodyBag setPosASL _position;
|
_bodyBag setPosASL _position;
|
||||||
_bodyBag setDir _direction;
|
_bodyBag setDir _direction;
|
||||||
|
|
||||||
["ace_playedInBodyBag", [_target, _bodyBag]] call CBA_fnc_globalEvent; //hide and delete body on server
|
["ace_placedInBodyBag", [_target, _bodyBag]] call CBA_fnc_globalEvent; //hide and delete body on server
|
||||||
|
|
||||||
_bodyBag
|
_bodyBag
|
||||||
|
@ -21,7 +21,7 @@ params ["_target"];
|
|||||||
TRACE_2("",_target,isPlayer _target);
|
TRACE_2("",_target,isPlayer _target);
|
||||||
|
|
||||||
//Hide the body globaly
|
//Hide the body globaly
|
||||||
["ace_hideObjectGlobal", [_target, true]] call CBA_fnc_serverEvent;
|
[QEGVAR(common,hideObjectGlobal), [_target, true]] call CBA_fnc_serverEvent;
|
||||||
|
|
||||||
if (isNil QGVAR(bodiesToDelete)) then {GVAR(bodiesToDelete) = [];};
|
if (isNil QGVAR(bodiesToDelete)) then {GVAR(bodiesToDelete) = [];};
|
||||||
GVAR(bodiesToDelete) pushBack _target;
|
GVAR(bodiesToDelete) pushBack _target;
|
||||||
|
@ -19,5 +19,5 @@
|
|||||||
|
|
||||||
if (!hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
["ace_playerVehicleChanged", {_this call FUNC(handlePlayerVehicleChanged);}] call CBA_fnc_addEventHandler;
|
["ace_playerVehicleChanged", FUNC(handlePlayerVehicleChanged)] call CBA_fnc_addEventHandler;
|
||||||
["ace_infoDisplayChanged", {_this call FUNC(turretDisplayLoaded);}] call CBA_fnc_addEventHandler;
|
["ace_infoDisplayChanged", FUNC(turretDisplayLoaded)] call CBA_fnc_addEventHandler;
|
||||||
|
@ -36,6 +36,5 @@ class RscStructuredText;
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
infoDisplayChanged = "ace_infoDisplayChanged";
|
infoDisplayChanged = "ace_infoDisplayChanged";
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
initMortar = "ace_initMortar";
|
initMortar = "ace_initMortar";
|
||||||
};
|
};
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
["ace_initSettingsFromModules", {
|
[QEGVAR(common,initSettingsFromModules), {
|
||||||
// TODO This is a basic and limited implementation that mimics some of the functionality from the A3 module framework, but not all of it.
|
// TODO This is a basic and limited implementation that mimics some of the functionality from the A3 module framework, but not all of it.
|
||||||
// We have to execute this in the postInit XEH because on object init, the parameters of the modules are not yet available. They are if we execute it at the start of postInit execution.
|
// We have to execute this in the postInit XEH because on object init, the parameters of the modules are not yet available. They are if we execute it at the start of postInit execution.
|
||||||
|
|
||||||
|
@ -27,7 +27,3 @@ class CfgVehicles {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#include "CfgEventHandlers.hpp"
|
#include "CfgEventHandlers.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
InitSettingsFromModules = "ace_initSettingsFromModules";
|
|
||||||
};
|
|
||||||
|
@ -19,8 +19,3 @@ class CfgPatches {
|
|||||||
#include "CfgMoves.hpp"
|
#include "CfgMoves.hpp"
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
};
|
|
@ -18,7 +18,3 @@ class CfgPatches {
|
|||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
#include <RscTitles.hpp>
|
#include <RscTitles.hpp>
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
|
@ -19,10 +19,6 @@ class CfgPatches {
|
|||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
playerVisionModeChanged = "ace_playerVisionModeChanged";
|
|
||||||
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
playerTurretChanged = "ace_playerTurretChanged";
|
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
};
|
};
|
@ -11,7 +11,7 @@ if (isServer) then {
|
|||||||
if (!hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// mutes/unmutes units when the player changes
|
// mutes/unmutes units when the player changes
|
||||||
["playerChanged", {
|
["ace_playerChanged", {
|
||||||
params ["_newPlayer", "_oldPlayer"];
|
params ["_newPlayer", "_oldPlayer"];
|
||||||
|
|
||||||
// mute the new player
|
// mute the new player
|
||||||
|
@ -40,7 +40,3 @@ class CfgCommands {
|
|||||||
"http://ace3mod.com/version.html"
|
"http://ace3mod.com/version.html"
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
|
@ -52,7 +52,6 @@ class CfgGesturesMale {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
|
initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
|
||||||
showWeaponTemperature = QGVAR(showWeaponTemperature);
|
showWeaponTemperature = QGVAR(showWeaponTemperature);
|
||||||
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
||||||
|
@ -19,7 +19,5 @@ class CfgPatches {
|
|||||||
#include "RscTitles.hpp"
|
#include "RscTitles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
infoDisplayChanged = "ace_infoDisplayChanged";
|
infoDisplayChanged = "ace_infoDisplayChanged";
|
||||||
};
|
};
|
@ -21,6 +21,5 @@ class CfgPatches {
|
|||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
medical_onUnconscious = "ace_unconscious";
|
medical_onUnconscious = "ace_unconscious";
|
||||||
};
|
};
|
||||||
|
@ -20,8 +20,6 @@ class CfgPatches {
|
|||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
rallypointMoved = "ace_rallypointMoved";
|
rallypointMoved = "ace_rallypointMoved";
|
||||||
killedByFriendly = "ace_killedByFriendly";
|
killedByFriendly = "ace_killedByFriendly";
|
||||||
};
|
};
|
||||||
|
@ -19,9 +19,5 @@ class CfgPatches {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
medical_onUnconscious = "ace_unconscious";
|
medical_onUnconscious = "ace_unconscious";
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
interactMenuOpened = "ace_interactMenuOpened";
|
interactMenuOpened = "ace_interactMenuOpened";
|
||||||
enableSimulationGlobal = "ace_enableSimulationGlobal";
|
|
||||||
};
|
};
|
||||||
|
@ -27,7 +27,7 @@ _sandBag = createVehicle ["ACE_SandbagObject_NoGeo", [0, 0, 0], [], 0, "NONE"];
|
|||||||
GVAR(sandBag) = _sandBag;
|
GVAR(sandBag) = _sandBag;
|
||||||
|
|
||||||
// prevent collisions with sandbag
|
// prevent collisions with sandbag
|
||||||
["ace_enableSimulationGlobal", [_sandBag, false]] call CBA_fnc_serverEvent;
|
[QEGVAR(common,enableSimulationGlobal), [_sandBag, false]] call CBA_fnc_serverEvent;
|
||||||
|
|
||||||
GVAR(deployDirection) = 0;
|
GVAR(deployDirection) = 0;
|
||||||
|
|
||||||
|
@ -24,8 +24,6 @@ class CfgPatches {
|
|||||||
#include "RscTitles.hpp"
|
#include "RscTitles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
cameraViewChanged = "ace_cameraViewChanged";
|
|
||||||
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
};
|
};
|
||||||
|
@ -19,7 +19,6 @@ class CfgPatches {
|
|||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
SetHandcuffed = QEGVAR(captives,setHandcuffed);
|
SetHandcuffed = QEGVAR(captives,setHandcuffed);
|
||||||
medical_onUnconscious = "ace_unconscious";
|
medical_onUnconscious = "ace_unconscious";
|
||||||
};
|
};
|
@ -19,6 +19,4 @@ class CfgPatches {
|
|||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
interactMenuOpened = "ace_interactMenuOpened";
|
interactMenuOpened = "ace_interactMenuOpened";
|
||||||
medical_onUnconscious = "ace_unconscious";
|
medical_onUnconscious = "ace_unconscious";
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
};
|
};
|
||||||
|
@ -19,9 +19,5 @@ class CfgPatches {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
medical_onUnconscious = "ace_unconscious";
|
medical_onUnconscious = "ace_unconscious";
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
playerInventoryChanged = "ace_playerInventoryChanged";
|
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
interactMenuOpened = "ace_interactMenuOpened";
|
interactMenuOpened = "ace_interactMenuOpened";
|
||||||
enableSimulationGlobal = "ace_enableSimulationGlobal";
|
|
||||||
};
|
};
|
||||||
|
@ -36,7 +36,7 @@ _trench = createVehicle [_noGeoModel, [0, 0, 0], [], 0, "NONE"];
|
|||||||
GVAR(trench) = _trench;
|
GVAR(trench) = _trench;
|
||||||
|
|
||||||
// prevent collisions with trench
|
// prevent collisions with trench
|
||||||
["ace_enableSimulationGlobal", [_trench, false]] call CBA_fnc_serverEvent;
|
[QEGVAR(common,enableSimulationGlobal), [_trench, false]] call CBA_fnc_serverEvent;
|
||||||
|
|
||||||
GVAR(digDirection) = 0;
|
GVAR(digDirection) = 0;
|
||||||
|
|
||||||
|
@ -19,7 +19,5 @@ class CfgPatches {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
medical_onUnconscious = "ace_unconscious";
|
medical_onUnconscious = "ace_unconscious";
|
||||||
playerVehicleChanged = "ace_playerVehicleChanged";
|
|
||||||
playerChanged = "ace_playerChanged";
|
|
||||||
interactMenuOpened = "ace_interactMenuOpened";
|
interactMenuOpened = "ace_interactMenuOpened";
|
||||||
};
|
};
|
||||||
|
@ -20,7 +20,3 @@ class CfgPatches {
|
|||||||
|
|
||||||
#include "RscChat.hpp"
|
#include "RscChat.hpp"
|
||||||
#include "RscVignette.hpp"
|
#include "RscVignette.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
|
||||||
|
@ -21,7 +21,6 @@ class CfgPatches {
|
|||||||
#include "CfgWeapons.hpp"
|
#include "CfgWeapons.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
VehicleLock_SetVehicleLock = QGVAR(setVehicleLock);
|
VehicleLock_SetVehicleLock = QGVAR(setVehicleLock);
|
||||||
VehicleLock_SetupCustomKey = QGVAR(setupCustomKey);
|
VehicleLock_SetupCustomKey = QGVAR(setupCustomKey);
|
||||||
};
|
};
|
||||||
|
@ -16,7 +16,3 @@ class CfgPatches {
|
|||||||
#include "CfgEventHandlers.hpp"
|
#include "CfgEventHandlers.hpp"
|
||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
|
||||||
|
@ -18,5 +18,4 @@ class CfgPatches {
|
|||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
firedPlayer = "ace_firedPlayer";
|
firedPlayer = "ace_firedPlayer";
|
||||||
displayTextPicture = "ace_displayTextPicture";
|
|
||||||
};
|
};
|
||||||
|
@ -26,4 +26,4 @@ private _name = getText (configFile >> "CfgMagazines" >> _magazine >> "displayNa
|
|||||||
private _text = [format ["%1 x%2", _name, _numberofGrenades], _color] call EFUNC(common,stringToColoredText);
|
private _text = [format ["%1 x%2", _name, _numberofGrenades], _color] call EFUNC(common,stringToColoredText);
|
||||||
private _picture = getText (configFile >> "CfgMagazines" >> _magazine >> "picture");
|
private _picture = getText (configFile >> "CfgMagazines" >> _magazine >> "picture");
|
||||||
|
|
||||||
["ace_displayTextPicture", [_text, _picture]] call CBA_fnc_localEvent;
|
[_text, _picture] call EFUNC(common,displayTextPicture);
|
||||||
|
@ -18,7 +18,3 @@ class CfgPatches {
|
|||||||
#include "RscTitles.hpp"
|
#include "RscTitles.hpp"
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
};
|
|
||||||
|
@ -26,7 +26,6 @@ class CfgAddons {
|
|||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
|
|
||||||
class ACE_newEvents {
|
class ACE_newEvents {
|
||||||
SettingsInitialized = "ace_settingsInitialized";
|
|
||||||
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
|
firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
|
||||||
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
firedPlayerVehicle = "ace_firedPlayerVehicle";
|
||||||
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
firedPlayerNonLocal = "ace_firedPlayerNonLocal";
|
||||||
|
Loading…
Reference in New Issue
Block a user