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

Merge branch 'master' into acerep7

Browse Source
This commit is contained in:
bux578 2016-11-03 10:26:41 +01:00
commit 493613e1ed
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/atragmx/functions/fnc_update_zero_range.sqf
View File

@ -15,6 +15,8 @@
*/
#include "script_component.hpp"
[] call FUNC(parse_input);
private ["_scopeBaseAngle"];
_scopeBaseAngle = (GVAR(workingMemory) select 3);
@ -28,10 +30,7 @@ _dragModel = GVAR(workingMemory) select 16;
_atmosphereModel = GVAR(workingMemory) select 17;
private ["_zeroRange"];
_zeroRange = Round(parseNumber(ctrlText 120060));
if (GVAR(currentUnit) == 1) then {
_zeroRange = _zeroRange / 1.0936133;
};
_zeroRange = GVAR(workingMemory) select 2;
if (_zeroRange < 10) exitWith {
GVAR(workingMemory) set [2, _zeroRange];
GVAR(workingMemory) set [3, 0];
@ -42,9 +41,17 @@ _altitude = GVAR(altitude);
_temperature = GVAR(temperature);
_barometricPressure = GVAR(barometricPressure);
_relativeHumidity = GVAR(relativeHumidity);
if (!GVAR(atmosphereModeTBH)) then {
_barometricPressure = 1013.25 * (1 - (0.0065 * _altitude) / (273.15 + _temperature + 0.0065 * _altitude)) ^ 5.255754495;
_relativeHumidity = 50;
};
private ["_result"];
_result = [_scopeBaseAngle, _bulletMass, _boreHeight, _airFriction, _muzzleVelocity, _temperature, _barometricPressure, _relativeHumidity, 1000, [0, 0], 0, 0, 0, _zeroRange, _bc, _dragModel, _atmosphereModel, false, 1.5, 0, 0, 0] call FUNC(calculate_solution);
{
private _result = [_scopeBaseAngle, _bulletMass, _boreHeight, _airFriction, _muzzleVelocity, _temperature, _barometricPressure, _relativeHumidity, 1000, [0, 0], 0, 0, 0, _zeroRange, _bc, _dragModel, _atmosphereModel, false, 1.5, 0, 0, 0] call FUNC(calculate_solution);
private _offset = (_result select 0) / 60;
_scopeBaseAngle = _scopeBaseAngle + _offset;
if (_offset < 0.01) exitWith {};
} forEach [1, 2, 3];
GVAR(workingMemory) set [2, _zeroRange];
GVAR(workingMemory) set [3, _scopeBaseAngle + (_result select 0) / 60];
GVAR(workingMemory) set [3, _scopeBaseAngle];

12
addons/ballistics/CfgAmmo.hpp
View File

@ -132,7 +132,7 @@ class CfgAmmo {
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ICAO";
ACE_dragModel=7;
ACE_muzzleVelocities[]={790, 930, 970};
ACE_muzzleVelocities[]={790, 930, 950};
ACE_barrelLengths[]={369.0, 463.0, 600.0};
};
class B_65x39_Caseless : BulletBase {
@ -667,7 +667,7 @@ class CfgAmmo {
ACE_bulletLength=43.18;
ACE_bulletMass=19.44;
ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[]={0.381};
ACE_ballisticCoefficients[]={0.368};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ICAO";
ACE_dragModel=7;
@ -683,12 +683,12 @@ class CfgAmmo {
ACE_bulletLength=38.989;
ACE_bulletMass=16.3941242;
ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[]={0.560};
ACE_ballisticCoefficients[]={0.290};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ICAO";
ACE_dragModel=1;
ACE_muzzleVelocities[]={880, 915, 925};
ACE_barrelLengths[]={508.0, 660.4, 711.2};
ACE_dragModel=7;
ACE_muzzleVelocities[]={880, 895, 900};
ACE_barrelLengths[]={508.0, 685.8, 711.2};
};
class B_127x33_Ball: BulletBase {
tracerScale = 1.3; //1.2;

4
addons/ballistics/CfgWeapons.hpp
View File

@ -262,9 +262,9 @@ class CfgWeapons {
/* Rifles */
class arifle_AKS_base_F: Rifle_Base_F {
initSpeed = -1.00419;
initSpeed = -1.0;
ACE_barrelTwist=160.02;
ACE_barrelLength=210.82;
ACE_barrelLength=206.5;
};
class arifle_AKM_base_F: Rifle_Base_F {
initSpeed = -1.0014;

7
docs/Dockerfile
View File

@ -2,7 +2,10 @@
# docker build -t ace3mod/jekyll .
#
# Run:
# docker run -p 4000:4000 -it ace3mod/jekyll
# docker run -it -p 4000:4000 -v $(pwd):/usr/src/app ace3mod/jekyll
#
# Run with --incremental flag:
# docker run -it -p 4000:4000 -v $(pwd):/usr/src/app ace3mod/jekyll --incremental
FROM starefossen/github-pages:latest
MAINTAINER bux
@ -11,4 +14,4 @@ COPY . /usr/src/app
VOLUME "/usr/src/app"
CMD ["jekyll", "serve", "--future", "--incremental", "--config", "_config_dev.yml", "-H", "0.0.0.0", "-P", "4000"]
ENTRYPOINT ["jekyll", "serve", "--future", "--config", "_config_dev.yml", "-H", "0.0.0.0", "-P", "4000"]