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' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments

Browse Source
This commit is contained in:
ulteq 2015-04-14 11:02:37 +02:00
commit d931745f5c
7 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/optics/CfgRscTitles.hpp
View File

@ -70,9 +70,9 @@ class RscInGameUI {
colorText[] = {1,1,1,0};
colorBackground[] = {0,0,0,0};
x = safezoneX+0.5*safezoneW-0.5*SIZEX;
y = safezoneY+0.5*safezoneH-0.5*SIZEX*safezoneW/safezoneH;
y = safezoneY+0.5*safezoneH-0.5*SIZEX*safezoneW/safezoneH*(16/9)/(getResolution select 4);
w = SIZEX;
h = SIZEX*safezoneW/safezoneH;
h = SIZEX*safezoneW/safezoneH*(16/9)/(getResolution select 4);
};
class ReticleNight: ReticleDay {
@ -86,9 +86,9 @@ class RscInGameUI {
idc = 1713005;
text = "";
x = safezoneX+0.5*safezoneW-0.5*SIZEX;
y = safezoneY+0.5*safezoneH-0.5*SIZEX*safezoneW/safezoneH;
y = safezoneY+0.5*safezoneH-0.5*SIZEX*safezoneW/safezoneH*(16/9)/(getResolution select 4);
w = SIZEX;
h = SIZEX*safezoneW/safezoneH;
h = SIZEX*safezoneW/safezoneH*(16/9)/(getResolution select 4);
};
class BodyNight: BodyDay {

10
addons/optics/CfgWeapons.hpp
View File

@ -215,6 +215,11 @@ class CfgWeapons {
};
class ACE_optic_SOS_2D: optic_SOS {
GVAR(BodyDay) = QUOTE(PATHTOF(reticles\sos-body_ca.paa));
GVAR(BodyNight) = QUOTE(PATHTOF(reticles\sos-bodyNight_ca.paa));
GVAR(ReticleDay) = QUOTE(PATHTOF(reticles\sos-reticleMLR_ca.paa));
GVAR(ReticleNight) = QUOTE(PATHTOF(reticles\sos-reticleMLRIllum_ca.paa));
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_optic_SOS_2D";
displayName = "$STR_ACE_optic_sos";
@ -232,11 +237,6 @@ class CfgWeapons {
};
class ACE_optic_SOS_PIP: ACE_optic_SOS_2D {
GVAR(BodyDay) = QUOTE(PATHTOF(reticles\sos-body_ca.paa));
GVAR(BodyNight) = QUOTE(PATHTOF(reticles\sos-bodyNight_ca.paa));
GVAR(ReticleDay) = QUOTE(PATHTOF(reticles\sos-reticleMLR_ca.paa));
GVAR(ReticleNight) = QUOTE(PATHTOF(reticles\sos-reticleMLRIllum_ca.paa));
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_optic_SOS_PIP";
scopeArsenal = 1;

4
addons/optics/functions/fnc_handleFired.sqf
View File

@ -52,7 +52,7 @@ _scopeShiftY = _recoilCoef * linearConversion [0, 1, random 1, SCOPE_SHIFT_Y_MIN
private ["_sizeX", "_sizeY"];
_sizeX = (0.75+_recoilScope)/(getResolution select 5);
_sizeY = _sizeX*safezoneW/safezoneH;
_sizeY = _sizeX*safezoneW/safezoneH*(16/9)/(getResolution select 4);
private "_positionReticle";
_positionReticle = [
@ -83,7 +83,7 @@ _positionBody = [
// Bring them all back
_sizeX = 0.75/(getResolution select 5);
_sizeY = _sizeX*safezoneW/safezoneH;
_sizeY = _sizeX*safezoneW/safezoneH*(16/9)/(getResolution select 4);
_positionReticle = [
safezoneX+0.5*safezoneW-0.5*_sizeX,

2
addons/optics/functions/fnc_onDrawScope2D.sqf
View File

@ -39,7 +39,7 @@ _nightOpacity = [1,0] select (_dayOpacity == 1);
// Apply lighting and make layers visible
(_display displayCtrl 1713001) ctrlSetTextColor [1,1,1,1];
(_display displayCtrl 1713002) ctrlSetTextColor [1,1,1,_nightOpacity];
(_display displayCtrl 1713002) ctrlSetTextColor [1,1,1,[0,1] select (_dayOpacity < 0.5)];
(_display displayCtrl 1713005) ctrlSetTextColor [1,1,1,_dayOpacity];
(_display displayCtrl 1713006) ctrlSetTextColor [1,1,1,_nightOpacity];

2
addons/reloadlaunchers/functions/fnc_load.sqf
View File

@ -32,7 +32,7 @@ private ["_onSuccess", "_onFailure", "_condition"];
_onSuccess = {
(_this select 0 select 0) removeMagazine (_this select 0 select 3);
["reloadLauncher", _this select 0 select 0, _this select 0] call DEFUNC(common,targetEvent);
["reloadLauncher", _this select 0 select 1, _this select 0] call DEFUNC(common,targetEvent);
[localize "STR_ACE_ReloadLaunchers_LauncherLoaded"] call DEFUNC(common,displayTextStructured);
};

4
tools/make.py
View File

@ -535,6 +535,10 @@ See the make.cfg file for additional build options.
else:
old_sha = ""
#We always build ACE_common so we can properly show the correct version stamp in the RPT file.
if module == "common":
old_sha = ""
# Hash the module
new_sha = get_directory_hash(os.path.join(module_root, module))

4
tools/make64.py
View File

@ -535,6 +535,10 @@ See the make.cfg file for additional build options.
else:
old_sha = ""
#We always build ACE_common so we can properly show the correct version stamp in the RPT file.
if module == "common":
old_sha = ""
# Hash the module
new_sha = get_directory_hash(os.path.join(module_root, module))