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 remote-tracking branch 'origin/master' into medical-rewrite

Browse Source
This commit is contained in:
commy2 2016-10-06 10:20:10 +02:00
commit 853c7db1dc
13 changed files with 170 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/XEH_PREP.hpp
View File

@ -7,6 +7,8 @@ PREP(addToInventory);
PREP(assignedItemFix);
PREP(assignObjectsInList);
PREP(ambientBrightness);
PREP(arithmeticGetResult);
PREP(arithmeticSetSource);
PREP(ASLToPosition);
PREP(binarizeNumber);
PREP(blurScreen);

69
addons/common/functions/fnc_arithmeticGetResult.sqf Normal file
View File

@ -0,0 +1,69 @@
/*
* Author: PabstMirror
* Gets arithmetic result from a set.
*
* Arguments:
* 0: Namespace <OBJECT><LOCATION><MISSIONNAMESPACE>
* 1: Number Set ID <STRING>
* 2: Operation (sum, product, min, max, avg) <STRING>
*
* Return Value:
* <NUMBER>
*
* Example:
* [ace_player, "ace_aimCoefficents", "product"] call ace_common_fnc_arithmeticGetResult
* [missionNameSpace, "ace_hearing", "min"] call ace_common_fnc_arithmeticGetResult
*
* Public: Yes
*/
// #define DEBUG_MODE_FULL
#include "script_component.hpp"
params ["_namespace", "_setID", "_op"];
TRACE_3("params",_namespace,_setID,_op);
private _data = (_namespace getVariable _setID) param [2, []];
switch (_op) do {
case ("sum"): {
private _result = 0;
{
_result = _result + (call _x);
nil
} count _data;
_result // return
};
case ("product"): {
private _result = 1;
{
_result = _result * (call _x);
nil
} count _data;
_result // return
};
case ("min"): {
private _result = 1e99;
{
_result = _result min (call _x);
nil
} count _data;
_result // return
};
case ("max"): {
private _result = -1e99;
{
_result = _result max (call _x);
nil
} count _data;
_result // return
};
case ("avg"): {
private _result = 0;
{
_result = _result + (call _x);
nil
} count _data;
_result / (count _data); // return
};
default {3735928559};
};

39
addons/common/functions/fnc_arithmeticSetSource.sqf Normal file
View File

@ -0,0 +1,39 @@
/*
* Author: PabstMirror
* Adds or removes a source to an arithmetic set.
*
* Arguments:
* 0: Namespace <OBJECT><LOCATION><MISSIONNAMESPACE>
* 1: Number Set ID <STRING>
* 2: Source <STRING>
* 3: Code that returns a number (can access var _namespace) [use {} to remove] <CODE>
*
* Return Value:
* Nothing
*
* Example:
* [missionNameSpace, "ace_hearing", "myMission", {0.5}] call ace_common_fnc_arithmeticSetSource
* [ace_player, "ace_aimCoefficents", "ace_medical", {linearConversion [0,1,(_namespace getVariable "ace_medical_pain",1,0.2,true]}] call ace_common_fnc_arithmeticSetSource
*
* Public: Yes
*/
// #define DEBUG_MODE_FULL
#include "script_component.hpp"
params ["_namespace", "_setID", "_source", "_variable"];
TRACE_4("params",_namespace,_setID,_source,_variable);
private _hash = _namespace getVariable _setID;
if (isNil "_hash") then {
_hash = [] call CBA_fnc_hashCreate;
_namespace setVariable [_setID, _hash];
};
if (_variable isEqualTo {}) then {
TRACE_1("removing",_source);
[_hash, _source] call CBA_fnc_hashRem;
} else {
TRACE_2("adding",_source,_variable);
[_hash, _source, _variable] call CBA_fnc_hashSet;
};
nil

11
addons/common/functions/fnc_checkFiles.sqf
View File

