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

Fixed: Gunner FOV, explosive rounds and FPS drop.

Browse Source
This commit is contained in:
jaynus 2015-04-06 12:54:06 -07:00
parent d6cf07a3b6
commit 906612f954
6 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/aircraft/CfgAmmo.hpp
View File

@ -5,11 +5,14 @@ class CfgAmmo {
class ACE_20mm_HEDP : B_20mm { class ACE_20mm_HEDP : B_20mm {
hit = 80; hit = 80;
indirectHit = 25; indirectHit = 12;
indirectHitRange = 1.7; //2; indirectHitRange = 2; //2;
caliber = 1.4;
deflecting = 3;
fuseDistance = 3; fuseDistance = 3;
tracerStartTime = 0.02;
timeToLive = 40; timeToLive = 40;
explosive = 0.4; explosive = 1.8;
}; };

76
addons/aircraft/Heli_Attack_01_base_F.hpp
View File

@ -869,6 +869,18 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
weapons[] = {"ACE_gatling_20mm_Comanche","missiles_DAGR","missiles_ASRAAM", "ACE_AIR_SAFETY"}; weapons[] = {"ACE_gatling_20mm_Comanche","missiles_DAGR","missiles_ASRAAM", "ACE_AIR_SAFETY"};
magazines[] = {"ACE_500Rnd_20mm_shells_Comanche","4Rnd_AAA_missiles","24Rnd_PG_missiles"}; magazines[] = {"ACE_500Rnd_20mm_shells_Comanche","4Rnd_AAA_missiles","24Rnd_PG_missiles"};
outGunnerMayFire = 1;
commanding = -1;
primaryGunner = 1;
gunnerOpticsModel = "";
gunnerOpticsEffect[] = {"TankCommanderOptics1"};
gunnerForceOptics = 0;
turretInfoType = "Rsc_ACE_Helo_UI_Turret";
showAllTargets = 2;
discretedistance[] = {100,200,300,400,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1600,1700,1800,1900,2000,2100,2200,2300,2400,2500,2600,2700,2800,2900,3000};
discretedistanceinitindex = 3;
copilotHasFlares = 1;
isCopilot = 1; isCopilot = 1;
showHMD = 1; showHMD = 1;
CanEject = 1; CanEject = 1;
@ -882,25 +894,6 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
class OpticsIn class OpticsIn
{ {
class WideNGS
{
opticsDisplayName = "W";
initAngleX = 0;
minAngleX = -35;
maxAngleX = 10;
initAngleY = 0;
minAngleY = -100;
maxAngleY = 100;
initFov = 0.466;
minFov = 0.466;
maxFov = 0.466;
visionMode[] = {"Normal","Ti"};
thermalMode[] = {0,1};
gunnerOpticsColor[] = {0.15,1,0.15,1};
gunnerOpticsModel = "A3\Weapons_F\Reticle\Optics_Gunner_MBT_03_w_F.p3d";
directionStabilized = 0;
opticsPPEffects[] = {"OpticsCHAbera2","OpticsBlur2"};
};
class Wide class Wide
{ {
opticsDisplayName = "W"; opticsDisplayName = "W";
@ -913,54 +906,43 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
initFov = 0.466; initFov = 0.466;
minFov = 0.466; minFov = 0.466;
maxFov = 0.466; maxFov = 0.466;
visionMode[] = {"Normal","Ti"}; visionMode[] = {"Normal","NVG","Ti"};
thermalMode[] = {0,1}; thermalMode[] = {0,1};
gunnerOpticsColor[] = {0.15,1,0.15,1};
gunnerOpticsModel = "A3\Weapons_F\Reticle\Optics_Gunner_MBT_02_w_F.p3d";
directionStabilized = 1;
opticsPPEffects[] = {"OpticsCHAbera2","OpticsBlur2"};
gunnerOpticsEffect[] = {"TankCommanderOptics1"};
};
class WideL: Wide
{
opticsDisplayName = "WL";
initFov = 0.2;
minFov = 0.2;
maxFov = 0.2;
gunnerOpticsModel = "A3\Weapons_F\Reticle\Optics_Gunner_MBT_02_m_F.p3d";
gunnerOpticsColor[] = {0,0,0,1}; gunnerOpticsColor[] = {0,0,0,1};
directionStabilized = 1; directionStabilized = 1;
opticsPPEffects[] = {"OpticsCHAbera2","OpticsBlur2"}; gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_wide_F";
}; };
class Medium: Wide class Medium: Wide
{ {
opticsDisplayName = "M"; opticsDisplayName = "M";
initFov = 0.1; initFov = 0.093;
minFov = 0.1; minFov = 0.093;
maxFov = 0.1; maxFov = 0.093;
directionStabilized = 1;
gunnerOpticsColor[] = {0,0,0,1}; gunnerOpticsColor[] = {0,0,0,1};
gunnerOpticsModel = "A3\Weapons_F\Reticle\Optics_Gunner_MBT_02_m_F.p3d"; directionStabilized = 1;
gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_medium_F";
}; };
class Narrow: Wide class Narrow: Wide
{ {
opticsDisplayName = "N"; opticsDisplayName = "N";
initFov = 0.029;
minFov = 0.029;
maxFov = 0.029;
gunnerOpticsColor[] = {0,0,0,1}; gunnerOpticsColor[] = {0,0,0,1};
gunnerOpticsModel = "A3\Weapons_F\Reticle\Optics_Gunner_MBT_02_n_F.p3d";
directionStabilized = 1; directionStabilized = 1;
initFov = 0.02; gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_narrow_F";
minFov = 0.02;
maxFov = 0.02;
}; };
class Narrower: Wide class Narrower: Wide
{ {
opticsDisplayName = "N"; opticsDisplayName = "Z";
gunnerOpticsColor[] = {0,0,0,1};
gunnerOpticsModel = "A3\Weapons_F\Reticle\Optics_Gunner_MBT_02_n_F.p3d";
directionStabilized = 1;
initFov = 0.01; initFov = 0.01;
minFov = 0.01; minFov = 0.01;
maxFov = 0.01; maxFov = 0.01;
gunnerOpticsColor[] = {0,0,0,1};
directionStabilized = 1;
gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_narrow_F";
}; };
}; };
class OpticsOut class OpticsOut

2
addons/aircraft/README.md
View File

@ -3,7 +3,7 @@ ace_aircraft
Changes to air weaponry, flightmodels and HUDs. Changes to air weaponry, flightmodels and HUDs.
* Contributations by Kimi for HUD updates * Contributations by Kimi (geraldbolso1899) for HUD updates
## Maintainers ## Maintainers

5
addons/aircraft/RscInGameUI.hpp
View File

@ -8,13 +8,16 @@ class RscOpticsValue;
class VScrollbar; class VScrollbar;
class HScrollbar; class HScrollbar;
class RscLadderPicture; class RscLadderPicture;
class RscControlsGroupNoScrollbars;
class RscInGameUI class RscInGameUI
{ {
class RscUnitInfo; class RscUnitInfo;
class Rsc_ACE_Helo_UI_Turret: RscUnitInfo class Rsc_ACE_Helo_UI_Turret: RscUnitInfo
{ {
idd = 300; idd = 300;
controls[] = {"CA_Zeroing","CA_IGUI_elements_group","CA_VehicleToggles"}; controls[] = {"CA_IGUI_elements_group","CA_VehicleToggles"};
class VScrollbar; class VScrollbar;
class HScrollbar; class HScrollbar;
class CA_IGUI_elements_group: RscControlsGroup class CA_IGUI_elements_group: RscControlsGroup

8
addons/fcs/CfgOptics.hpp
View File

@ -147,6 +147,14 @@ class RscInGameUI {
MACRO_RANGEFINDER MACRO_RANGEFINDER
}; };
}; };
};
class Rsc_ACE_Helo_UI_Turret: RscUnitInfo {
onLoad = "uiNamespace setVariable ['ACE_dlgRangefinder', _this select 0]; ((_this select 0) displayCtrl 151) ctrlSetTextColor [0, 0, 0, 0]; [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""";
class CA_IGUI_elements_group: RscControlsGroup {
class controls {
MACRO_RANGEFINDER
};
};
}; };
class RscOptics_Heli_Attack_01_gunner: RscUnitInfo { class RscOptics_Heli_Attack_01_gunner: RscUnitInfo {
onLoad = "uiNamespace setVariable ['ACE_dlgRangefinder', _this select 0]; ((_this select 0) displayCtrl 151) ctrlSetTextColor [0, 0, 0, 0]; [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf"""; onLoad = "uiNamespace setVariable ['ACE_dlgRangefinder', _this select 0]; ((_this select 0) displayCtrl 151) ctrlSetTextColor [0, 0, 0, 0]; [""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""";

4
addons/laser_selfdesignate/functions/fnc_laserHudDesignateOn.sqf
View File

@ -3,7 +3,7 @@
TRACE_1("enter", _this); TRACE_1("enter", _this);
#define FCS_UPDATE_DELAY 2.0 #define FCS_UPDATE_DELAY 1
FUNC(magnitude) = { FUNC(magnitude) = {
_this distance [0, 0, 0] _this distance [0, 0, 0]
@ -100,7 +100,7 @@ if(isNil QGVAR(laser)) then {
GVAR(laserActive) = true; GVAR(laserActive) = true;
_handle = [FUNC(laserHudDesignatePFH), 0, [_laserTarget, player]] call cba_fnc_addPerFrameHandler; _handle = [FUNC(laserHudDesignatePFH), 0.25, [_laserTarget, player]] call cba_fnc_addPerFrameHandler;
_laserTarget setVariable ["ACE_PFH_HANDLE", _handle, false]; _laserTarget setVariable ["ACE_PFH_HANDLE", _handle, false];
GVAR(laser) = _laserTarget; GVAR(laser) = _laserTarget;