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

Small bug & config name fixes

Browse Source
This commit is contained in:
lambdatiger 2024-01-10 18:34:54 -06:00
parent 2a1f609e3c
commit a04e7a83e6
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/frag/cfgAmmoSpall.hpp
View File

@ -133,7 +133,7 @@ class GVAR(metal_spall_small) : GVAR(spallBase) {
submunitionConeType[] = {"poissondisccenter", 6}; submunitionConeType[] = {"poissondisccenter", 6};
}; };
class GVAR(metal_metal_spall_medium) : GVAR(spallBase) { class GVAR(metal_spall_medium) : GVAR(spallBase) {
submunitionAmmo[] = {QGVAR(tiny), 5, QGVAR(small), 4, QGVAR(medium), 2, QGVAR(large), 1}; submunitionAmmo[] = {QGVAR(tiny), 5, QGVAR(small), 4, QGVAR(medium), 2, QGVAR(large), 1};
submunitionConeType[] = {"poissondisccenter", 8}; submunitionConeType[] = {"poissondisccenter", 8};
}; };

17
addons/frag/functions/fnc_doSpall.sqf
View File

@ -33,7 +33,8 @@ params [
if (CBA_missionTime - GVAR(lastSpallTime) < ACE_FRAG_SPALL_HOLDOFF || if (CBA_missionTime - GVAR(lastSpallTime) < ACE_FRAG_SPALL_HOLDOFF ||
_lPosASL isEqualTo [0,0,0] || _lPosASL isEqualTo [0,0,0] ||
{isNull _hitObj || {_hitObj isKindOf "man"}}) exitWith { {isNull _hitObj || {_hitObj isKindOf "man" ||
{_ammo isEqualTo ""}}}) exitWith {
TRACE_4("time/invldHit",CBA_missionTime,GVAR(lastSpallTime),_hitObj,_lPosASL); TRACE_4("time/invldHit",CBA_missionTime,GVAR(lastSpallTime),_hitObj,_lPosASL);
}; };
@ -75,6 +76,10 @@ if (120 > acos ((vectorNormalized _lVelUnit) vectorDotProduct _sNorm)) then {
if (terrainIntersectASL [_lPosASL vectorAdd _unitStep, _lPosASL]) exitWith { if (terrainIntersectASL [_lPosASL vectorAdd _unitStep, _lPosASL]) exitWith {
TRACE_3("terrainIntersect",_lPosASL,_unitStep,_lPosASL); TRACE_3("terrainIntersect",_lPosASL,_unitStep,_lPosASL);
}; };
//***** Passed all exit withs *****//
GVAR(lastSpallTime) = CBA_missionTime;
// step through // step through
for "_i" from 1 to 20 do for "_i" from 1 to 20 do
{ {
@ -93,10 +98,6 @@ if GVAR(dbgSphere) then {
[_lPosASL, "orange"] call FUNC(dev_sphereDraw); [_lPosASL, "orange"] call FUNC(dev_sphereDraw);
}; };
#endif #endif
//***** Passed all exit withs *****//
GVAR(lastSpallTime) = CBA_missionTime;
//***** Select spalled fragment spawner **// //***** Select spalled fragment spawner **//
private _spawnSize = switch (true) do private _spawnSize = switch (true) do
@ -109,8 +110,8 @@ private _spawnSize = switch (true) do
}; };
//***** Spawn spalled fragments //***** Spawn spalled fragments
private _spallSpawner = createVehicleLocal [ private _spallSpawner = createVehicle [
QUOTE(ADDON##_) + _material + _spawnSize, "ace_frag_" + _material + _spawnSize,
ASLToATL _spallPos, ASLToATL _spallPos,
[], [],
0, 0,
@ -119,7 +120,7 @@ private _spallSpawner = createVehicleLocal [
_spallSpawner setVectorDirandUp [_lVelUnit, _vUp]; _spallSpawner setVectorDirandUp [_lVelUnit, _vUp];
_spallSpawner setVelocity (_lVelUnit vectorMultiply (_dV/2)); _spallSpawner setVelocity (_lVelUnit vectorMultiply (_dV/2));
_spallSpawner setShotParents _shotParents; _spallSpawner setShotParents _shotParents;
profilerLog "spalled";
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL
systemChat ("bSpd: " + str speed _spallSpawner + ", frag: " + _fragSpawnType + ", dm: " + str _deltaMomentum); systemChat ("bSpd: " + str speed _spallSpawner + ", frag: " + _fragSpawnType + ", dm: " + str _deltaMomentum);
#endif #endif

3
addons/frag/initSettings.inc.sqf
View File

@ -55,11 +55,10 @@ private _category = format ["ACE %1", localize LSTRING(Module_DisplayName)];
true true
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
[ [
QGVAR(SpallIntensity), "SLIDER", QGVAR(SpallIntensity), "SLIDER",
[LSTRING(SpallIntensity), LSTRING(SpallIntensity_Desc)], [LSTRING(SpallIntensity), LSTRING(SpallIntensity_Desc)],
[_category, LSTRING(Frag)], [_category, LSTRING(Spall)],
[0.1, 2, 1, 1], [0.1, 2, 1, 1],
true true
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;

8
addons/frag/script_component.hpp
View File

@ -18,9 +18,9 @@
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#define ACE_FRAG_HOLDOFF 0.2 #define ACE_FRAG_HOLDOFF 0.25
#define ACE_FRAG_HOLDOFF_VEHICLE 1 #define ACE_FRAG_HOLDOFF_VEHICLE 1
#define ACE_FRAG_SPALL_HOLDOFF 0.2 #define ACE_FRAG_SPALL_HOLDOFF 0.25
#define ACE_FRAG_COUNT_MIN 5 #define ACE_FRAG_COUNT_MIN 5
#define ACE_FRAG_COUNT_MAX 50 #define ACE_FRAG_COUNT_MAX 50
#define ACE_FRAG_HITPOINTS ["spine1","spine2","spine3","head","leftarm","leftarmroll","leftforearm","rightarm","rightarmroll","rightforearm","pelvis","leftupleg","leftuplegroll","leftlegroll","leftfoot","rightupleg","rightuplegroll","rightleg","rightlegroll","rightfoot"] #define ACE_FRAG_HITPOINTS ["spine1","spine2","spine3","head","leftarm","leftarmroll","leftforearm","rightarm","rightarmroll","rightforearm","pelvis","leftupleg","leftuplegroll","leftlegroll","leftfoot","rightupleg","rightuplegroll","rightleg","rightlegroll","rightfoot"]
@ -32,4 +32,8 @@
#define __FADE_INTERVAL 0.1 #define __FADE_INTERVAL 0.1
#define __FADE_RATE __FADE_INTERVAL/__FADE_TIME/2 #define __FADE_RATE __FADE_INTERVAL/__FADE_TIME/2
#define __FADE_INIT (__FADE_TIME+__FADE_START)/__FADE_TIME/2 #define __FADE_INIT (__FADE_TIME+__FADE_START)/__FADE_TIME/2
#endif
#ifndef GLUE
#define GLUE(g1,g2) g1##g2
#endif #endif