@ -21,10 +21,15 @@ INFO_1("ACE is version %1.",_version);
//CBA Versioning check - close main display if using incompatible version
private _cbaVersionAr = getArray (configFile >> "CfgPatches" >> "cba_main" >> "versionAr");
private _cbaRequiredAr = (getArray (configFile >> "CfgSettings" >> "CBA" >> "Versioning" >> "ACE" >> "dependencies" >> "CBA")) select 1;
INFO_2("CBA is version %1 [min required %2]",_cbaVersionAr,_cbaRequiredAr);
private _cbaRequiredAr = getArray (configFile >> "CfgSettings" >> "CBA" >> "Versioning" >> "ACE" >> "dependencies" >> "CBA") select 1;
private _cbaVersionStr = _cbaVersionAr joinString ".";
private _cbaRequiredStr = _cbaRequiredAr joinString ".";
INFO_2("CBA is version %1 (min required %2)",_cbaVersionStr,_cbaRequiredStr);
if ([_cbaRequiredAr, _cbaVersionAr] call cba_versioning_fnc_version_compare) then {
private _errorMsg = format ["CBA Version [%1] is outdated [required %2]", _cbaVersionAr, _cbaRequiredAr];
private _errorMsg = format ["CBA version %1 is outdated (required %2)", _cbaVersionStr, _cbaRequiredStr];
ERROR(_errorMsg);
if (hasInterface) then {
["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);

12
addons/common/functions/script_component.hpp
View File

@ -1,13 +1 @@
#include "\z\ace\addons\common\script_component.hpp"
#define VALIDHASH(hash) (IS_ARRAY(hash) && {(count hash) >= 2} && {IS_ARRAY(hash select 0)} && {IS_ARRAY(hash select 1)})
#define ERROR(msg) throw msg + format[" @ %1:%2", _callFrom, _lineNo]
#define HANDLECATCH diag_log text _exception; assert(exception=="")
#define ERRORDATA(c) private ["_callFrom", "_lineNo"];\
_callFrom = "";\
_lineNo = -1;\
if((count _this) > c) then {\
_callFrom = _this select c;\
_lineNo = _this select c+1;\
};

4
docs/css/app.css
View File

File diff suppressed because one or more lines are too long

6
docs/js/footer.dev.js
View File

@ -5191,6 +5191,12 @@ jQuery(document).ready(function(){
}
}
var $tables = $("#content table");
$tables.each(function(index, item) {
var $table = $(item);
$table.wrap("<div class=\"table-wrapper\">")
});
});
window.app = window.app || {};

12
docs/js/footer.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/js/footer.min.js.map
View File

File diff suppressed because one or more lines are too long

6
docs/src/js/app.js
View File

@ -35,6 +35,12 @@ jQuery(document).ready(function(){
}
}
var $tables = $("#content table");
$tables.each(function(index, item) {
var $table = $(item);
$table.wrap("<div class=\"table-wrapper\">")
});
});
window.app = window.app || {};

5
docs/src/scss/app.scss
View File

@ -63,5 +63,6 @@
@import "ui/video";
@import "ui/icons";
@import "ui/toc";
@import "ui/_search";
@import "ui/_articles";
@import "ui/search";
@import "ui/articles";
@import "ui/table";

6
docs/src/scss/ui/_table.scss Normal file
View File

@ -0,0 +1,6 @@
.table-wrapper {
width: 100%;
overflow-y: auto;
_overflow: auto;
margin: 0 0 1em;
}

24
optionals/compat_rhs_usf3/CfgVehicles.hpp
View File

@ -111,6 +111,12 @@ class CfgVehicles {
};
};
};
class Air;
class Helicopter: Air {
class Turrets {
class MainTurret;
};
};
class MBT_01_base_F: Tank_F {};
class rhsusf_m1a1tank_base: MBT_01_base_F {
@ -143,7 +149,6 @@ class CfgVehicles {
ace_repair_hitpointGroups[] = {{"era_1_hitpoint", {"era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint", "era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint", "era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", "era_16_hitpoint", "era_17_hitpoint", "era_18_hitpoint", "era_19_hitpoint", "era_20_hitpoint", "era_21_hitpoint", "era_22_hitpoint", "era_23_hitpoint", "era_24_hitpoint", "era_25_hitpoint", "era_26_hitpoint", "era_27_hitpoint", "era_28_hitpoint", "era_29_hitpoint", "era_30_hitpoint", "era_31_hitpoint", "era_32_hitpoint", "era_33_hitpoint", "era_34_hitpoint", "era_35_hitpoint", "era_36_hitpoint", "era_37_hitpoint", "era_38_hitpoint", "era_39_hitpoint", "era_40_hitpoint", "era_41_hitpoint", "era_42_hitpoint", "era_43_hitpoint", "era_44_hitpoint", "era_45_hitpoint", "era_46_hitpoint"}}};
};
class Helicopter;
class Helicopter_Base_F: Helicopter {
class Eventhandlers;
};
@ -254,14 +259,29 @@ class CfgVehicles {
};
};
class Heli_Attack_01_base_F;
class Heli_Attack_01_base_F: Helicopter_Base_F {};
class RHS_AH1Z_base: Heli_Attack_01_base_F {
EGVAR(refuel,fuelCapacity) = 1600;
};
class RHS_AH1Z: RHS_AH1Z_base {
class Turrets: Turrets {
class MainTurret: MainTurret {
ace_fcs_Enabled = 0;
};
};
};
class RHS_AH64_base: Heli_Attack_01_base_F {
EGVAR(refuel,fuelCapacity) = 1420;
};
class RHS_AH64D: RHS_AH64_base {
class Turrets: Turrets {
class MainTurret: MainTurret {
ace_fcs_Enabled = 0;
};
};
};
class MBT_01_arty_base_F;
class rhsusf_m109tank_base: MBT_01_arty_base_F {