mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Transfered ballistics support (as discussed with glowbal)
This commit is contained in:
SilentSpike
parent
c1c10f43b2
commit
519aba57b5
@ -3,7 +3,6 @@
|
||||
ADDON = false;
|
||||
|
||||
PREP(moduleInit);
|
||||
PREP(bi_moduleProjectile);
|
||||
|
||||
GVAR(moduleInitCollection) = [];
|
||||
|
||||
|
||||
@ -23,9 +23,6 @@ class CfgVehicles {
|
||||
init = QUOTE(_this call DFUNC(moduleInit));
|
||||
};
|
||||
};
|
||||
class ModuleOrdnance_F: Module_F {
|
||||
function = "ace_modules_fnc_bi_moduleProjectile";
|
||||
};
|
||||
};
|
||||
|
||||
#include "CfgEventHandlers.hpp"
|
||||
#include "CfgEventHandlers.hpp"
|
||||
@ -1,191 +0,0 @@
|
||||
/*
|
||||
* Author: Bohemia Interactive
|
||||
* Module function for spawning projectiles
|
||||
* Used by Curator artillery modules etc
|
||||
*
|
||||
* Arguments:
|
||||
* 0: The logic object <OBJECT>
|
||||
*
|
||||
* Return Value:
|
||||
* nil
|
||||
*
|
||||
* Public: No
|
||||
*/
|
||||
|
||||
_fnc_scriptNameParentTemp = if !(isnil '_fnc_scriptName') then {_fnc_scriptName} else {'BIS_fnc_moduleProjectile'};
|
||||
private ['_fnc_scriptNameParent'];
|
||||
_fnc_scriptNameParent = _fnc_scriptNameParentTemp;
|
||||
_fnc_scriptNameParentTemp = nil;
|
||||
|
||||
private ['_fnc_scriptName'];
|
||||
_fnc_scriptName = 'BIS_fnc_moduleProjectile';
|
||||
scriptname _fnc_scriptName;
|
||||
|
||||
private ["_logic", "_units", "_activated"];
|
||||
_logic = _this select 0;
|
||||
_units = _this select 1;
|
||||
_activated = _this select 2;
|
||||
|
||||
if ({local _x} count (objectcurators _logic) > 0) then {
|
||||
//--- Reveal the circle to curators
|
||||
_logic hideobject false;
|
||||
_logic setpos position _logic;
|
||||
};
|
||||
if !(isserver) exitwith {};
|
||||
|
||||
if (_activated) then {
|
||||
_ammo = _logic getvariable ["type",gettext (configfile >> "cfgvehicles" >> typeof _logic >> "ammo")];
|
||||
if (_ammo != "") then {
|
||||
_cfgAmmo = configfile >> "cfgammo" >> _ammo;
|
||||
//if !(isclass _cfgAmmo) exitwith {["CfgAmmo class '%1' not found.",_ammo] call bis_fnc_error;};
|
||||
_dirVar = _fnc_scriptname + typeof _logic;
|
||||
_logic setdir (missionnamespace getvariable [_dirVar,direction _logic]); //--- Restore custom direction
|
||||
_pos = getposatl _logic;
|
||||
_posAmmo = +_pos;
|
||||
_posAmmo set [2,0];
|
||||
_dir = direction _logic;
|
||||
_simulation = tolower gettext (configfile >> "cfgammo" >> _ammo >> "simulation");
|
||||
_altitude = 0;
|
||||
_velocity = [];
|
||||
_attach = false;
|
||||
_radio = "";
|
||||
_delay = 60;
|
||||
_sound = "";
|
||||
_soundSourceClass = "";
|
||||
_hint = [];
|
||||
_shakeStrength = 0;
|
||||
_shakeRadius = 0;
|
||||
switch (_simulation) do {
|
||||
case "shotshell": {
|
||||
_altitude = 1000;
|
||||
_velocity = [0,0,-100];
|
||||
_radio = "SentGenIncoming";
|
||||
_sounds = if (getnumber (_cfgAmmo >> "hit") < 200) then {["mortar1","mortar2"]} else {["shell1","shell2","shell3","shell4"]};
|
||||
_sound = _sounds call bis_fnc_selectrandom;
|
||||
_hint = ["Curator","PlaceOrdnance"];
|
||||
_shakeStrength = 0.01;
|
||||
_shakeRadius = 300;
|
||||
};
|
||||
case "shotsubmunitions": {
|
||||
_posAmmo = [_posAmmo,500,_dir + 180] call bis_fnc_relpos;
|
||||
_altitude = 1000 - ((getterrainheightasl _posAmmo) - (getterrainheightasl _pos));
|
||||
_posAmmo set [2,_altitude];
|
||||
_velocity = [sin _dir * 68,cos _dir * 68,-100];
|
||||
_radio = "SentGenIncoming";
|
||||
_hint = ["Curator","PlaceOrdnance"];
|
||||
_shakeStrength = 0.02;
|
||||
_shakeRadius = 500;
|
||||
};
|
||||
case "shotilluminating": {
|
||||
_altitude = 66;
|
||||
_velocity = [wind select 0,wind select 1,30];
|
||||
_sound = "SN_Flare_Fired_4";
|
||||
_soundSourceClass = "SoundFlareLoop_F";
|
||||
};
|
||||
case "shotnvgmarker";
|
||||
case "shotsmokex": {
|
||||
_altitude = 0;
|
||||
_velocity = [0,0,0];
|
||||
_attach = true;
|
||||
};
|
||||
default {["Ammo simulation '%1' is not supported",_simulation] call bis_fnc_error;};
|
||||
};
|
||||
_fnc_playRadio = {
|
||||
if (_radio != "") then {
|
||||
_entities = (getposatl _logic) nearentities ["All",100];
|
||||
_sides = [];
|
||||
{
|
||||
if (isplayer _x) then {
|
||||
_side = side group _x;
|
||||
if (_side in [east,west,resistance,civilian]) then {
|
||||
//--- Play radio (only if it wasn't played recently)
|
||||
if (time > _x getvariable ["BIS_fnc_moduleProjectile_radio",-_delay]) then {
|
||||
[[_side,_radio,"side"],"bis_fnc_sayMessage",_x] call bis_fnc_mp;
|
||||
_x setvariable ["BIS_fnc_moduleProjectile_radio",time + _delay];
|
||||
};
|
||||
};
|
||||
};
|
||||
} foreach _entities;
|
||||
};
|
||||
};
|
||||
if (count _hint > 0) then {
|
||||
[[_hint,nil,nil,nil,nil,nil,nil,true],"bis_fnc_advHint",objectcurators _logic] call bis_fnc_mp;
|
||||
};
|
||||
if (count _velocity == 3) then {
|
||||
_altitude = (_logic getvariable ["altitude",_altitude]) call bis_fnc_parsenumber;
|
||||
_radio = _logic getvariable ["radio",_radio];
|
||||
|
||||
//--- Create projectile
|
||||
_posAmmo set [2,_altitude];
|
||||
_projectile = createvehicle [_ammo,_posAmmo,[],0,"none"];
|
||||
_projectile setpos _posAmmo;
|
||||
_projectile setvelocity _velocity;
|
||||
if (_attach) then {_projectile attachto [_logic,[0,0,_altitude]];};
|
||||
|
||||
// This is our addition to this function
|
||||
if (!isnil "ace_frag_fnc_addManualTrack") then {
|
||||
[_projectile] call ace_frag_fnc_addManualTrack
|
||||
};
|
||||
|
||||
//--- Play sound
|
||||
if (_sound != "") then {[[_logic,_sound,"say3D"],"bis_fnc_sayMessage"] call bis_fnc_mp;};
|
||||
|
||||
//--- Create sound source
|
||||
_soundSource = if (_soundSourceClass != "") then {createSoundSource [_soundSourceClass,_pos,[],0]} else {objnull};
|
||||
|
||||
//--- Play radio warning
|
||||
[] call _fnc_playRadio;
|
||||
|
||||
//--- Update
|
||||
if (_attach) then {
|
||||
waituntil {
|
||||
_soundSource setposatl getposatl _projectile;
|
||||
sleep 1;
|
||||
isnull _projectile || isnull _logic
|
||||
};
|
||||
} else {
|
||||
waituntil {
|
||||
_soundSource setposatl getposatl _projectile;
|
||||
|
||||
if (getposatl _logic distance _pos > 0 || direction _logic != _dir) then {
|
||||
_posNew = getposasl _logic;
|
||||
_dirDiff = direction _logic - _dir;
|
||||
_posNew = [_posNew,[getposasl _projectile,_pos] call bis_fnc_distance2d,direction _logic + 180] call bis_fnc_relpos;
|
||||
_posNew set [2,getposasl _projectile select 2];
|
||||
_projectile setvelocity ([velocity _projectile,-_dirDiff] call bis_fnc_rotatevector2d);
|
||||
_projectile setposasl _posNew;
|
||||
_pos = getposatl _logic;
|
||||
_dir = direction _logic;
|
||||
missionnamespace setvariable [_dirVar,_dir];
|
||||
};
|
||||
sleep 0.1;
|
||||
isnull _projectile || isnull _logic
|
||||
};
|
||||
};
|
||||
deletevehicle _projectile;
|
||||
deletevehicle _soundSource;
|
||||
if (count objectcurators _logic > 0) then {
|
||||
|
||||
//--- Delete curator spawned logic
|
||||
if (_shakeStrength > 0) then {
|
||||
if (_simulation == "shotsubmunitions") then {sleep 0.5;};
|
||||
[[_shakeStrength,0.7,[position _logic,_shakeRadius]],"bis_fnc_shakeCuratorCamera"] call bis_fnc_mp;
|
||||
};
|
||||
deletevehicle _logic;
|
||||
} else {
|
||||
|
||||
//--- Repeat to achieve permanent effect
|
||||
_repeat = _logic getvariable ["repeat",0] > 0;
|
||||
if (_repeat) then {
|
||||
[_logic,_units,_activated] call bis_fnc_moduleprojectile;
|
||||
} else {
|
||||
deletevehicle _logic;
|
||||
};
|
||||
};
|
||||
} else {
|
||||
deletevehicle _logic;
|
||||
};
|
||||
} else {
|
||||
["Cannot create projectile, 'ammo' config attribute is missing in %1",typeof _logic] call bis_fnc_error;
|
||||
};
|
||||
};
|
||||
Loading…
Reference in New Issue
Block a user