mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
fix Cfg capitalization
This commit is contained in:
parent
dcf0a68b80
commit
0b84bb514b
@ -54,7 +54,7 @@ if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "CfgWeapons" >> _wea
|
|||||||
|
|
||||||
if (_abort || !(GVAR(extensionAvailable))) exitWith {
|
if (_abort || !(GVAR(extensionAvailable))) exitWith {
|
||||||
if (missionNamespace getVariable [QEGVAR(windDeflection,enabled), false]) then {
|
if (missionNamespace getVariable [QEGVAR(windDeflection,enabled), false]) then {
|
||||||
EGVAR(windDeflection,trackedBullets) pushBack [_bullet, getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction")];
|
EGVAR(windDeflection,trackedBullets) pushBack [_bullet, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: Unit (player) <OBJECT>
|
* 0: Unit (player) <OBJECT>
|
||||||
* 1: attachToVehicle <OBJECT>
|
* 1: attachToVehicle <OBJECT>
|
||||||
* 2: Item Classname (cfgWeapon/cfgMagazine) <STRING>
|
* 2: Item Classname (CfgWeapon/CfgMagazine) <STRING>
|
||||||
* 3: Light Vehicle Classname <STRING>
|
* 3: Light Vehicle Classname <STRING>
|
||||||
* 4: On Attach Text <STRING>
|
* 4: On Attach Text <STRING>
|
||||||
* 5: Starting Pos of dummy item <ARRAY>
|
* 5: Starting Pos of dummy item <ARRAY>
|
||||||
|
@ -14,4 +14,4 @@
|
|||||||
|
|
||||||
params ["_modName"];
|
params ["_modName"];
|
||||||
|
|
||||||
isClass (configFile >> "cfgPatches" >> _modName) // return
|
isClass (configFile >> "CfgPatches" >> _modName) // return
|
||||||
|
@ -43,7 +43,7 @@ GVAR(CurrentSpeedDial) = 0;
|
|||||||
GVAR(placeAction) = PLACE_CANCEL;
|
GVAR(placeAction) = PLACE_CANCEL;
|
||||||
};
|
};
|
||||||
|
|
||||||
//Show defuse actions on cfgAmmos (allMines):
|
//Show defuse actions on CfgAmmos (allMines):
|
||||||
_this call FUNC(interactEH);
|
_this call FUNC(interactEH);
|
||||||
|
|
||||||
}] call EFUNC(common,addEventHandler);
|
}] call EFUNC(common,addEventHandler);
|
||||||
|
@ -17,7 +17,7 @@ class CfgPatches {
|
|||||||
#include "CfgFactionClasses.hpp"
|
#include "CfgFactionClasses.hpp"
|
||||||
#include "CfgVehicles.hpp"
|
#include "CfgVehicles.hpp"
|
||||||
#include "CfgWeapons.hpp"
|
#include "CfgWeapons.hpp"
|
||||||
#include "CFgSounds.hpp"
|
#include "CfgSounds.hpp"
|
||||||
#include "ACE_Medical_Treatments.hpp"
|
#include "ACE_Medical_Treatments.hpp"
|
||||||
#include "ACE_Settings.hpp"
|
#include "ACE_Settings.hpp"
|
||||||
#include "UI\RscTitles.hpp"
|
#include "UI\RscTitles.hpp"
|
||||||
|
@ -37,14 +37,14 @@ if (!hasInterface) exitWith {};
|
|||||||
}] call EFUNC(common,addEventHandler);
|
}] call EFUNC(common,addEventHandler);
|
||||||
|
|
||||||
|
|
||||||
if (isClass (configFile >> "cfgPatches" >> "acre_api")) then {
|
if (isClass (configFile >> "CfgPatches" >> "acre_api")) then {
|
||||||
ACE_LOGINFO("ACRE Detected.");
|
ACE_LOGINFO("ACRE Detected.");
|
||||||
DFUNC(isSpeaking) = {
|
DFUNC(isSpeaking) = {
|
||||||
params ["_unit"];
|
params ["_unit"];
|
||||||
([_unit] call acre_api_fnc_isSpeaking) && {!(_unit getVariable ["ACE_isUnconscious", false])}
|
([_unit] call acre_api_fnc_isSpeaking) && {!(_unit getVariable ["ACE_isUnconscious", false])}
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
if (isClass (configFile >> "cfgPatches" >> "task_force_radio")) then {
|
if (isClass (configFile >> "CfgPatches" >> "task_force_radio")) then {
|
||||||
ACE_LOGINFO("TFR Detected.");
|
ACE_LOGINFO("TFR Detected.");
|
||||||
DFUNC(isSpeaking) = {
|
DFUNC(isSpeaking) = {
|
||||||
params ["_unit"];
|
params ["_unit"];
|
||||||
|
@ -32,6 +32,6 @@ if (!((_bullet isKindOf "BulletBase") || (_bullet isKindOf "GrenadeBase"))) exit
|
|||||||
if (_unit distance ACE_player > GVAR(simulationRadius)) exitWith {false};
|
if (_unit distance ACE_player > GVAR(simulationRadius)) exitWith {false};
|
||||||
if (!([_unit] call EFUNC(common,isPlayer))) exitWith {false};
|
if (!([_unit] call EFUNC(common,isPlayer))) exitWith {false};
|
||||||
|
|
||||||
GVAR(trackedBullets) pushBack [_bullet, getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction")];
|
GVAR(trackedBullets) pushBack [_bullet, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")];
|
||||||
|
|
||||||
true;
|
true;
|
@ -68,7 +68,7 @@ if (_activated) then {
|
|||||||
|
|
||||||
//--- All (including unofficial ones)
|
//--- All (including unofficial ones)
|
||||||
case 3: {
|
case 3: {
|
||||||
_cfgPatches = configfile >> "cfgpatches";
|
_cfgPatches = configfile >> "Cfgpatches";
|
||||||
for "_i" from 0 to (count _cfgPatches - 1) do {
|
for "_i" from 0 to (count _cfgPatches - 1) do {
|
||||||
_class = _cfgPatches select _i;
|
_class = _cfgPatches select _i;
|
||||||
if (isclass _class) then {_addons set [count _addons,configname _class];};
|
if (isclass _class) then {_addons set [count _addons,configname _class];};
|
||||||
|
@ -21,7 +21,7 @@ _units = _this select 1;
|
|||||||
_activated = _this select 2;
|
_activated = _this select 2;
|
||||||
|
|
||||||
if (_activated) then {
|
if (_activated) then {
|
||||||
_explosive = gettext (configfile >> "cfgvehicles" >> typeof _logic >> "explosive");
|
_explosive = gettext (configfile >> "CfgVehicles" >> typeof _logic >> "explosive");
|
||||||
if (_explosive != "") then {
|
if (_explosive != "") then {
|
||||||
_explosive = createvehicle [_explosive,position _logic,[],0,"none"];
|
_explosive = createvehicle [_explosive,position _logic,[],0,"none"];
|
||||||
_explosive attachto [_logic];
|
_explosive attachto [_logic];
|
||||||
|
@ -39,17 +39,17 @@ if ({local _x} count (objectcurators _logic) > 0) then {
|
|||||||
if !(isserver) exitwith {};
|
if !(isserver) exitwith {};
|
||||||
|
|
||||||
if (_activated) then {
|
if (_activated) then {
|
||||||
_ammo = _logic getvariable ["type",gettext (configfile >> "cfgvehicles" >> typeof _logic >> "ammo")];
|
_ammo = _logic getvariable ["type",gettext (configfile >> "CfgVehicles" >> typeof _logic >> "ammo")];
|
||||||
if (_ammo != "") then {
|
if (_ammo != "") then {
|
||||||
_cfgAmmo = configfile >> "cfgammo" >> _ammo;
|
_CfgAmmo = configfile >> "CfgAmmo" >> _ammo;
|
||||||
//if !(isclass _cfgAmmo) exitwith {["CfgAmmo class '%1' not found.",_ammo] call bis_fnc_error;};
|
//if !(isclass _CfgAmmo) exitwith {["CfgAmmo class '%1' not found.",_ammo] call bis_fnc_error;};
|
||||||
_dirVar = _fnc_scriptname + typeof _logic;
|
_dirVar = _fnc_scriptname + typeof _logic;
|
||||||
_logic setdir (missionnamespace getvariable [_dirVar,direction _logic]); //--- Restore custom direction
|
_logic setdir (missionnamespace getvariable [_dirVar,direction _logic]); //--- Restore custom direction
|
||||||
_pos = getposatl _logic;
|
_pos = getposatl _logic;
|
||||||
_posAmmo = +_pos;
|
_posAmmo = +_pos;
|
||||||
_posAmmo set [2,0];
|
_posAmmo set [2,0];
|
||||||
_dir = direction _logic;
|
_dir = direction _logic;
|
||||||
_simulation = tolower gettext (configfile >> "cfgammo" >> _ammo >> "simulation");
|
_simulation = tolower gettext (configfile >> "CfgAmmo" >> _ammo >> "simulation");
|
||||||
_altitude = 0;
|
_altitude = 0;
|
||||||
_velocity = [];
|
_velocity = [];
|
||||||
_attach = false;
|
_attach = false;
|
||||||
@ -65,7 +65,7 @@ if (_activated) then {
|
|||||||
_altitude = 1000;
|
_altitude = 1000;
|
||||||
_velocity = [0,0,-100];
|
_velocity = [0,0,-100];
|
||||||
_radio = "SentGenIncoming";
|
_radio = "SentGenIncoming";
|
||||||
_sounds = if (getnumber (_cfgAmmo >> "hit") < 200) then {["mortar1","mortar2"]} else {["shell1","shell2","shell3","shell4"]};
|
_sounds = if (getnumber (_CfgAmmo >> "hit") < 200) then {["mortar1","mortar2"]} else {["shell1","shell2","shell3","shell4"]};
|
||||||
_sound = _sounds call bis_fnc_selectrandom;
|
_sound = _sounds call bis_fnc_selectrandom;
|
||||||
_hint = ["Curator","PlaceOrdnance"];
|
_hint = ["Curator","PlaceOrdnance"];
|
||||||
_shakeStrength = 0.01;
|
_shakeStrength = 0.01;
|
||||||
|
Loading…
Reference in New Issue
Block a user