" + localize "STR_AGM_Medical_PatientNoPainkillers" + " "};
-});
-
-// Pain
-_pain = _unit getVariable ["AGM_Pain", 0];
-_string = _string + (switch True do {
- case (_pain > 0.4): {"" + localize "STR_AGM_Medical_PatientHeavyPain" + ""};
- case (_pain > 0.1): {"" + localize "STR_AGM_Medical_PatientLightPain" + ""};
- default {localize "STR_AGM_Medical_PatientNoPain"};
-});
-
-_string = _string + "";
-[composeText [lineBreak, parseText _string]] call AGM_Medical_fnc_displayText;
diff --git a/TO_MERGE/agm/Medical/functions/fn_displayText.sqf b/TO_MERGE/agm/Medical/functions/fn_displayText.sqf
deleted file mode 100644
index 3fbaf4ee3e..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_displayText.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Author: commy2
- *
- * Display a structured text. Used for medical diagnose.
- *
- * Argument:
- * 0: Diagnosis (Text)
- *
- * Return value:
- * Nothing
- */
-
-private ["_text", "_ctrlHint"];
-
-_text = _this select 0;
-
-("AGM_RscHint" call BIS_fnc_rscLayer) cutRsc ["AGM_Medical_RscHint", "PLAIN", 0, true];
-
-disableSerialization;
-_ctrlHint = uiNamespace getVariable "AGM_ctrlHint";
-_ctrlHint ctrlSetStructuredText _text;
diff --git a/TO_MERGE/agm/Medical/functions/fn_handleDamage.sqf b/TO_MERGE/agm/Medical/functions/fn_handleDamage.sqf
deleted file mode 100644
index 52f96f8d94..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_handleDamage.sqf
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Called when some dude gets shot. Or stabbed. Or blown up. Or pushed off a cliff. Or hit by a car. Or burnt. Or poisoned. Or gassed. Or cut. You get the idea.
- *
- * Arguments:
- * 0: Unit that got hit (Object)
- * 1: Name of the selection that was hit (String); "" for structural damage
- * 2: Amount of damage inflicted (Number)
- * 3: Shooter (Object); Null for explosion damage, falling, fire etc.
- * 4: Projectile (Object or String)
- *
- * Return value:
- * Damage value to be inflicted (optional)
- */
-
-#define UNCONSCIOUSNESSTRESHOLD 0.6
-
-#define PAINKILLERTRESHOLD 0.1
-#define PAINLOSS 0.0001
-
-#define BLOODTRESHOLD1 0.35
-#define BLOODTRESHOLD2 0
-#define BLOODLOSSRATE 0.04
-
-#define ARMOURCOEF 2
-
-private ["_unit", "_selectionName", "_damage", "_source", "_source", "_projectile", "_hitSelections", "_hitPoints", "_newDamage", "_found", "_cache_projectiles", "_cache_hitpoints", "_cache_damages"];
-
-_unit = _this select 0;
-_selectionName = _this select 1;
-_damage = _this select 2;
-_source = _this select 3;
-_projectile = _this select 4;
-
-if (!local _unit) exitWith {nil}; //if not local, then return value shouldn't have any effect
-
-if (typeName _projectile == "OBJECT") then {
- _projectile = typeOf _projectile;
-};
-
-// Prevent unnecessary processing
-if (damage _unit >= 1) exitWith {};
-
-_unit setVariable ["AGM_isDiagnosed", False, True];
-
-// @todo: figure out if this still applies.
-
-// For some reason, everything is backwards in MP,
-// so we need to untangle some things.
-// -- seems fixed as of v1.36
-/*if (isMultiplayer) then {
- _selectionName = switch (_selectionName) do {
- case "hand_r" : {"leg_l"};
- case "leg_r" : {"hand_l"};
- case "legs" : {"hand_r"};
- default {_selectionName};
- };
-};*/
-
-// This seems to only show up in MP too, but since it doesn't
-// collide with anything, I'll check it in SP as well.
-if (_selectionName == "r_femur_hit") then {
- _selectionName = "leg_r";
-};
-
-_hitSelections = ["head", "body", "hand_l", "hand_r", "leg_l", "leg_r"];
-_hitPoints = ["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"];
-
-// If the damage is being weird, we just tell it to fuck off.
-// (Returning 0 seems to cause issues though, so return 0.01)
-if !(_selectionName in (_hitSelections + [""])) exitWith {0.01};
-
-// Calculate change in damage.
-_newDamage = _damage - (damage _unit);
-if (_selectionName in _hitSelections) then {
- _newDamage = _damage - (_unit getHitPointDamage (_hitPoints select (_hitSelections find _selectionName)));
-};
-
-// Finished with the current frame, reset variables
-// Note: sometimes handleDamage spans over 2 or even 3 frames.
-if (diag_frameno > (_unit getVariable ["AGM_Medical_FrameNo", -3]) + 2) then {
- _unit setVariable ["AGM_Medical_FrameNo", diag_frameno];
- _unit setVariable ["AGM_Medical_isFalling", False];
- _unit setVariable ["AGM_Medical_Projectiles", []];
- _unit setVariable ["AGM_Medical_HitPoints", []];
- _unit setVariable ["AGM_Medical_Damages", []];
- _unit setVariable ["AGM_Medical_PreventDeath", False];
- if (([_unit] call AGM_Core_fnc_isPlayer) or _unit getVariable ["AGM_allowUnconscious", False]) then {
- if (!(_unit getVariable ["AGM_isUnconscious", False]) and
- {_unit getVariable ["AGM_Medical_PreventInstaDeath", AGM_Medical_PreventInstaDeath]}) then {
- _unit setVariable ["AGM_Medical_PreventDeath", True];
- };
- if ((_unit getVariable ["AGM_isUnconscious", False]) and
- {_unit getVariable ["AGM_Medical_PreventDeathWhileUnconscious", AGM_Medical_PreventDeathWhileUnconscious]}) then {
- _unit setVariable ["AGM_Medical_PreventDeath", True];
- };
- };
-};
-
-_damage = _damage - _newDamage;
-
-if !(_unit getVariable ["AGM_allowDamage", True]) exitWith {_damage max 0.01};
-
-_newDamage = _newDamage * (_unit getVariable ["AGM_Medical_CoefDamage", AGM_Medical_CoefDamage]);
-
-// Exclude falling damage to everything other than legs; reduce structural damage.
-if (((velocity _unit) select 2 < -5) and (vehicle _unit == _unit)) then {
- _unit setVariable ["AGM_Medical_isFalling", True];
-};
-if (_unit getVariable "AGM_Medical_isFalling" and !(_selectionName in ["", "leg_l", "leg_r"])) exitWith {
- (_unit getHitPointDamage (_hitPoints select (_hitSelections find _selectionName))) max 0.01;
-};
-if (_unit getVariable "AGM_Medical_isFalling") then {
- _newDamage = _newDamage * 0.7;
-};
-
-// Increase damage for kinetic penetrators for people inside vehicles
-// to simulate hot spikey things flying around (generally unpleasant).
-// (only if AGM_Armour is used)
-if (isClass (configFile >> "CfgPatches" >> "AGM_Armour") and _projectile != "" and vehicle _unit != _unit) then {
- _hit = getNumber (configFile >> "CfgAmmo" >> _projectile >> "hit");
- if (_hit >= 100) then {
- _hit = linearConversion [100, 1000, _hit, 0, ARMOURCOEF, True];
- _newDamage = _newDamage * (1 + _hit);
- };
-};
-
-// Make sure there's only one damaged selection per projectile per frame.
-_cache_projectiles = _unit getVariable "AGM_Medical_Projectiles";
-_cache_hitpoints = _unit getVariable "AGM_Medical_HitPoints";
-_cache_damages = _unit getVariable "AGM_Medical_Damages";
-if (_selectionName != "" and !(_unit getVariable "AGM_Medical_isFalling")) then {
- if (_projectile in _cache_projectiles) then {
- _index = _cache_projectiles find _projectile;
- _otherDamage = (_cache_damages select _index);
- if (_otherDamage > _newDamage) then {
- _newDamage = 0;
- } else {
- _hitPoint = _cache_hitpoints select _index;
- _restore = ((_unit getHitPointDamage _hitPoint) - _otherDamage) max 0;
- _unit setHitPointDamage [_hitPoint, _restore];
- // Make entry unfindable
- _cache_projectiles set [_index, objNull];
- _cache_projectiles pushBack _projectile;
- _cache_hitpoints pushBack (_hitPoints select (_hitSelections find _selectionName));
- _cache_damages pushBack _newDamage;
- };
- } else {
- _cache_projectiles pushBack _projectile;
- _cache_hitpoints pushBack (_hitPoints select (_hitSelections find _selectionName));
- _cache_damages pushBack _newDamage;
- };
-};
-_unit setVariable ["AGM_Medical_Projectiles", _cache_projectiles];
-_unit setVariable ["AGM_Medical_HitPoints", _cache_hitpoints];
-_unit setVariable ["AGM_Medical_Damages", _cache_damages];
-
-// we want to move damage to another selection; have to do it ourselves.
-// this is only the case for limbs, so this will not impact the killed EH.
-if (_selectionName != (_this select 1)) then {
- _unit setHitPointDamage [_hitPoints select (_hitSelections find _selectionName), _damage + _newDamage];
- _newDamage = 0;
-};
-
-_damage = _damage + _newDamage;
-
-// Assign orphan structural damage to torso;
-// using spawn with custom damage handling here, but since I just
-// move damage, this shouldn't be any issue for the Killed EH
-_unit spawn {
- sleep 0.001;
-
- _damagesum = (_this getHitPointDamage "HitHead")
- + (_this getHitPointDamage "HitBody")
- + (_this getHitPointDamage "HitLeftArm")
- + (_this getHitPointDamage "HitRightArm")
- + (_this getHitPointDamage "HitLeftLeg")
- + (_this getHitPointDamage "HitRightLeg");
- if (_damagesum <= 0.06 and (damage _this) > 0.01) then {
- _damage = damage _this;
- _this setDamage 0;
- _this setHitPointDamage ["HitBody", (_damage min 0.89)]; // just to be sure.
- };
-};
-
-// Leg & Arm Damage
-_legdamage = (_unit getHitPointDamage "HitLeftLeg") + (_unit getHitPointDamage "HitRightLeg");
-if (_selectionName == "leg_l") then {
- _legdamage = _damage + (_unit getHitPointDamage "HitRightLeg");
-};
-if (_selectionName == "leg_r") then {
- _legdamage = (_unit getHitPointDamage "HitLeftLeg") + _damage;
-};
-
-_armdamage = (_unit getHitPointDamage "HitLeftArm") + (_unit getHitPointDamage "HitRightArm");
-if (_selectionName == "hand_l") then {
- _armdamage = _damage + (_unit getHitPointDamage "HitRightArm");
-};
-if (_selectionName == "hand_r") then {
- _armdamage = (_unit getHitPointDamage "HitLeftArm") + _damage;
-};
-
-[_unit, _legdamage, _armdamage] call AGM_Medical_fnc_checkDamage;
-
-// Unconsciousness
-if (_selectionName == "" and
- _damage >= UNCONSCIOUSNESSTRESHOLD and
- _damage < 1 and
- !(_unit getVariable ["AGM_isUnconscious", False]
- )) then {
- // random chance to kill AI instead of knocking them out, otherwise
- // there'd be shittons of unconscious people after every firefight,
- // causing executions. And nobody likes executions.
- if (_unit getVariable ["AGM_allowUnconscious", ([_unit] call AGM_Core_fnc_isPlayer) or random 1 > 0.5]) then {
- [_unit] call AGM_Medical_fnc_knockOut;
- } else {
- _damage = 1;
- };
-};
-
-// Bleeding
-if (_selectionName == "" and damage _unit == 0) then {
- _unit spawn {
- while {damage _this > 0 and damage _this < 1} do {
- if !([_this] call AGM_Medical_fnc_isInMedicalVehicle) then {
- _blood = _this getVariable ["AGM_Blood", 1];
- _blood = _blood - BLOODLOSSRATE * (_this getVariable ["AGM_Medical_CoefBleeding", AGM_Medical_CoefBleeding]) * (damage _this);
- _this setVariable ["AGM_Blood", _blood max 0, true];
- if (_blood <= BLOODTRESHOLD1 and !(_this getVariable ["AGM_isUnconscious", False])) then {
- [_this] call AGM_Medical_fnc_knockOut;
- };
- if (_blood <= BLOODTRESHOLD2 and {!AGM_Medical_PreventDeathWhileUnconscious}) then {
- //_this setDamage 1;
- _this setHitPointDamage ["HitHead", 1]; // fx: don't get the uniform bloody if there are no wounds
- };
- };
- sleep 10;
- };
- };
-};
-
-// Pain Reduction
-if (_unit getVariable ["AGM_Pain", 0] == 0) then {
- _unit spawn {
- while {_this getVariable ["AGM_Pain", 0] > 0} do {
- sleep 1;
- _pain = ((_this getVariable ["AGM_Pain", 0]) - 0.001) max 0;
- _this setVariable ["AGM_Pain", _pain, True];
- };
- };
-};
-// Set Pain
-_potentialPain = _damage * (_unit getVariable ["AGM_Painkiller", 1]);
-if ((_selectionName == "") and (_potentialPain > _unit getVariable ["AGM_Pain", 0])) then {
- _unit setVariable ["AGM_Pain", (_damage * (_unit getVariable ["AGM_Painkiller", 1])) min 1, True];
-};
-
-// again, using spawn, but there shouldn't be any death, so the killed EH should be fine.
-if ((_unit getVariable "AGM_Medical_PreventDeath") and {vehicle _unit != _unit} and {damage (vehicle _unit) >= 1}) then {
- _unit setPosATL [
- (getPos _unit select 0) + (random 3) - 1.5,
- (getPos _unit select 1) + (random 3) - 1.5,
- 0
- ];
- if !(_unit getVariable ["AGM_isUnconscious", False]) then {
- [_unit] call AGM_Medical_fnc_knockOut;
- };
- _unit setVariable ["AGM_allowDamage", False];
- _unit spawn {
- sleep 1;
- _this setVariable ["AGM_allowDamage", True];
- };
-};
-
-if ((_unit getVariable "AGM_Medical_PreventDeath")) then {
- if ((_damage > 0.89) && (_selectionName in ["", "head", "body"])) then { //only change damage on hits that would be lethal
- _damage = 0.89;
- [_unit, "preventedDeath", [_unit]] call AGM_Core_fnc_callCustomEventHandlersGlobal;
- if (!(_unit getVariable ["AGM_isUnconscious", False])) then {
- [_unit] call AGM_Medical_fnc_knockOut; //knockOut when taking damage that should be lethal
- };
- };
-};
-
-_damage
diff --git a/TO_MERGE/agm/Medical/functions/fn_init.sqf b/TO_MERGE/agm/Medical/functions/fn_init.sqf
deleted file mode 100644
index a8b3e9c5c1..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_init.sqf
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Author: KoffeinFlummi
-
-Do I really need to explain what this does?!
-*/
-
-_unit = _this select 0;
-
-if !(local _unit) exitWith {};
-
-_unit setVariable ["tf_globalVolume", 1];
-_unit setVariable ["tf_voiceVolume", 1, True];
-_unit setVariable ["tf_unable_to_use_radio", False, True];
-
-_unit setVariable ["acre_sys_core_isDisabled", False, True];
-_unit setVariable ["acre_sys_core_globalVolume", 1];
-
-if ("AGM_Unconscious" in ([_unit] call AGM_Core_fnc_getCaptivityStatus)) then {
- [_unit, "AGM_Unconscious", false] call AGM_Core_fnc_setCaptivityStatus;
-};
-
-_unit setVariable ["AGM_isDiagnosed", False, True]; // Is the unit diagnosed?
-_unit setVariable ["AGM_canTreat", True, False]; // Can unit treat others?
-_unit setVariable ["AGM_isTreatable", True, True]; // Can unit be treated/diagnosed?
-
-_unit setVariable ["AGM_Blood", 1, True]; // Amount of blood in the body.
-_unit setVariable ["AGM_isBleeding", False, True]; // Is the unit losing blood? (Rate is determined by damage.)
-_unit setVariable ["AGM_Painkiller", 1, True]; // How much painkillers the guy is on. (smaller = more)
-_unit setVariable ["AGM_Pain", 0, True]; // Amount of pain the unit is in.
-
-_unit setVariable ["AGM_isUnconscious", False, True]; // figure it out
-_unit setVariable ["AGM_Unconscious", False, True]; // deprecated since v0.95
-_unit setVariable ["AGM_isOverdosing", False];
-_unit setVariable ["AGM_Transporting", objNull];
-
-if !(_unit getVariable ["AGM_NoRadio_isMuted", false]) then {
- [_unit] call AGM_Core_fnc_unmuteUnit;
-};
-
-_unit spawn {
- while {alive _this} do {
- [_this] call AGM_Medical_fnc_itemCheck;
- sleep 1;
- };
-};
diff --git a/TO_MERGE/agm/Medical/functions/fn_isDiagnosed.sqf b/TO_MERGE/agm/Medical/functions/fn_isDiagnosed.sqf
deleted file mode 100644
index c40b449e42..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_isDiagnosed.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Checks if a unit is diagnosed and if that's even necessary.
- *
- * Arguments:
- * 0: Unit to be treated.
- *
- * Return Value:
- * Is unit diagnosed? (Bool)
- */
-
-private ["_unit"];
-
-_unit = _this select 0;
-
-if !(AGM_player getVariable ["AGM_Medical_RequireDiagnosis", AGM_Medical_RequireDiagnosis]) exitWith {true};
-if !(_unit getVariable ["AGM_isUnconscious", False]) exitWith {true};
-
-(_unit getVariable ["AGM_isDiagnosed", True])
diff --git a/TO_MERGE/agm/Medical/functions/fn_isInMedicalVehicle.sqf b/TO_MERGE/agm/Medical/functions/fn_isInMedicalVehicle.sqf
deleted file mode 100644
index f13cbf6b0e..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_isInMedicalVehicle.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Checks if a unit is in a medical vehicle.
- *
- * Arguments:
- * 0: unit to be checked (object)
- *
- * Return Value:
- * Bool: is unit in medical vehicle?
- */
-
-private ["_unit", "_vehicle"];
-
-_unit = _this select 0;
-_vehicle = vehicle _unit;
-
-if (_unit == _vehicle) exitWith {false};
-if (_unit in [driver _vehicle, gunner _vehicle, commander _vehicle]) exitWith {false};
-
-_vehicle getVariable ["AGM_isMedic", getNumber (configFile >> "CfgVehicles" >> typeOf _vehicle >> "attendant") == 1]
diff --git a/TO_MERGE/agm/Medical/functions/fn_itemCheck.sqf b/TO_MERGE/agm/Medical/functions/fn_itemCheck.sqf
deleted file mode 100644
index f9efc6826b..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_itemCheck.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Checks the inventory of the unit and replaces items if necessary.
- *
- * Arguments:
- * 0: Unit
- *
- * Return Value:
- * None
- */
-
-_unit = _this select 0;
-
-while {count (itemsWithMagazines _unit) > count (itemsWithMagazines _unit - ["FirstAidKit"])} do {
- _unit removeItem "FirstAidKit";
- _unit addItem "AGM_Bandage";
- _unit addItem "AGM_Bandage";
- _unit addItem "AGM_Morphine";
-};
-while {count (itemsWithMagazines _unit) > count (itemsWithMagazines _unit - ["Medikit"])} do {
- _unit removeItem "Medikit";
- _unit addItemToBackpack "AGM_Epipen";
- _unit addItemToBackpack "AGM_Epipen";
- _unit addItemToBackpack "AGM_Epipen";
- _unit addItemToBackpack "AGM_Epipen";
- _unit addItemToBackpack "AGM_Bloodbag";
- _unit addItemToBackpack "AGM_Bloodbag";
-};
diff --git a/TO_MERGE/agm/Medical/functions/fn_knockOut.sqf b/TO_MERGE/agm/Medical/functions/fn_knockOut.sqf
deleted file mode 100644
index 2842c17cdb..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_knockOut.sqf
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * By: KoffeinFlummi
- *
- * Knocks the given player out.
- *
- * Arguments:
- * 0: Unit to be knocked out
- * 1: Duration of knockout (optional)
- * (if not set or set to -1, value depending on damage is chosen)
- *
- * Return Values:
- * None
- */
-
-private ["_unit", "_duration", "_deadman", "_newGroup", "_wakeUpTimer", "_unconsciousnessTimer"];
-
-_unit = _this select 0;
-_duration = -1;
-if (count _this > 1) then {
- _duration = _this select 1;
-};
-
-//if (_unit getVariable ["AGM_isCaptive", False]) exitWith {_unit setDamage 1};
-if (_unit getVariable ["AGM_isUnconscious", False]) exitWith {};
-
-// If an AI unit shoots a player, hand it off to him to calculate things.
-// Puts less strain on the server.
-if (!(local _unit) and ([_unit] call AGM_Core_fnc_isPlayer)) exitWith {
- [_this, "AGM_Medical_fnc_knockOut", _unit] call AGM_Core_fnc_execRemoteFnc;
-};
-
-if (!([_unit] call AGM_Core_fnc_isPlayer) && {vehicle _unit != _unit}) exitWith {};
-
-_unit setVariable ["AGM_Unconscious", True, True]; // deprecated since 0.95
-_unit setVariable ["AGM_isUnconscious", True, True];
-_unit setVariable ["AGM_canTreat", False, True];
-
-_unit setVariable ["tf_globalVolume", 0.4];
-_unit setVariable ["tf_voiceVolume", 0, True];
-_unit setVariable ["tf_unable_to_use_radio", True, True];
-
-_unit setVariable ["acre_sys_core_isDisabled", True, True];
-_unit setVariable ["acre_sys_core_globalVolume", 0.4];
-
-if (_unit == AGM_player) then {
- if (visibleMap) then {openMap false};
- closeDialog 0;
- call AGM_Interaction_fnc_hideMenu;
-
- [True, True] call AGM_Core_fnc_disableUserInput;
-};
-
-[_unit, "AGM_Unconscious", True] call AGM_Core_fnc_setCaptivityStatus;
-
-_unit disableAI "MOVE";
-//_unit disableAI "ANIM";
-_unit disableAI "TARGET";
-_unit disableAI "AUTOTARGET";
-_unit disableAI "FSM";
-_unit disableConversation true;
-
-if !(_unit getVariable ["AGM_NoRadio_isMuted", false]) then {
- [_unit] call AGM_Core_fnc_muteUnit;
-};
-
-// play appropriate anim
-private "_fnc_playAnim";
-_fnc_playAnim = {
- if (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> animationState _this >> "AGM_isLadder") == 1) then {
- _this action ["LadderOff", nearestObject [position _this, "House"]];
- };
-
- waitUntil {isTouchingGround _this};
- waitUntil {!([_this] call AGM_Core_fnc_inTransitionAnim) or !(alive _this)};
- if !(alive _this and _this getVariable "AGM_isUnconscious") exitWith {};
- [_this, "Unconscious", 1, True] call AGM_Core_fnc_doAnimation;
- sleep 2;
- if (animationState _this != "Unconscious" and _this getVariable ["AGM_isUnconscious", False]) then {
- [_this, "Unconscious", 2, True] call AGM_Core_fnc_doAnimation;
- };
-};
-
-if (vehicle _unit != _unit) then {
- _unit setVariable ["AGM_OriginalAnim", animationState _unit, True];
- [
- _unit,
- ((configFile >> "CfgMovesMaleSdr" >> "States" >> animationState _unit >> "interpolateTo") call BIS_fnc_getCfgData) select 0,
- 1,
- True
- ] call AGM_Core_fnc_doAnimation;
-
- // handle parachute
- if (vehicle _unit isKindOf "ParachuteBase") then {
- _unit spawn _fnc_playAnim;
- };
-} else {
- _unit spawn _fnc_playAnim;
-};
-
-// wake up unit after certain amount of time
-if (_duration != -1 or _unit getVariable ["AGM_Medical_AutomaticWakeup", AGM_Medical_AutomaticWakeup]) then {
- _wakeUpTimer = [_unit, _duration] spawn {
- _unit = _this select 0;
- _duration = _this select 1;
- if (_duration != -1) then {
- sleep _duration;
- } else {
- sleep (60 * (1 + (random 8)) * ((damage _unit) max 0.5));
- };
- if (!isNull _unit && {alive _unit}) then {
- [_unit] call AGM_Medical_fnc_wakeUp;
- };
- };
-};
-_unit setVariable ["AGM_WakeUpTimer", _wakeUpTimer];
-
-// kill unit if the max uncon. time module option is used
-_unconsciousnessTimer = [_unit] spawn {
- _unit = _this select 0;
- if (AGM_Medical_MaxUnconsciousnessTime >= 0) then {
- sleep AGM_Medical_MaxUnconsciousnessTime;
- if !(scriptDone (_unit getVariable "AGM_WakeUpTimer")) then {
- terminate (_unit getVariable "AGM_WakeUpTimer");
- };
- _unit setDamage 1;
- };
-};
-_unit setVariable ["AGM_UnconsciousnessTimer", _unconsciousnessTimer];
-
-[_unit, "knockedOut", [_unit]] call AGM_Core_fnc_callCustomEventHandlersGlobal;
diff --git a/TO_MERGE/agm/Medical/functions/fn_loadIntoVehicle.sqf b/TO_MERGE/agm/Medical/functions/fn_loadIntoVehicle.sqf
deleted file mode 100644
index 88474850ba..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_loadIntoVehicle.sqf
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Loads the carried/dragged unit into a vehicle for transport.
- *
- * Arguments:
- * 0: The unit that does the loading
- * 1: The vehicle
- *
- * Return Value:
- * -
- */
-
-private ["_unit", "_target", "_vehicle"];
-
-_unit = _this select 0;
-_vehicle = _this select 1;
-_target = _unit getVariable ["AGM_Transporting", objNull];
-
-if (count _this < 3 and {!(local _target)}) exitWith {
- [_this + [_target], "AGM_Medical_fnc_loadIntoVehicle", _target] call AGM_Core_fnc_execRemoteFnc;
-};
-
-if (count _this > 2) then {
- _target = _this select 2;
-};
-
-_unit setVariable ["AGM_Transporting", objNull, True];
-
-detach _target;
-_target moveInCargo _vehicle;
-_target assignAsCargo _vehicle;
-
-[_unit, "", 2, True] call AGM_Core_fnc_doAnimation;
-_target spawn {
- sleep 0.5;
- _this setVariable ["AGM_OriginalAnim", animationState _this, True];
- [
- _this,
- ((configFile >> "CfgMovesMaleSdr" >> "States" >> animationState _this >> "interpolateTo") call BIS_fnc_getCfgData) select 0,
- 2,
- True
- ] call AGM_Core_fnc_doAnimation;
-};
-
-_unit removeWeapon "AGM_FakePrimaryWeapon";
-_unit setVariable ["AGM_canTreat", True, True];
-_target setVariable ["AGM_isTreatable", True, True];
diff --git a/TO_MERGE/agm/Medical/functions/fn_module.sqf b/TO_MERGE/agm/Medical/functions/fn_module.sqf
deleted file mode 100644
index 740e78c655..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_module.sqf
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Initializes the medical module.
- *
- * Arguments:
- * Whatever the module provides. (I dunno.)
- *
- * Return Value:
- * None
- */
-
-private ["_logic", "_units", "_activated"];
-
-if !(isServer) exitWith {};
-
-_logic = _this select 0;
-_units = _this select 1;
-_activated = _this select 2;
-
-if !(_activated) exitWith {};
-
-AGM_Medical_Module = True;
-
-AGM_Medical_MEDEVACTriggers = [synchronizedObjects _logic, {triggerType _this != ""}] call AGM_Core_fnc_filter;
-publicVariable "AGM_Medical_MEDEVACTriggers";
-AGM_Medical_MEDEVACVehicles = _units;
-publicVariable "AGM_Medical_MEDEVACVehicles";
-
-[_logic, "AGM_Medical_CoefDamage", "CoefDamage" ] call AGM_Core_fnc_readNumericParameterFromModule;
-[_logic, "AGM_Medical_CoefBleeding", "CoefBleeding" ] call AGM_Core_fnc_readNumericParameterFromModule;
-[_logic, "AGM_Medical_CoefPain", "CoefPain" ] call AGM_Core_fnc_readNumericParameterFromModule;
-[_logic, "AGM_Medical_CoefNonMedic", "CoefNonMedic" ] call AGM_Core_fnc_readNumericParameterFromModule;
-[_logic, "AGM_Medical_MaxUnconsciousnessTime", "MaxUnconsciousnessTime" ] call AGM_Core_fnc_readNumericParameterFromModule;
-
-[_logic, "AGM_Medical_AllowNonMedics", "AllowNonMedics" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_RequireDiagnosis", "RequireDiagnosis" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_PreventInstaDeath", "PreventInstaDeath" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_PreventDeathWhileUnconscious", "PreventDeathWhileUnconscious"] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_SingleBandage", "SingleBandage" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_AllowChatWhileUnconscious", "AllowChatWhileUnconscious" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_EnableOverdosing", "EnableOverdosing" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_RequireMEDEVAC", "RequireMEDEVAC" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_AutomaticWakeup", "AutomaticWakeup" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-[_logic, "AGM_Medical_DisableScreams", "DisableScreams" ] call AGM_Core_fnc_readBooleanParameterFromModule;
-
-diag_log text "[AGM]: Medical Module Initialized.";
diff --git a/TO_MERGE/agm/Medical/functions/fn_overdose.sqf b/TO_MERGE/agm/Medical/functions/fn_overdose.sqf
deleted file mode 100644
index 0ac18af6bc..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_overdose.sqf
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Kills the given unit with a morphine overdose.
- *
- * Arguments:
- * 0: Unit
- *
- * Return Value:
- * None
- */
-
-_unit = _this select 0;
-
-if (!AGM_Medical_EnableOverdosing) exitWith {};
-
-if !(local _unit) exitWith {
- [_this, "AGM_Medical_fnc_overdose", _unit] call AGM_Core_fnc_execRemoteFnc;
-};
-
-if !(_unit getVariable ["AGM_isUnconscious", False]) then {
- [_unit, 99999] call AGM_Medical_fnc_knockOut;
-} else {
- if !(scriptDone (_unit getVariable "AGM_WakeUpTimer")) then {
- terminate (_unit getVariable "AGM_WakeUpTimer");
- };
-};
-
-_unit playAction "GestureSpasm4";
-
-_unit spawn {
- sleep 20;
- [_this, "HitHead", 1, True] call AGM_Medical_fnc_setHitPointDamage;
-};
diff --git a/TO_MERGE/agm/Medical/functions/fn_release.sqf b/TO_MERGE/agm/Medical/functions/fn_release.sqf
deleted file mode 100644
index 739e2bdc3e..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_release.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Releases the given unit.
- *
- * Argument:
- * 0: Unit to be released (Object)
- *
- * Return value:
- * none
- */
-
-#define ANIM_DRAG ["amovpercmstpslowwrfldnon_acinpknlmwlkslowwrfldb_2", "amovpercmstpsraswpstdnon_acinpknlmwlksnonwpstdb_2", "amovpercmstpsnonwnondnon_acinpknlmwlksnonwnondb_2", "acinpknlmstpsraswrfldnon", "acinpknlmstpsnonwpstdnon", "acinpknlmstpsnonwnondnon"]
-
-private ["_unit", "_target"];
-
-_unit = _this select 0;
-_target = _this select 1;
-
-_unit removeWeapon "AGM_FakePrimaryWeapon";
-_unit setVariable ["AGM_Transporting", objNull, True];
-_unit setVariable ["AGM_canTreat", true, false];
-_target setVariable ["AGM_isTreatable", True, True];
-
-detach _target;
-
-_unit removeAction (_unit getVariable "AGM_Medical_ReleaseID");
-
-// animation was already handled by fnc_loadIntoVehicle
-if (vehicle _target != _target) exitWith {};
-
-if (vehicle _unit == _unit) then {
- if (animationState _unit in ANIM_DRAG) then {
- _unit playAction "released";
- } else {
- [_unit, "", 2, True] call AGM_Core_fnc_doAnimation;
- };
-};
-if (_target getVariable ["AGM_isUnconscious", False]) then {
- [_target, "Unconscious", 2, True] call AGM_Core_fnc_doAnimation;
-};
diff --git a/TO_MERGE/agm/Medical/functions/fn_scream.sqf b/TO_MERGE/agm/Medical/functions/fn_scream.sqf
deleted file mode 100644
index 7f20f1f05b..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_scream.sqf
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * AAAAAAAAAAAAAAAAAARRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRGH
- *
- * Arguments:
- * 0: Unit to scream
- *
- * Return Value:
- * loud noises
- */
-
-private ["_unit", "_screams", "_position"];
-
-if (AGM_Medical_DisableScreams) exitWith {};
-
-_unit = _this select 0;
-
-_screams = [
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_01.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_02.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_03.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_04.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_05.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_06.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_07.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_08.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_09.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_10.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_11.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_12.wss",
- "A3\sounds_f\characters\human-sfx\Person0\P0_hit_13.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_01.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_02.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_03.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_04.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_05.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_06.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_07.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_08.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_09.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_10.wss",
- "A3\sounds_f\characters\human-sfx\Person1\P1_hit_11.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_01.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_02.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_03.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_04.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_05.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_06.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_07.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_08.wss",
- "A3\sounds_f\characters\human-sfx\Person2\P2_hit_09.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_01.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_02.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_03.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_04.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_05.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_06.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_07.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_08.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_09.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_10.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_11.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_12.wss",
- "A3\sounds_f\characters\human-sfx\Person3\P3_hit_13.wss"
-];
-
-_position = _unit modelToWorld (_unit selectionPosition "Head");
-_position set [2, (_position select 2) + ((getPosASLW _unit select 2) - (getPosATL _unit select 2) max 0)];
-
-playSound3D [
- _screams select (floor random (count _screams)),
- objNull,
- False,
- _position,
- 2,
- 1,
- 300
-];
diff --git a/TO_MERGE/agm/Medical/functions/fn_setDamage.sqf b/TO_MERGE/agm/Medical/functions/fn_setDamage.sqf
deleted file mode 100644
index 2f3c8825ed..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_setDamage.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Sets the structural damage of a unit without altering the hitPoints.
- * THIS NEEDS TO BE CALLED FROM THE PC WHERE THE UNIT IS LOCAL.
- *
- * Arguments:
- * 0: Unit
- * 1: Damage
- *
- * Return Value:
- * None
- */
-
-private ["_unit", "_damage", "_hitPoints"];
-
-_unit = _this select 0;
-_damage = _this select 1;
-
-if !(local _unit) exitWith {
- [_this, "AGM_Medical_fnc_setDamage", _unit] call AGM_Core_fnc_execRemoteFnc;
-};
-
-_hitPoints = [
- (_unit getHitPointDamage "HitHead"),
- (_unit getHitPointDamage "HitBody"),
- (_unit getHitPointDamage "HitLeftArm"),
- (_unit getHitPointDamage "HitRightArm"),
- (_unit getHitPointDamage "HitLeftLeg"),
- (_unit getHitPointDamage "HitRightLeg")
-];
-
-_unit setDamage _damage;
-
-_unit setHitPointDamage ["HitHead", (_hitPoints select 0)];
-_unit setHitPointDamage ["HitBody", (_hitPoints select 1)];
-_unit setHitPointDamage ["HitLeftArm", (_hitPoints select 2)];
-_unit setHitPointDamage ["HitRightArm", (_hitPoints select 3)];
-_unit setHitPointDamage ["HitLeftLeg", (_hitPoints select 4)];
-_unit setHitPointDamage ["HitRightLeg", (_hitPoints select 5)];
diff --git a/TO_MERGE/agm/Medical/functions/fn_setHitPointDamage.sqf b/TO_MERGE/agm/Medical/functions/fn_setHitPointDamage.sqf
deleted file mode 100644
index e70ce8cf87..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_setHitPointDamage.sqf
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * My very own setHitPointDamage since BIS's one is buggy when affecting a remote unit.
- * It also doesn't change the overall damage. This does.
- *
- * Arguments:
- * 0: unit
- * 1: selection
- * 2: damage
- * 3: disable overall damage adjustment (optional)
- *
- * Return Value:
- * -
- */
-
-private ["_unit", "_selection", "_damage", "_selections", "_damages", "_damageOld", "_damageSumOld", "_damageNew", "_damageSumNew", "_damageFinal"];
-
-_unit = _this select 0;
-_selection = _this select 1;
-_damage = _this select 2;
-
-// Unit isn't local, give function to machine where it is.
-if !(local _unit) exitWith {
- [_this, "AGM_Medical_fnc_setHitPointDamage", _unit] call AGM_Core_fnc_execRemoteFnc;
-};
-
-// Check if overall damage adjustment is disabled
-if (count _this > 3 && {_this select 3}) exitWith {
- _unit setHitPointDamage [_selection, _damage];
-};
-
-_selections = [
- "HitHead",
- "HitBody",
- "HitLeftArm",
- "HitRightArm",
- "HitLeftLeg",
- "HitRightLeg"
-];
-
-if !(_selection in _selections) exitWith {
- _unit setHitPointDamage [_selection, _damage];
-};
-
-AGM_Medical_Unit = _unit;
-_damages = [_selections, {AGM_Medical_Unit getHitPointDamage _this}] call AGM_Core_fnc_map;
-
-_damageOld = damage _unit;
-_damageSumOld = 0;
-{
- _damageSumOld = _damageSumOld + _x;
-} forEach _damages;
-_damageSumOld = _damageSumOld max 0.001;
-
-_damages set [_selections find _selection, _damage];
-
-_damageSumNew = 0;
-{
- _damageSumNew = _damageSumNew + _x;
-} forEach _damages;
-
-_damageNew = _damageSumNew / 6;
-if (_damageOld > 0) then {
- _damageNew = _damageOld * (_damageSumNew / _damageSumOld);
-};
-
-if (_unit getVariable ["AGM_isUnconscious", False]) then {
- if (_damageNew > 0.9 and {AGM_Medical_PreventDeathWhileUnconscious}) then {
- _damageNew = 0.89;
- };
-} else {
- if (_damageNew > 0.9 and {AGM_Medical_PreventInstaDeath}) then {
- _damageNew = 0.89;
- };
-};
-
-_unit setDamage _damageNew;
-
-{
- _damageFinal = (_damages select _forEachIndex);
- if (_unit getVariable ["AGM_isUnconscious", False]) then {
- if (_damageFinal > 0.9 and {AGM_Medical_PreventDeathWhileUnconscious}) then {
- _damageFinal = 0.89;
- };
- } else {
- if (_damageFinal > 0.9 and {AGM_Medical_PreventInstaDeath}) then {
- _damageFinal = 0.89;
- };
- };
-
- _unit setHitPointDamage [_x, _damageFinal];
-} forEach _selections;
diff --git a/TO_MERGE/agm/Medical/functions/fn_takeItem.sqf b/TO_MERGE/agm/Medical/functions/fn_takeItem.sqf
deleted file mode 100644
index 5ae3a9a1ca..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_takeItem.sqf
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Takes an item, preferrably from the cursorTarget first.
- *
- * Arguments:
- * 0: The unit that does the treating.
- * 1: The unit being treated.
- * 2: The desired item (classname).
- *
- * Return Value:
- * True if item was successfully take, false otherwise.
- */
-
-private ["_unit", "_target", "_item", "_config", "_displayName"];
-
-_unit = _this select 0;
-_target = _this select 1;
-_item = _this select 2;
-_config = configFile >> "CfgWeapons" >> _item >> "displayName";
-_displayName = getText _config;
-
-if ((_target == _unit) and (_item in items _unit)) exitWith {
- _unit removeItem _item;
- True
-};
-
-if (_item in (items _target)) exitWith {
- if ([_target] call AGM_Core_fnc_isPlayer) then {
- systemChat format [localize "STR_AGM_Medical_TakingItemPatient", _displayName];
- };
- _target removeItem _item;
- if (!(local _target) and isPlayer _target) then {
- [[_unit, _item, _config, _target], "{systemChat format [localize 'STR_AGM_Medical_TakingYourItem', [_this select 0] call AGM_Core_fnc_getName, getText (_this select 2)];}", _target] call AGM_Core_fnc_execRemoteFnc;
- };
- True
-};
-
-if (_item in (items _unit)) exitWith {
- _unit removeItem _item;
- if ([_unit] call AGM_Core_fnc_isPlayer) then {
- systemChat format [localize "STR_AGM_Medical_TakingItemSelf", _displayName];
- };
- True
-};
-
-[localize "STR_AGM_Medical_NoItem"] call AGM_Core_fnc_displayTextStructured;
-False
diff --git a/TO_MERGE/agm/Medical/functions/fn_transport.sqf b/TO_MERGE/agm/Medical/functions/fn_transport.sqf
deleted file mode 100644
index 92d9581666..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_transport.sqf
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Start dragging the given unit.
- *
- * Argument:
- * 0: Unit to do the dragging (Object)
- * 1: Unit to be dragged (Object)
- * 2: Type of transportation
- * - "drag"
- * - "carry"
- *
- * Return value:
- * none
- */
-
-#define ANIM_DRAG ["amovpercmstpslowwrfldnon_acinpknlmwlkslowwrfldb_2", "amovpercmstpsraswpstdnon_acinpknlmwlksnonwpstdb_2", "amovpercmstpsnonwnondnon_acinpknlmwlksnonwnondb_2", "acinpknlmstpsraswrfldnon", "acinpknlmstpsnonwpstdnon", "acinpknlmstpsnonwnondnon"]
-
-_this spawn {
- _unit = _this select 0;
- _target = _this select 1;
- _type = _this select 2;
-
- _target setVariable ["AGM_isTreatable", False, True];
- _unit setVariable ["AGM_canTreat", False, False];
-
- // Everything but the rifle animation is fucked
- if (primaryWeapon _unit == "") then {
- _unit addWeapon "AGM_FakePrimaryWeapon";
- };
- _unit selectWeapon (primaryWeapon _unit);
-
- if (_type == "drag") then {
- _target setDir (getDir _unit + 180) % 360;
- _target setPos ((getPos _unit) vectorAdd ((vectorDir _unit) vectorMultiply 1.5));
-
- _unit playActionNow "grabDrag";
- [_target, "{_this playActionNow 'grabDragged'}", _target] call AGM_Core_fnc_execRemoteFnc;
- waitUntil {animationState _unit in ANIM_DRAG};
- } else {
- _target setDir (getDir _unit + 180) % 360;
- _target setPos ((getPos _unit) vectorAdd (vectorDir _unit));
- [_unit, "AcinPknlMstpSnonWnonDnon_AcinPercMrunSnonWnonDnon", 2, True] call AGM_Core_fnc_doAnimation;
- [_target, "AinjPfalMstpSnonWrflDnon_carried_Up", 2, True] call AGM_Core_fnc_doAnimation;
- sleep 15;
-
- /*_unit playActionNow "grabCarry";
- [_target, "{_this playActionNow 'grabCarried'}", _target] call AGM_Core_fnc_execRemoteFnc;
- waitUntil {animationState _unit in ANIM_CARRY};*/
- };
-
- _unit setVariable ["AGM_Transporting", _target, False];
- _releaseID = _unit addAction [format ["%1", localize "STR_AGM_Medical_Release"], "[(_this select 1), ((_this select 1) getVariable ['AGM_Transporting', objNull])] call AGM_Medical_fnc_release;", nil, 20, false, true, "", "!isNull (_this getVariable ['AGM_Transporting', objNull])"];
- _unit setVariable ["AGM_Medical_ReleaseID", _releaseID];
-
- // unit woke up while picking him up, abandon ship
- if !(_target getVariable ["AGM_isUnconscious", False] || {isNull (_unit getVariable ["AGM_Transporting", objNull])}) exitWith {
- detach _target;
- _target setVariable ["AGM_isTreatable", True, True];
- _unit setVariable ["AGM_canTreat", True, False];
- _unit removeWeapon "AGM_FakePrimaryWeapon";
- [_unit, "", 2, True] call AGM_Core_fnc_doAnimation;
- _unit removeAction (_unit getVariable "AGM_Medical_ReleaseID");
- _unit setVariable ["AGM_Transporting", objNull, False];
- };
-
- if (_type == "drag") then {
- _target attachTo [_unit, [0, 1.1, 0.092]];
- [_target, "{_this setDir 180;}", _target] call AGM_Core_fnc_execRemoteFnc;
- [_target, "AinjPpneMrunSnonWnonDb_still", 2, True] call AGM_Core_fnc_doAnimation;
- } else {
- _target attachTo [_unit, [0.4, -0.1, -1.25], "LeftShoulder"];
- [_target, "{_this setDir 195;}", _target] call AGM_Core_fnc_execRemoteFnc;
- [_unit, "AcinPercMstpSnonWnonDnon", 2, True] call AGM_Core_fnc_doAnimation;
- [_target, "AinjPfalMstpSnonWnonDf_carried_dead", 2, True] call AGM_Core_fnc_doAnimation;
- };
-
- // catch weird stuff happening
- // (player getting in vehicle, either person dying etc.)
- waitUntil {sleep 0.5;
- vehicle _unit != _unit or
- isNull (_unit getVariable ["AGM_Transporting", objNull]) or
- !(alive _unit) or
- !(alive _target) or
- (_unit getVariable ["AGM_isUnconscious", False]) or
- !(_target getVariable ["AGM_isUnconscious", False])
- };
- // release was properly done, do nothing
- if (isNull (_unit getVariable ["AGM_Transporting", objNull])) exitWith {};
- // weird shit happened, properly release unit
- [_unit, _unit getVariable ["AGM_Transporting", objNull]] call AGM_Medical_fnc_release;
-};
diff --git a/TO_MERGE/agm/Medical/functions/fn_treat.sqf b/TO_MERGE/agm/Medical/functions/fn_treat.sqf
deleted file mode 100644
index 3e0bacb40b..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_treat.sqf
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * By: KoffeinFlummi
- *
- * Starts the treatment of the unit.
- *
- * Arguments:
- * 0: Unit that does the treating (Object)
- * 1: Unit that is beeing treated (Object)
- * 2: Type of treatment:
- * - "diagnose"
- * - "bandage"
- * - "morphine"
- * - "epipen"
- * - "bloodbag"
- * 3+: Additional parameters
- *
- * Return value:
- * none
- */
-
-private ["_unit", "_target", "_type", "_inTrigger", "_item", "_animation", "_time", "_string"];
-
-_unit = _this select 0;
-_target = _this select 1;
-_type = _this select 2;
-
-// check if unit is medic and if that's even necessary
-if (_type in ["epipen", "bloodbag"] and
- !(([_unit] call AGM_Core_fnc_isMedic) or
- (_unit getVariable ["AGM_Medical_AllowNonMedics", AGM_Medical_AllowNonMedics]))) exitWith {
- if ([_unit] call AGM_Core_fnc_isPlayer) then {
- [localize "STR_AGM_Medical_NotTrained"] call AGM_Core_fnc_displayTextStructured;
- };
-};
-
-// check MEDEVAC conditions
-_inTrigger = False;
-{
- if (_inTrigger) exitWith {};
- _inTrigger = [_x, _target] call BIS_fnc_inTrigger;
-} forEach (missionNamespace getVariable ["AGM_Medical_MEDEVACTriggers", []]);
-{
- if (_inTrigger) exitWith {};
- _inTrigger = _target distance _x < 10;
-} forEach (missionNamespace getVariable ["AGM_Medical_MEDEVACVehicles", []]);
-
-if (_type == "epipen" and (_unit getVariable ["AGM_Medical_RequireMEDEVAC", AGM_Medical_RequireMEDEVAC]) and !_inTrigger) exitWith {
- if ([_unit] call AGM_Core_fnc_isPlayer) then {
- [localize "STR_AGM_Medical_NotInMEDEVAC"] call AGM_Core_fnc_displayTextStructured;
- };
-};
-
-// morphine warning
-if (_type == "morphine" and
- _target != _unit and
- [_target] call AGM_Core_fnc_isPlayer) then {
- [[_unit] call AGM_Core_fnc_getName, "{systemChat format ['%1 %2', _this, localize 'STR_AGM_Medical_GivingYouMorphine'];}", _target] call AGM_Core_fnc_execRemoteFnc;
-};
-
-// remove item if necessary
-_item = switch (_type) do {
- case "bandage" : {"AGM_Bandage"};
- case "morphine" : {"AGM_Morphine"};
- case "epipen" : {"AGM_Epipen"};
- case "bloodbag" : {"AGM_Bloodbag"};
- default {""};
-};
-if (_item != "" and {!([_unit, _target, _item] call AGM_Medical_fnc_takeItem)}) exitWith {};
-
-// code to be executed if action is aborted
-AGM_Medical_treatmentAbort = {
- _unit = _this select 0;
-
- if (vehicle _unit == _unit) then {
- [_unit, "", 1] call AGM_Core_fnc_doAnimation;
- };
- _unit setVariable ["AGM_canTreat", True, False];
-};
-
-_unit setVariable ["AGM_canTreat", False, False];
-
-// self-diagnosis is instant
-if (
- (_target == _unit) and
- (_type == "diagnose")
- ) exitWith {
- _this spawn AGM_Medical_fnc_treatmentCallback;
-};
-
-// play appropriate animation
-_animation = switch (_type) do {
- case "diagnose" : {"AinvPknlMstpSnonWnonDnon_medic3"};
- case "bandage" : {"AinvPknlMstpSnonWnonDnon_medic4"};
- case "morphine" : {"AinvPknlMstpSnonWnonDnon_medic1"};
- case "epipen" : {"AinvPknlMstpSnonWnonDnon_medic1"};
- case "bloodbag" : {"AinvPknlMstpSnonWnonDnon_medic1"};
- default {""};
-};
-if (stance _unit == "PRONE") then {
- _animation = switch (currentWeapon _unit) do {
- case (""): {"AinvPpneMstpSlayWnonDnon_medic"};
- case (primaryWeapon _unit): {"AinvPpneMstpSlayWrflDnon_medic"};
- case (handgunWeapon _unit): {"AinvPpneMstpSlayWpstDnon_medic"};
- default {"AinvPpneMstpSlayWnonDnon_medic"};
- };
-};
-if (_unit == _target) then {
- _animation = switch (currentWeapon _unit) do {
- case (""): {
- ["AinvPknlMstpSlayWnonDnon_medic", "AinvPpneMstpSlayWnonDnon_medic"] select (stance _unit == "PRONE")
- };
- case (primaryWeapon _unit): {
- ["AinvPknlMstpSlayWrflDnon_medic", "AinvPpneMstpSlayWrflDnon_medic"] select (stance _unit == "PRONE")
- };
- case (handgunWeapon _unit): {
- ["AinvPknlMstpSlayWpstDnon_medic", "AinvPpneMstpSlayWpstDnon_medic"] select (stance _unit == "PRONE")
- };
- default {
- ["AinvPknlMstpSlayWnonDnon_medic", "AinvPpneMstpSlayWnonDnon_medic"] select (stance _unit == "PRONE")
- };
- };
-};
-
-if (vehicle _unit == _unit) then {
- [_unit, _animation, 1] call AGM_Core_fnc_doAnimation;
-};
-
-// get time required for action to be completed
-_time = switch (_type) do {
- case "diagnose" : {5};
- case "bandage" : {8};
- case "morphine" : {5};
- case "epipen" : {5};
- case "bloodbag" : {20};
- default {10};
-};
-if !([_unit] call AGM_Core_fnc_isMedic) then {
- _time = _time * (_unit getVariable ["AGM_Medical_CoefNonMedic", AGM_Medical_CoefNonMedic]);
-};
-// increase treatment time when treating while prone or in (non-medical) vehicle
-// (it's hard to bandage yourself in a tank you know)
-if (stance _unit == "PRONE" or (vehicle _unit != _unit and !([vehicle _unit] call AGM_Core_fnc_isMedic))) then {
- _time = _time * 1.2;
-};
-
-// select appropriate label for progress bar
-_string = switch (_type) do {
- case "diagnose" : {localize "STR_AGM_Medical_Diagnosing"};
- case "bandage" : {
- _selection = _this select 3;
- if (_selection == "All") then {
- localize "STR_AGM_Medical_Bandaging"
- } else {
- localize format ["STR_AGM_Medical_Bandaging_%1", _selection]
- };
- };
- case "morphine" : {localize "STR_AGM_Medical_Injecting_Morphine"};
- case "epipen" : {localize "STR_AGM_Medical_Injecting_Epinephrine"};
- case "bloodbag" : {localize "STR_AGM_Medical_Transfusing_Blood"};
- default {"Tell Flummi he's a dumbass ..."};
-};
-
-// ai treat
-if !([_unit] call AGM_Core_fnc_isPlayer) exitWith {
- [_this, _time] spawn {
- sleep ((_this select 1) * 0.6);
- (_this select 0) call AGM_Medical_fnc_treatmentCallback;
- };
-};
-
-[
- _time,
- _this,
- "AGM_Medical_fnc_treatmentCallback",
- _string,
- "AGM_Medical_treatmentAbort"
-] call AGM_Core_fnc_progressBar;
-[_target, True] call AGM_Core_fnc_closeDialogIfTargetMoves;
diff --git a/TO_MERGE/agm/Medical/functions/fn_treatmentCallback.sqf b/TO_MERGE/agm/Medical/functions/fn_treatmentCallback.sqf
deleted file mode 100644
index fe51730b03..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_treatmentCallback.sqf
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Code to be executed upon the successfull treatment.
- *
- * Arguments:
- * 0: Unit that does the treatment (Object)
- * 1: Unit to be treated (Object)
- * 2: Type of treatment:
- * - "diagnose"
- * - "bandage"
- * - "morphine"
- * - "epipen"
- * - "bloodbag"
- * 3+: additional parameters
- *
- * Return Value:
- * None
- */
-
-#define BANDAGEHEAL 0.8
-#define MORPHINEHEAL 0.4
-#define BLOODBAGHEAL 0.7
-
-private ["_unit", "_target", "_type"];
-
-_unit = _this select 0;
-_target = _this select 1;
-_type = _this select 2;
-
-if ((_target != _unit or _type != "diagnose") and (vehicle _unit == _unit)) then {
- [_unit, "", 1] call AGM_Core_fnc_doAnimation;
-};
-_unit setVariable ["AGM_canTreat", True, False];
-
-switch (_type) do {
- case "diagnose" : {
- // this is way too messy to all do here.
- [_target] call AGM_Medical_fnc_diagnose;
- };
-
- case "bandage" : {
- private ["_selection", "_damage"];
-
- _selection = _this select 3;
- if (_selection == "All") then {
- _target setDamage ((damage _target - BANDAGEHEAL) max 0);
- } else {
- _damage = ((_target getHitPointDamage _selection) - BANDAGEHEAL) max 0;
- [_target, _selection, _damage] call AGM_Medical_fnc_setHitPointDamage;
-
- [
- _target,
- (_target getHitPointDamage "HitLeftLeg") + (_target getHitPointDamage "HitRightLeg"),
- (_target getHitPointDamage "HitLeftArm") + (_target getHitPointDamage "HitRightArm"),
- True
- ] call AGM_Medical_fnc_checkDamage;
- };
- };
-
- case "morphine" : {
- private ["_painkillerOld", "_painkiller"];
-
- _painkillerOld = _target getVariable ["AGM_Painkiller", 1];
-
- // reduce pain, pain sensitivity
- _painkiller = (_painkillerOld - MORPHINEHEAL) max 0;
- _pain = ((_target getVariable ["AGM_Pain", 0]) - MORPHINEHEAL) max 0;
- _target setVariable ["AGM_Painkiller", _painkiller, True];
- _target setVariable ["AGM_Pain", _pain, True];
-
- // overdose if necessary (unit was already full of painkillers)
- if (_painkillerOld < 0.05 and _target getVariable ["AGM_Medical_EnableOverdosing", AGM_Medical_EnableOverdosing]) then {
- [_target] call AGM_Medical_fnc_overdose;
- };
-
- // Painkiller Reduction
- if (_painkillerOld == 1) then {
- _target spawn {
- while {_this getVariable ["AGM_Painkiller", 1] < 1} do {
- sleep 1;
- _painkiller = ((_this getVariable ["AGM_Painkiller", 1]) + 0.0015) min 1;
- _this setVariable ["AGM_Painkiller", _painkiller, True];
- };
- };
- };
- };
-
- case "epipen" : {
- [_target] call AGM_Medical_fnc_wakeUp; // short and sweet
- };
-
- case "bloodbag" : {
- private ["_blood"];
-
- _blood = ((_target getVariable ["AGM_Blood", 1]) + BLOODBAGHEAL) min 1;
- _target setVariable ["AGM_Blood", _blood, True];
- };
-
- default {};
-};
-
-// reopen menu if desired
-if (profileNamespace getVariable ["AGM_keepMedicalMenuOpen", False] and _unit == AGM_player) then {
- if (_target == _unit) then {
- [3, _target, "AGM_Medical"] call AGM_Interaction_fnc_showMenu;
- } else {
- [2, _target, "AGM_Medical"] call AGM_Interaction_fnc_showMenu;
- };
-};
diff --git a/TO_MERGE/agm/Medical/functions/fn_unloadPatients.sqf b/TO_MERGE/agm/Medical/functions/fn_unloadPatients.sqf
deleted file mode 100644
index 2ea395391f..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_unloadPatients.sqf
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Author: KoffeinFlummi
- *
- * Unloads the wounded units from the vehicle.
- *
- * Arguments:
- * 0: The unit that does the unloading
- * 1: The vehicle
- *
- * Return Value:
- * -
- */
-
- private ["_unit", "_vehicle", "_pos"];
-
-_unit = _this select 0;
-_vehicle = _this select 1;
-
-if (count _this > 2) exitWith {
- _target = _this select 2;
- _pos = [
- (getPos _unit select 0) + (random 2) - 1,
- (getPos _unit select 1) + (random 2) - 1,
- 0
- ];
- moveOut _target;
- unassignVehicle _target;
- _target setPosATL _pos;
-};
-
-{
- if (_x getVariable ["AGM_isUnconscious", False]) then {
- [_this + [_x], "AGM_Medical_fnc_unloadPatients", _x] call AGM_Core_fnc_execRemoteFnc;
- _x setVariable ["AGM_OriginalAnim", "AmovPpneMstpSnonWnonDnon", True];
- };
-} forEach crew _vehicle;
diff --git a/TO_MERGE/agm/Medical/functions/fn_wakeUp.sqf b/TO_MERGE/agm/Medical/functions/fn_wakeUp.sqf
deleted file mode 100644
index 36f91758bd..0000000000
--- a/TO_MERGE/agm/Medical/functions/fn_wakeUp.sqf
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * By: KoffeinFlummi
- *
- * Wakes an unconscious player up.
- *
- * Arguments:
- * 0: Unconscious unit (Object)
- *
- * Return Values:
- * None
- */
-
-private ["_unit", "_position"];
-
-_unit = _this select 0;
-
-// Hand it off to local unit
-if !(local _unit) exitWith {
- [_this, "AGM_Medical_fnc_wakeUp", _unit] call AGM_Core_fnc_execRemoteFnc;
-};
-
-_unit enableAI "MOVE";
-//_unit enableAI "ANIM";
-_unit enableAI "TARGET";
-_unit enableAI "AUTOTARGET";
-_unit enableAI "FSM";
-_unit disableConversation false;
-
-if !(_unit getVariable ["AGM_NoRadio_isMuted", false]) then {
- [_unit] call AGM_Core_fnc_unmuteUnit;
-};
-
-_unit setVariable ["AGM_Unconscious", False, True]; // deprecated since 0.95
-_unit setVariable ["AGM_isUnconscious", False, True];
-_unit setVariable ["AGM_canTreat", True, True];
-
-_unit setVariable ["tf_globalVolume", 1];
-_unit setVariable ["tf_voiceVolume", 1, True];
-_unit setVariable ["tf_unable_to_use_radio", False, True];
-
-_unit setVariable ["acre_sys_core_isDisabled", False, True];
-_unit setVariable ["acre_sys_core_globalVolume", 1];
-
-if (_unit == AGM_player) then {
- [False] call AGM_Core_fnc_disableUserInput;
-};
-
-[_unit, "AGM_Unconscious", False] call AGM_Core_fnc_setCaptivityStatus;
-
-// handle parachute
-if (vehicle _unit == _unit) then {
- _unit setVariable ["AGM_OriginalAnim", "", True];
-};
-
-[_unit, _unit getVariable "AGM_OriginalAnim", 2, True] call AGM_Core_fnc_doAnimation;
-
-[_unit, "wokeUp", [_unit]] call AGM_Core_fnc_callCustomEventHandlersGlobal;
-
-if !(scriptDone (_unit getVariable "AGM_UnconsciousnessTimer")) then {
- terminate (_unit getVariable "AGM_UnconsciousnessTimer");
-};
-if !(scriptDone (_unit getVariable "AGM_WakeUpTimer")) then {
- terminate (_unit getVariable "AGM_WakeUpTimer");
-};
diff --git a/TO_MERGE/agm/Medical/init.sqf b/TO_MERGE/agm/Medical/init.sqf
deleted file mode 100644
index 8f239ca06e..0000000000
--- a/TO_MERGE/agm/Medical/init.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-// by commy2, handle AI
-
-0 spawn {
- while {true} do {
- sleep 10;
-
- _allGroups = [allGroups, {local _this}] call AGM_Core_fnc_filter;
-
- {
- {
- call {
- if (damage _x > 0) exitWith {
- [_x, "bandage"] call AGM_Medical_fnc_aiInitTask;
- };
-
- if (_x getVariable ["AGM_isUnconscious", false]) exitWith {
- [_x, "epipen"] call AGM_Medical_fnc_aiInitTask;
- };
-
- if (_x getVariable ["AGM_Blood", 1] < 1) exitWith {
- [_x, "bloodbag"] call AGM_Medical_fnc_aiInitTask;
- };
-
- if (_x getVariable ["AGM_Pain", 0] > 0) exitWith {
- [_x, "morphine"] call AGM_Medical_fnc_aiInitTask;
- };
- };
- } forEach units _x
- } forEach _allGroups;
- };
-};
diff --git a/TO_MERGE/agm/Medical/stringtable.xml b/TO_MERGE/agm/Medical/stringtable.xml
deleted file mode 100644
index 55ca19978a..0000000000
--- a/TO_MERGE/agm/Medical/stringtable.xml
+++ /dev/null
@@ -1,877 +0,0 @@
-
-
-
-
-
- Treat >>
- Behandeln >>
- Tratar >>
- Opatrz >>
- Vyšetřit >>
- Лечение >>
- Soigner >>
- Ellátás >>
- Tratar >>
- Cura >>
-
-
- Self-treatment >>
- Selbst behandeln >>
- Tratarse >>
- Opatrz siebie >>
- Vyšetřit sebe >>
- Самолечение >>
- Se soigner >>
- Önellátás >>
- Tratar-se >>
- Curati >>
-
-
- Diagnose
- Diagnose
- Diagnosticar
- Diagnozuj
- Diagnostikovat
- Диагностика
- Diagnostiquer
- Diagnózis
- Diagnosticar
- Fai una diagnosi
-
-
- Inject Morphine
- Morphin injizieren
- Inyectar Morfina
- Wstrzyknij morfinę
- Aplikovat Morfin
- Ввести морфин
- Morphine
- Morfium
- Injetar Morfina
- Inietta Morfina
-
-
- Inject Epinephrine
- Epinephrine injizieren
- Inyectar Epinefrina
- Wtrzyknij adrenalinę
- Aplikovat Adrenalin
- Ввести андреналил
- Adrénaline
- Adrenalin
- Injetar Epinefrina
- Inietta Epinefrina
-
-
- Transfuse Blood
- Bluttransfusion
- Transfundir sangre
- Przetocz krew
- Transfúze krve
- Перелить кровь
- Transfusion
- Infúzió
- Transfundir Sangue
- Effettua Trasfusione
-
-
- Bandage
- Verbinden
- Venda
- Bandaż
- Obvázat
- Pansement
- Benda
- Kötözése
- Atadura
- Перевязать
-
-
- Bandage Head
- Kopf verbinden
- Vendar la cabeza
- Bandażuj głowę
- Obvázat hlavu
- Перевязать голову
- Pansement Tête
- Fej kötözése
- Atar Cabeça
- Benda la testa
-
-
- Bandage Torso
- Torso verbinden
- Vendar el torso
- Bandażuj tors
- Obvázat hruď
- Перевязать торс
- Pansement Torse
- Felsőtest kötözése
- Atar Tronco
- Benda il torso
-
-
- Bandage Left Arm
- Arm links verbinden
- Vendar el brazo izquierdo
- Bandażuj lewe ramię
- Obvázat levou ruku
- Перевязать левую руку
- Pansement Bras Gauche
- Bal kar kötözése
- Atar Braço Esquerdo
- Benda il braccio sinistro
-
-
- Bandage Right Arm
- Arm rechts verbinden
- Vendar el brazo derecho
- Bandażuj prawe ramię
- Obvázat pravou ruku
- Перевязать правую руку
- Pansement Bras Droit
- Jobb kar kötözése
- Atar Braço Direito
- Benda il braccio destro
-
-
- Bandage Left Leg
- Bein links verbinden
- Vendar la pierna izquierda
- Bandażuj lewą nogę
- Obvázat levou nohu
- Перевязать левую ногу
- Pansement Jambe Gauche
- Bal láb kötözése
- Atar Perna Esquerda
- Benda la gamba sinistra
-
-
- Bandage Right Leg
- Bein rechts verbinden
- Vendar la pierna derecha
- Bandażuj prawą nogę
- Obvázat pravou nohu
- Перевязать правую ногу
- Pansement Jambe Droite
- Jobb láb kötözése
- Atar Perna Direita
- Benda la gamba destra
-
-
- Drag
- Ziehen
- Arrastrar
- Ciągnij
- Táhnout
- Тащить
- Tracter
- Húzás
- Arrastar
- Trascina
-
-
- Carry
- Tragen
- Cargar
- Nieś
- Nést
- Нести
- Porter
- Cipelés
- Carregar
- Trasporta
-
-
- Release
- Loslassen
- Soltar
- Połóż
- Položit
- Отпустить
- Déposer
- Elenged
- Largar
- Lascia
-
-
- Load Patient Into
- Patient Einladen
- Cargar el paciente en
- Załaduj pacjenta
- Naložit pacianta do
- Погрузить пациента в
- Embarquer le Patient
- Sebesült berakása
- Carregar Paciente Em
- Carica paziente nel
-
-
- Unload Patient
- Patient Ausladen
- Descargar el paciente
- Wyładuj pacjenta
- Vyložit pacienta
- Выгрузить пациента
- Débarquer le Patient
- Sebesült kihúzása
- Descarregar Paciente
- Scarica il paziente
-
-
- Diagnosing ...
- Diagnostizieren ...
- Diagnosticando ...
- Diagnozowanie ...
- Diagnostikuji ...
- Диагоностика....
- Diagnostic ...
- Ellenőrzés...
- Diagnosticando ...
- Eseguo la diagnosi ...
-
-
- Injecting Morphine ...
- Morphin injizieren ...
- Inyectando Morfina ...
- Wstrzykiwanie morfiny ...
- Aplikuju Morfin ...
- Введение морфина...
- Injection de Morphine...
- Morfium beadása...
- Injetando Morfina ...
- Inietto la morfina ...
-
-
- Injecting Epinephrine ...
- Epinephrine injizieren ...
- Inyectando Epinefrina ...
- Wstrzykiwanie adrenaliny ...
- Aplikuju Adrenalin ...
- Введение андреналина
- Injection d'Adrénaline ...
- Adrenalin beadása...
- Injetando Epinefrina ...
- Inietto l'epinefrina ...
-
-
- Transfusing Blood ...
- Bluttransfusion ...
- Realizando transfusión ...
- Przetaczanie krwi ...
- Probíhá transfúze krve ...
- Переливание крови...
- Transfusion Sanguine ...
- Infúzió...
- Transfundindo Sangue ...
- Effettuo la trasfusione ...
-
-
- Bandaging ...
- Verbinden ...
- Vendando ...
- Bandażowanie ...
- Obvazuji ...
- Pansement ...
- Sto applicando la benda ...
- Bekötözés...
- Atando ...
- Перевязывание....
-
-
- Bandaging Head ...
- Kopf verbinden ...
- Vendando la cabeza ...
- Bandażowanie głowy ...
- Obvazuji hlavu ...
- Перевязывание головы....
- Pansement à la Tête ...
- Fej bekötözése...
- Atando Cabeça ...
- Sto applicando la benda sulla testa ...
-
-
- Bandaging Torso ...
- Torso verbinden ...
- Vendando el torso ...
- Bandażowanie torsu ...
- Obvazuji hruď ...
- Перевязывание торса...
- Pansement au Torse ...
- Felsőtest bekötözése ...
- Atando Tronco ...
- Sto applicando la benda sul torso
-
-
- Bandaging Left Arm ...
- Linken Arm verbinden ...
- Vendando el brazo izquierdo ...
- Bandażowanie lewego ramienia ...
- Obvazuji levou ruku ...
- Перевязывание тела...
- Pansement au Bras Gauche ...
- Bal kar bekötözése...
- Atando Braço Esquerdo ...
- Sto applicando la benda sul braccio sinistro
-
-
- Bandaging Right Arm ...
- Rechten Arm verbinden ...
- Vendando el brazo derecho ...
- Bandażowanie prawego ramienia ...
- Obvazuji pravou ruku ...
- Перевязывание правой руки...
- Pansement au Bras Droit ...
- Jobb kar bekötözése...
- Atando Braço Direito ...
- Sto applicando la benda sul braccio destro
-
-
- Bandaging Left Leg ...
- Linkes Bein verbinden ...
- Vendando la pierna izquierda ...
- Bandażowanie lewej nogi ...
- Obvazuji levou nohu ...
- Перевязывание левой ноги...
- Pansement à la Jambe Gauche ...
- Bal láb bekötözése...
- Atando Perna Esquerda ...
- Sto applicando la benda sulla gamba sinistra
-
-
- Bandaging Right Leg ...
- Rechtes Bein verbinden ...
- Vendando la pierna derecha ...
- Bandażowanie prawej nogi ...
- Obvazuji pravou nohu ...
- Перевязывание правой ноги...
- Pansement à la Jambe Droite ...
- Jobb láb bekötözése...
- Atando Perna Direita
- Sto applicando la benda sulla gamba destra
-
-
- [AGM] Medical Supplies
- [AGM] Sanitätsmaterial
- [AGM] Suministros médicos
- [AGM] Medykamenty
- [AGM] Zdravotnické zásoby
- [AGM] Медикаменты
- [AGM] Matériel Médical
- [AGM] Elsősegély felszerelés
- [AGM] Suprimentos Médicos
- Cassa Medica [AGM]
-
-
- Bandage
- Bandage
- Venda
- Bandaż
- Obvaz
- Бинт
- Pansement
- Kötszer
- Atadura
- Bendaggio
-
-
- Used to stop bleeding.
- Verwendet zum Stoppen von Blutungen
- Usada para detener el sangrado
- Używany do zatamowania krwawienia.
- Používané k zastavení krvácení.
- Используется для остановки кровотечения.
- Utilisé pour arrêter les hémorragies.
- Vérzés elállításához.
- Usado para parar sangramentos.
- Usato per fermare l'emorragie
-
-
- Morphine Autoinjector
- Morphin-Autoinjektor
- Autoinyector de Morfina
- Strzykawka z morfiną
- Morfin
- Морфин
- Syrette de Morphine
- Morfium
- Autoinjetor de Morfina
- Autoiniettore di morfina
-
-
- Heavy Painkiller
- Starkes Schmerzmittel
- Sedante fuerte
- Mocny środek przeciwbólowy
- Sedativa
- Сильное обезболивающее.
- Utilisé pour atténuer la douleur.
- Erős fájdalomcsillapító
- Forte Analgésico
- Antidolorifico molto forte
-
-
- Epinephrine Autoinjector
- Epinephrin-Autoinjektor
- Autoinyector de Epinefrina
- Strzykawka z adrenaliną
- Adrenalin
- Андреналин
- Syrette d'Adrénaline
- Adrenalin
- Autoinjetor de Epinefrina
- Autoiniettore di epinefrina
-
-
- Used to wake up unconscious units.
- Benutzt zum Aufwecken bewusstloser Patienten.
- Usado para despertar a pacientes inconscientes
- Używana w celu ocucenia nieprzytomnego pacjenta
- Používaný k probuzení člověka z bezvědomí
- Используется для возвращения в сознание.
- Utilisé pour réveiller un patient inconscient.
- Ájultak felkeltéséhez.
- Usado para despertar indivíduos inconscientes.
- Usato per risvegliare le unità svenute.
-
-
- Blood Bag
- Blutkonserve
- Bolsa de sangre
- Worek z krwią
- Krevní vak
- Пакет с кровью
- Poche de sang
- Infúzió
- Bolsa de Sangue
- Sacca di sangue
-
-
- Used to compensate for heavy blood loss.
- Benutzt, um starken Blutverlust zu kompensieren.
- Usada para compensar pérdidas de sangre severas.
- Stosowany w celu skompensowania dużej utraty krwi.
- Používá se pro kompenzaci při těžké ztrátě krve.
- Используется при высокой потере крови.
- Utilisé pour combler une perte de sang importante.
- Nagyobb vérveszteség esetén
- Usado para compensar grandes perdas de sangue.
- Usata per compensare grandi perdite di sangue.
-
-
- Head
- Kopf
- Cabeza
- Głowa
- Hlava
- Голова
- Tête
- Fej
- Cabeça
- Testa
-
-
- Torso
- Torso
- Torso
- Tors
- Hruď
- Торс
- Torse
- Felsőtest
- Tronco
- Torso
-
-
- Left Arm
- Linker Arm
- Brazo izquierdo
- Lewe ramię
- Levá ruka
- Левая рука
- Bras Gauche
- Bal kar
- Braço Esquerdo
- Braccio sinistro
-
-
- Right Arm
- Rechter Arm
- Brazo derecho
- Prawe ramię
- Pravá ruka
- Правая рука
- Bras Droit
- Jobb kar
- Braço Direito
- Braccio destro
-
-
- Left Leg
- Linkes Bein
- Pierna izquierda
- Lewa noga
- Levá noha
- Левая нога
- Jambe Gauche
- Bal láb
- Perna Esquerda
- Gamba sinistra
-
-
- Right Leg
- Rechtes Bein
- Pierna derecha
- Prawa noga
- Pravá noha
- Правая нога
- Jambe Droite
- Jobb láb
- Perna Direita
- Gamba destra
-
-
- Patient
- Patient
- Paciente
- Pacjent
- Pacient
- Пациент
- Patient
- Páciens
- Paciente
- Paziente
-
-
-
- The patient is dead.
- Der Patient ist tot.
- El paciente está muerto.
- Pacjent jest martwy.
- Je mrtvý.
- Пациент мертв.
- Le patient est décédé.
- Meghalt.
- O paciente está morto.
- Il paziente è morto.
-
-
- The patient is unconscious.
- Der Patient ist bewusstlos.
- El paciente está inconsciente.
- Pacjent jest nieprzytomny.
- Pacient je v bezvědomí.
- Пациент без сознания.
- Le patient est inconscient.
- Elájult.
- O paciente está inconsciente.
- Il paziente è svenuto.
-
-
- The patient is awake.
- Der Patient ist wach.
- El paciente está despierto.
- Pacjent jest przytomny.
- Pacient je při vědomí.
- Пациент в сознании.
- Le patient est conscient.
- Ébren van.
- O paciente está acordado.
- Il paziente è sveglio.
-
-
- The patient is heavily injured.
- Der Patient ist schwer verletzt.
- El paciente está severament herido.
- Pacjent jest ciężko ranny.
- Pacient je těžce zraněn
- Le patient est gravement blessé.
- Il paziente è gravemente ferito.
- Súlyosan sérült.
- O paciente está gravemente ferido.
- Пациен тяжело.
-
-
- The patient is lightly injured.
- Der Patient ist leicht verletzt.
- El paciente está levemente herido.
- Pacjent jest lekko ranny.
- Pacient je lehce zraněn
- Le patient est légèrement blessé.
- Il paziente è leggermente ferito.
- Könnyen sérült.
- O paciente está levemente ferido.
- Пациенто легко.
-
-
- The patient has heavy injuries in:
- Der Patient hat schwere Verletzungen in:
- El paciente tiene heridas severas en:
- Pacjent ma ciężkie obrażenia na:
- Pacient má těžká zranění na místech:
- Пациен тяжело ранен в:
- Le patient est gravement blessé:
- Súlyosan sérült a:
- O paciente tem graves ferimentos em:
- Il paziente ha gravi lesioni in :
-
-
- The patient has light injuries in:
- Der Patient hat leichte Verletzungen in:
- El paciente tiene heridas leves en:
- Pacjent ma lekkie obrażenia na:
- Pacient má lehká zranění na místech:
- Пациенто легко ранен в:
- Le patient est légèrement blessé:
- Könnyen sérült a:
- O paciente tem leves ferimentos em:
- Il paziente ha lesioni lievi in :
-
-
- The patient is not injured.
- Der Patient ist unverletzt.
- El paciente no está herido.
- Pacjent nie ma żadnych obrażeń.
- Pacient neni zraněný.
- Пациент не ранен.
- Le patient n'est pas blessé.
- Nem sérült.
- O paciente não está ferido.
- Il paziente non è ferito.
-
-
- The patient is bleeding;
- Der Patient blutet;
- El paciente está sangrando.
- Pacjent krwawi;
- Pacient krvácí;
- Пациент истекает кровью:
- Le patient saigne
- Vérzik;
- O paciente está sangrando;
- Il paziente sta sanguinando;
-
-
- The patient is not bleeding;
- Der Patient blutet nicht;
- El paciente no está sangrando.
- Pacjent nie krwawi;
- Pacient nekrvácí;
- Пациент не имеет кровотечений.
- Le patient ne saigne pas
- Nem vérzik;
- O paciente não está sangrando;
- Il paziente non sta sanguinando;
-
-
- The patient has already lost a lot of blood.
- Der Patient hat bereits große Mengen Blut verloren.
- El paciente ha perdido mucha sangre.
- Pacjent stracił już dużą ilość krwi.
- Pacient stratil dost krve.
- Высокая кровопотеря
- et a perdu beaucoup de sang.
- Már sok vért vesztett.
- O paciente já perdeu bastante sangue.
- Il paziente ha perso molto sangue.
-
-
- The patient has already lost some blood.
- Der Patient hat bereits etwas Blut verloren.
- El paciente ha perdido algo de sangre.
- PAcjent stracił już trochę krwi.
- Pacient stratil málo krve.
- Умеренная кровопотеря.
- et a perdu un peu de sang.
- Már vesztett vért.
- O paciente já perdeu algum sangue.
- Il paziente ha perso poco sangue.
-
-
- The patient hasn't lost any blood.
- Der Patient hat noch kein Blut verloren.
- El paciente no ha perdido sangre.
- Pacjent nie stracił krwi.
- Pacient nestratil žádnou krev.
- Кровяное давление в норме.
- et n'a pas perdu de sang.
- Nem vesztett vért.
- O paciente não perdeu sangue.
- Il paziente non ha perso sangue.
-
-
- The patient is on heavy painkillers
- Der Patient steht unter starkem Schmerzmitteleinfluss
- El paciente está fuertemente sedado.
- Pacjent jest pod wpływem działania dużej ilości morfiny
- Pacient je na těžkých sedativech
- У пациента высокая доза морфина в крови.
- Le patient est lourdement sédaté,
- Erős fájdalomcsillapítót kapott.
- O paciente está sob efeito de fortes analgésicos
- Il paziente è sotto effetto di forti antidolorifici
-
-
- The patient is on some morphine
- Der Patient steht unter schwachem Schmerzmitteleinfluss
- El paciente está levemente sedado con morfina.
- Pacjent jest pod wpływem działania morfiny
- Pacient má v sobě morfium
- Пациенту введен морфин.
- Le patient est sédaté,
- Kapot morfiumot.
- O paciente está sob efeito de morfina
- Il paziente è un po' fatto di morfina
-
-
- The patient isn't on painkillers
- Der Patient steht nicht unter dem Einfluss von Schmerzmitteln
- El paciente no está sedado.
- Pacjent nie przyjmował środków przeciwbólowych
- Pacient není na sedativech
- Обезболивающие не вводились.
- Le patient n'est pas sédaté,
- Nem kapott fájdalomcsillapítót.
- O paciente não está sob efeito de analgésicos
- Il paziente non è sotto effetto di antidolorifici
-
-
- and in heavy pain.
- und hat starke Schmerzen.
- y con dolor severo.
- i odczuwa silny ból.
- a v těžkých bolestech.
- и испытывает сильную боль.
- et souffre beaucoup.
- és súlyos fájdalmai vannak.
- e com fortes dores.
- e lamenta molto dolore.
-
-
- and in light pain.
- und hat leichte Schmerzen.
- y con dolor leve.
- i odczuwa lekki ból.
- a v lehkých bolestech.
- и испытывает легкую боль.
- et souffre légèrement.
- és enyhe fájdalmai vannak.
- e com leves dores.
- e lamenta poco dolore.
-
-
- and not in pain.
- und hat keine Schmerzen.
- y sin dolor.
- i nie odczuwa żadnego bólu.
- a nemá bolesti.
- не испытывает боли.
- et ne souffre pas.
- és nincsenek fájdalmai.
- e sem dores.
- e non lamenta dolore.
-
-
- You are not trained to do that.
- Dazu bist du nicht ausgebildet.
- No estás entrenado para hacer eso.
- Nie zostałeś przeszkolony aby to zrobić.
- Na to nemáš dostatečné schopnosti.
- Вы не умеете это делать.
- Tu n'es pas formé pour ça.
- Erre nem vagy kiképezve.
- Você não está qualificado para fazer isto.
- Non sei preparato per farlo.
-
-
- is giving you morphine.
- gibt dir Morphium.
- está inyectandote morfina.
- t'injecte de la morphine.
- podaje Tobie morfinę.
- morfiumot ad neked.
- ti dává morfin.
- está lhe dando morfina.
- ti sta iniettando la morfina.
- даёт вам морфин.
-
-
- Reopen medical menu after treatment
- Sanitätsmenü nach Behandlung öffnen
- Reabrir el menú médico después de tratar
- Orvosi menü újranyitása ellátás után
- Po ošetření znovu otevřít zdravotnické menu
- Otwórz ponownie menu medyczne po zakończeniu akcji leczenia
- Réouvrir le menu médical après les soins
- Reabrir menu médico após tratamento
- Riapri il menù medico dopo il trattamento
- По завершению лечения, снова открыть меню..
-
-
- You don't have the required item anymore.
- Du hast das benötigte Material nicht mehr.
- No tienes mas del objeto requerido.
- Nie posiadasz już wymaganego przedmiotu
- Tu n'as plus le matériel nécessaire.
- Už nemáš potřebný předmět.
- Non hai più l'oggetto richiesto
- Você não possui mais o item médico requerido.
- Nem rendelkezel a szükséges eszközzel.
- У вас больше нет требующихся предметов.
-
-
- Taking the patient's %1 ...
- %1 des Patienten wird benutzt ...
- Cogiendo al paciente %1...
- Pobrano od pacjenta: %1 ...
- Prendre %1 ... du patient
- Beru pacientův %1 ...
- Sto prendendo un %1 dal paziente ...
- Pegando %1 do paciente ...
- Elveszed a páciens ...
- Используем %1 пациента ...
-
-
- %1 is using your %2 ...
- %1 benutzt dein(e) %2 ...
- %1 está usando tu %2...
- %1 pobrał od Ciebie %2 ...
- %1 utilise ton %2 ...
- %1 používá tvůj %2 ...
- %1 sta usando il tuo %1 ...
- %1 está usando seu %2 ...
- %1 használja a %2 ...
- %1 использует ваш %2 ...
-
-
- Patient has no %1, using yours ...
- %1 beim Patienten nicht vorhanden, eigenes Material wird genutzt ...
- El paciente no tiene %1, usando el tuyo...
- %1 nie znajduje się w ekwipunku pacjenta, używanie własnych zasobów ...
- Le patient n'a pas de %1, tu utilises ton matériel ...
- Pacient nemá žádný %1, používám vlastní ...
- Il paziente non ha nessun %1, userai il tuo ...
- O paciente não possui %1, usando o seu ...
- A páciensnek nincs %1, a sajátodat használod ...
- % 1 отсутствует в инвентаре пациента, используем собственный ...
-
-
- Alternative Pain Effect
- Alternativer Schmerzeffekt
- Efecto de dolor alternativo
- Alternativ fájdalomeffektus
- Alternatywny efekt bólu
- Alternativní efekt bolesti
- Альтернативный эффект боли
-
-
- This is not possible here.
- Das ist hier nicht möglich.
- Esto no es posible aquí.
- Ezt nem lehet itten.
- Nie możesz tego zrobić tutaj.
- Zde to není možné.
- Вы не можете сделать это здесь.
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/agm/Optics/agm_optics_pip.p3d b/TO_MERGE/agm/Optics/agm_optics_pip.p3d
deleted file mode 100644
index d331ce4acd..0000000000
Binary files a/TO_MERGE/agm/Optics/agm_optics_pip.p3d and /dev/null differ
diff --git a/TO_MERGE/agm/Optics/clientInit.sqf b/TO_MERGE/agm/Optics/clientInit.sqf
deleted file mode 100644
index 7dca46fdc4..0000000000
--- a/TO_MERGE/agm/Optics/clientInit.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-// TMR: Optics initialization and functions
-// (C) 2013 Ryan Schultz. See LICENSE.
-
-// Request a resource layer from the game engine.
-AGM_Optics_scopeRSC = ["AGM_Optics_Scope"] call BIS_fnc_rscLayer;
-
-// Set global variables
-AGM_Optics_inScope = false; // Is the scope up?
-AGM_Optics_currentOptic = ""; // What optic is attached right now?
-
-0 = 0 spawn {
- waituntil {!isNull (findDisplay 46)};
-
- [] call AGM_Optics_fnc_initScope;
-
- // PiP technique by BadBenson
- AGM_Optics_Camera = "camera" camCreate (positioncameratoworld [0,0,0]);
- AGM_Optics_Camera camSetFov 0.7;
- AGM_Optics_Camera camSetTarget player;
- AGM_Optics_Camera camCommit 1;
- "agm_optics_rendertarget0" setPiPEffect [2, 1.0, 1.0, 1.0, 0.0, [0.0, 1.0, 0.0, 0.25], [1.0, 0.0, 1.0, 1.0], [0.199, 0.587, 0.114, 0.0]];
- AGM_Optics_Camera cameraEffect ["INTERNAL", "BACK","agm_optics_rendertarget0"];
-
- waitUntil {[] call AGM_Optics_fnc_mainLoop; False};
-};
diff --git a/TO_MERGE/agm/Optics/config.cpp b/TO_MERGE/agm/Optics/config.cpp
deleted file mode 100644
index 429c57cbe2..0000000000
--- a/TO_MERGE/agm/Optics/config.cpp
+++ /dev/null
@@ -1,454 +0,0 @@
-class CfgPatches {
- class AGM_Optics {
- units[] = {};
- weapons[] = {};
- requiredVersion = 0.60;
- requiredAddons[] = {AGM_Core};
- version = 0.1;
- author[] = {"Taosenai"};
- authorUrl = "http://www.ryanschultz.org/tmr/";
- };
-};
-
-class CfgFunctions {
- class AGM_Optics {
- class AGM_Optics {
- file = "AGM_Optics\functions";
- class firedEH;
- class hideScope;
- class initScope;
- class mainLoop;
- };
- };
-};
-
-class Extended_PostInit_EventHandlers {
- class AGM_Optics {
- clientInit = "call compile preProcessFileLineNumbers '\AGM_Optics\clientInit.sqf'";
- };
-};
-
-class Extended_FiredBIS_EventHandlers {
- class CAManBase {
- class AGM_Optics {
- clientFiredBIS = "_this call AGM_Optics_fnc_firedEH;";
- };
- };
-};
-
-class CfgOpticsEffect {
- class AGM_OpticsRadBlur1 {
- type = "radialblur";
- params[] = {0.015, 0, 0.14, 0.2};
- priority = 950;
- };
-};
-
-
-class CfgWeapons {
- class ItemCore;
- class InventoryItem_Base_F;
- class InventoryMuzzleItem_Base_F;
- class InventoryOpticsItem_Base_F;
-
- class optic_Hamr : ItemCore {
- displayName = "HAMR 4x";
- descriptionShort = "High Accuracy Multi-Range Optic Magnification: 4x Reticle: CM-RW 6.5mm";
- scope = 2;
- weaponInfoType = "AGM_RscWeapon";
-
- AGM_Optics_enhanced = 1;
- AGM_Optics_reticle = "\AGM_Optics\data\hamr\hamr-reticle65_ca.paa";
- AGM_Optics_reticleIllum = "\AGM_Optics\data\hamr\hamr-reticle65Illum_ca.paa";
- AGM_Optics_body = "\AGM_Optics\data\hamr\hamr-body_ca.paa";
- AGM_Optics_bodyNight = "\AGM_Optics\data\hamr\hamr-bodyNight_ca.paa";
-
- model = "\A3\weapons_f\acc\acco_hamr_F";
-
- class ItemInfo : InventoryOpticsItem_Base_F {
- mass = 4;
- optics = 1;
- optictype = 1;
- rmbhint = "HAMR";
- modeloptics = "\AGM_Optics\agm_optics_pip.p3d";
-
- class OpticsModes {
- class Hamr2Collimator {
- AGM_Optics_enhanced = 0;
- opticsID = 1;
- useModelOptics = 0;
- opticsppeffects[] = {};
- opticsFlare = 0;
- opticsDisablePeripherialVision = 0;
- opticsZoomMin = 0.375;
- opticsZoomMax = 1;
- opticsZoomInit = 0.75;
- memoryPointCamera = "eye";
- visionMode[] = {};
- distanceZoomMin = 300;
- distanceZoomMax = 300;
- };
-
- class Hamr2Scope {
- cameradir = "";
- distanceZoomMin = 300;
- distanceZoomMax = 300;
- memorypointcamera = "opticView";
- opticsdisableperipherialvision = 0;
- opticsdisplayname = "IHAMR";
- opticsflare = 1;
- opticsid = 2;
- opticsppeffects[] = {"OpticsCHAbera2", "OpticsBlur1", "AGM_OpticsRadBlur1"};
- opticszoominit = 0.0872664626;
- opticszoommax = 0.0872664626;
- opticszoommin = 0.0872664626;
- discretefov[] = {0.0872664626};
- discreteinitindex = 0;
- usemodeloptics = 1;
- modeloptics = "\AGM_Optics\agm_optics_pip.p3d";
- visionmode[] = {"Normal", "NVG"};
- };
- };
- };
- };
-
- class optic_Arco : ItemCore {
- descriptionshort = "Advanced Rifle Combat Optic Magnification: 4x Reticle: SpecterDR 6.5mm";
- displayname = "ARCO 4x";
- picture = "\A3\weapons_F\Data\UI\gear_acco_Arco_CA.paa";
- scope = 2;
- weaponInfoType = "AGM_RscWeapon";
-
- model = "\A3\weapons_f\acc\acco_Arco_F";
-
- AGM_Optics_enhanced = 1;
- AGM_Optics_reticle = "\AGM_Optics\data\arco\arco-reticle65_ca.paa";
- AGM_Optics_reticleIllum = "\AGM_Optics\data\arco\arco-reticle65Illum_ca.paa";
- AGM_Optics_body = "\AGM_Optics\data\arco\arco-body_ca.paa";
- AGM_Optics_bodyNight = "\AGM_Optics\data\arco\arco-bodyNight_ca.paa";
-
- class ItemInfo: InventoryOpticsItem_Base_F {
- mass = 4;
- optics = 1;
- optictype = 1;
- rmbhint = "ARCO";
-
- class OpticsModes {
- class ARCO2collimator {
- AGM_Optics_enhanced = 0;
- cameradir = "";
- distancezoommax = 300;
- distancezoommin = 300;
- memorypointcamera = "eye";
- opticsdisableperipherialvision = 0;
- opticsdisplayname = "CQB";
- opticsflare = 0;
- opticsid = 1;
- opticsppeffects[] = {};
- opticszoominit = 0.75;
- opticszoommax = 1.1;
- opticszoommin = 0.375;
- usemodeloptics = 0;
- visionmode[] = {};
- };
- class ARCO2scope: ARCO2collimator {
- cameradir = "";
- distanceZoomMin = 300;
- distanceZoomMax = 300;
- memorypointcamera = "opticView";
- opticsdisableperipherialvision = 0;
- opticsdisplayname = "ARCO";
- opticsflare = 1;
- opticsid = 2;
- opticsppeffects[] = {"OpticsCHAbera2", "OpticsBlur1", "AGM_OpticsRadBlur1"};
- opticszoominit = 0.0872664626; // 0.0872664626 rad = 5 degrees
- opticszoommax = 0.0872664626; // SpecterDR 4x is 6 degrees
- opticszoommin = 0.0872664626; // Scope graphic in game covers 1 degree
- discretefov[] = {0.0872664626};
- discreteinitindex = 0;
- usemodeloptics = 1;
- modeloptics = "\AGM_Optics\data\AGM_Optics_reticle90.p3d";
- visionmode[] = {"Normal"};
- };
- };
- };
- };
-
- class optic_MRCO : ItemCore {
- displayName = "MRCO 1x/4x";
- descriptionShort = "Medium Range Combat Optic Magnification: 1x/4x Reticle: Pitbull Gen II 5.56mm";
- scope = 2;
- weaponInfoType = "AGM_RscWeapon";
-
- AGM_Optics_enhanced = 1;
- AGM_Optics_reticle = "\AGM_Optics\data\mrco\mrco-reticle556_ca.paa";
- AGM_Optics_reticleIllum = "\AGM_Optics\data\mrco\mrco-reticle556Illum_ca.paa";
- AGM_Optics_body = "\AGM_Optics\data\mrco\mrco-body_ca.paa";
- AGM_Optics_bodyNight = "\AGM_Optics\data\mrco\mrco-bodyNight_ca.paa";
-
- class ItemInfo : InventoryOpticsItem_Base_F {
- opticType = 1;
- mass = 4;
- optics = 1;
- modelOptics = "\A3\Weapons_f_beta\acc\reticle_MRCO_F";
-
- class OpticsModes {
- class MRCOcq {
- AGM_Optics_enhanced = 0;
- opticsID = 1;
- useModelOptics = 0;
- opticsPPEffects[] = {};
- opticsFlare = 0;
- opticsDisablePeripherialVision = 0;
- opticsZoomMin = 0.375;
- opticsZoomMax = 1;
- opticsZoomInit = 0.75;
- memoryPointCamera = "eye";
- visionMode[] = {};
- distanceZoomMin = 100;
- distanceZoomMax = 100;
- };
-
- class MRCOscope {
- cameradir = "";
- distanceZoomMin = 300;
- distanceZoomMax = 300;
- memorypointcamera = "eye";
- opticsdisableperipherialvision = 0;
- opticsdisplayname = "MRCO";
- opticsflare = 1;
- opticsid = 2;
- opticsppeffects[] = {"OpticsCHAbera2", "OpticsBlur2", "AGM_OpticsRadBlur1"};
- opticszoominit = 0.0872664626;
- opticszoommax = 0.0872664626;
- opticszoommin = 0.0872664626;
- discretefov[] = {0.0872664626};
- discreteinitindex = 0;
- usemodeloptics = 1;
- modeloptics = "\AGM_Optics\data\AGM_Optics_reticle90.p3d";
- visionmode[] = {"Normal"};
- };
- };
- };
- };
-
- class optic_Nightstalker : ItemCore {
- class ItemInfo: InventoryOpticsItem_Base_F {
- class OpticsModes {
- class NCTALKEP {};
- class Iron : NCTALKEP {
- opticsppeffects[] = {}; // Fix Arma 3 bug
- };
- };
- };
- };
-
- class optic_SOS: ItemCore {
- class ItemInfo: InventoryOpticsItem_Base_F {
- modelOptics = "\AGM_Optics\agm_optics_pip.p3d";
- class OpticsModes {
- class Snip {
- visionMode[] = {"Normal","TI","NVG"};
- thermalMode[] = {5,6};
- opticsPPEffects[] = {"OpticsCHAbera1","radblur"};
- modelOptics[] = {"\AGM_Optics\agm_optics_pip.p3d","\AGM_Optics\agm_optics_pip.p3d"};
- };
- };
-
- };
- };
-
- class optic_DMS : ItemCore {
- class ItemInfo: InventoryOpticsItem_Base_F {
- class OpticsModes {
- class Snip {};
- class Iron : Snip {
- opticsppeffects[] = {}; // Fix Arma 3 bug
- };
- };
- };
- };
-
- class optic_LRPS : ItemCore {
- descriptionshort = "Nightforce NXS Riflescope Magnification: 5.5-22x";
- displayname = "NXS 5.5-22x";
- weaponinfotype = "AGM_RscWeapon";
-
- AGM_Optics_enhanced = 1;
- AGM_Optics_reticle = "\AGM_Optics\data\sos\sos-reticleMLR_ca.paa";
- AGM_Optics_reticleIllum = "\AGM_Optics\data\sos\sos-reticleMLRIllum_ca.paa";
- AGM_Optics_body = "\AGM_Optics\data\sos\sos-body_ca.paa";
- AGM_Optics_bodyNight = "\AGM_Optics\data\sos\sos-bodyNight_ca.paa";
-
- class ItemInfo: InventoryOpticsItem_Base_F {
- modeloptics = "\AGM_Optics\data\AGM_Optics_reticle90.p3d";
- weaponinfotype = "RscWeaponRangeZeroingFOV";
- opticType = 2; // Sniper optics
-
- class OpticsModes {
- // Based on Nightforce NXS 5.5-22 scope
- class Snip {
- cameradir = "";
- discretedistance[] = {100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000, 2100, 2200, 2300};
- discretedistanceinitindex = 0;
- discreteinitindex = 0;
- distancezoommax = 2300;
- distancezoommin = 100;
- memorypointcamera = "opticView";
- modeloptics = "\AGM_Optics\data\AGM_Optics_reticle90.p3d";
- opticsdisableperipherialvision = 1;
- opticsdisplayname = "SOS";
- opticsflare = 1;
- opticsid = 1;
- opticsppeffects[] = {"OpticsCHAbera1", "OpticsBlur1", "AGM_OpticsRadBlur1"};
- // How to determine opticszoom
- // First do the basic math based on the listed FOV of the scope to
- // get a baseline FOV
- // 0.1 meter at 100 meters = 1 mrad
- //
- // 5.5x FOV -- 5.3 m at 100 m = 53 mrad
- // = 0.053 rad = 3.037 deg FOV
-
- // 22x FOV -- 1.4 m at 100m = 14 mrad
- // = 0.014 rad = 0.802 deg
-
- // The FOV you give the engine is based on a rather larger scope outline, so we
- // have to do this extra work ourselves.
-
- // At 1680x1050
- // The width of a TMR optic viewfield is 864px
- // The engine viewport width (which is what the below FOV is based on) is 980
- // (864/980) = (FOV to give engine / true FOV of optic)
- // 864/980 * 0.053 = 0.04673
- // 864/980 * 0.014 = 0.01234
-
- // Measured experimentally, these values seem quite right.
- // Certainly they're close enough after you account for pixel density, etc.
-
- opticszoominit = 0.01234;
- opticszoommax = 0.04673;
- opticszoommin = 0.01234;
- discretefov[] = {};
- usemodeloptics = 1;
- visionmode[] = {"Normal"};
- };
- };
- };
- };
-
- class optic_Yorris : ItemCore {
- descriptionshort = "Burris FastFire II Red Dot Sight Magnification: 1x";
- displayname = "FastFire II";
- };
-
- class optic_MRD : ItemCore {
- descriptionshort = "Eotech MRDS Red Dot Sight Magnification: 1x";
- displayname = "MRDS";
- };
-
- class optic_Holosight : ItemCore {
- descriptionshort = "Eotech XPS3 Holographic Sight Magnification: 1x";
- displayname = "XPS3 Holo";
- };
-};
-
-class RscOpticsText;
-class RscOpticsValue;
-class RscInGameUI {
- class RscUnitInfo;
- class RscWeaponZeroing;
- class AGM_RscWeapon : RscWeaponZeroing {
- idd = -1;
- controls[] = {"CA_Zeroing", "CA_FOVMode"};
-
- onLoad ="with uiNameSpace do { AGM_OpticsIGUI = _this select 0 }";
-
- class CA_FOVMode : RscOpticsValue {
- idc = 154;
- style = 2;
- colorText[] = {0, 0, 0, 0};
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- };
- };
-};
-
-class RscTitles {
- class AGM_Optics_Scope {
- idd = -1;
- onLoad = "with uiNameSpace do { AGM_Optics_Scope = _this select 0 };";
- onUnload = "";
- movingEnable = 1;
- duration = 10000;
- controls[] = {"Reticle", "ReticleNight", "BodyNight", "Body"};
-
- class Reticle {
- colorBackground[] = {0,0,0, 0};
- colorText[] = {1,1,1, 1};
- fade = 0;
- font = "PuristaMedium";
- h = SafeZoneH;
- idc = 1;
- lineSpacing = 1.0;
- movingEnable = 1;
- size = 0;
- sizeEx = 1;
- style = 48;
- text = "";
- type = 0;
- w = SafeZoneWAbs / ((getResolution select 0) / (getResolution select 1));
- x = (SafeZoneXAbs + SafeZoneWAbs/2 - (SafeZoneWAbs / ((getResolution select 0) / (getResolution select 1)))/2);
- y = SafeZoneY;
- };
-
- class ReticleNight : Reticle {
- idc = 2;
- text = "";
- };
-
- class Body : Reticle {
- idc = 6;
- text = "";
- x = (SafeZoneXAbs + SafeZoneWAbs/2 - (SafeZoneWAbs / ((getResolution select 0) / (getResolution select 1))));
- y = SafeZoneY - (SafeZoneH/2);
- w = SafeZoneWAbs / ((getResolution select 0) / (getResolution select 1)) * 2;
- h = SafeZoneH * 2;
- };
-
- class BodyNight : Body {
- idc = 5;
- text = "";
- };
- };
-};
-
-class PreloadTextures {
- class CfgWeapons {
- class optic_hamr {
- AGM_Optics_body= "*";
- AGM_Optics_bodyNight = "*";
- AGM_Optics_reticle = "*";
- AGM_Optics_reticleIllum = "*";
- };
- class optic_arco {
- AGM_Optics_body= "*";
- AGM_Optics_bodyNight = "*";
- AGM_Optics_reticle = "*";
- AGM_Optics_reticleIllum = "*";
- };
- class optic_mrco {
- AGM_Optics_body= "*";
- AGM_Optics_bodyNight = "*";
- AGM_Optics_reticle = "*";
- AGM_Optics_reticleIllum = "*";
- };
- class optic_LRPS {
- AGM_Optics_body= "*";
- AGM_Optics_bodyNight = "*";
- AGM_Optics_reticle = "*";
- AGM_Optics_reticleIllum = "*";
- };
- };
-};
diff --git a/TO_MERGE/agm/Optics/functions/fn_firedEH.sqf b/TO_MERGE/agm/Optics/functions/fn_firedEH.sqf
deleted file mode 100644
index 1030fceefd..0000000000
--- a/TO_MERGE/agm/Optics/functions/fn_firedEH.sqf
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Original Author: Taosenai
- * Adapted By: KoffeinFlummi
- *
- * Animates the scope when firing.
- *
- * Arguments:
- * 0: Unit
- * 1: Weapon
- * 2: Muzzle
- * 3: Mode
- * 4: Ammo
- * 5: Magazine
- * 6: Projectile
- *
- * Return Value:
- * None
- */
-
-if (_this select 0 != AGM_player) exitwith {}; // Sanity check
-
-0 = _this spawn {
- disableSerialization;
-
- _weaponType = _this select 1;
- _config = configFile >> "CfgWeapons" >> _weaponType;
- _scope = uiNameSpace getVariable "AGM_Optics_Scope";
-
- // @todo
- _recoilMulti = getNumber (_config >> "tmr_smallarms_recoil_shakeMultiplier"); // Will be 0 if undefined
-
- if (_recoilMulti == 0) then {
- _recoilMulti = 1;
- };
- if (_recoilMulti > 2.6) then {
- _recoilMulti = 2.6; // Don't get too high
- };
-
- // Reduce the reticle movement as the player drops into lower, supported stances.
- _detectStance = (player selectionPosition "Neck" select 2);
- if (_detectStance < 1.3) then {
- _recoilMulti = _recoilMulti - 0.10;
- };
- if (_detectStance < 0.7) then {
- _recoilMulti = _recoilMulti - 0.20;
- };
-
- // Reduce reticle movement if the player is rested (tmr_autorest).
- if (player getVariable ["tmr_autorest_rested", false]) then {
- _recoilMulti = _recoilMulti - 0.20;
- };
-
- // Reduce reticle movement if the player is deployed (tmr_autorest).
- if (player getVariable ["tmr_autorest_deployed", false]) then {
- _recoilMulti = _recoilMulti - 0.30;
- };
- _recoilMulti = 1;
- // @endtodo
-
-
- // Constants which determine how the scope recoils
- _recoilScope = 0.03 * _recoilMulti + random 0.0015;
- _recoilRing = 0.03 * _recoilMulti + random 0.0015;
-
- _randomScopeShiftX = 0.005 * _recoilMulti - random 0.011;
-
- _randomReticleShiftX = 0.0036 * _recoilMulti + random 0.0045; // Always tend up and right;
- _randomReticleShiftY = -0.0046 * _recoilMulti - random 0.0055;
-
- /////////
- // Center everything
-
- // getResolution select 4 should return the aspect ratio, but it's totally wrong
- // for triple head displays. We'll compute it manually.
- _aspectRatio = (getResolution select 0) / (getResolution select 1);
-
- _reticleX = (SafeZoneXAbs + SafeZoneWAbs/2 - (SafeZoneWAbs / _aspectRatio)/2);
- _reticleY = SafeZoneY;
- _reticleW = SafeZoneWAbs / _aspectRatio;
- _reticleH = SafeZoneH;
-
- // Reticle
- (_scope displayCtrl 1) ctrlSetPosition [_reticleX, _reticleY, _reticleW, _reticleH];
- // Reticle night (illum)
- (_scope displayCtrl 2) ctrlSetPosition [_reticleX, _reticleY, _reticleW, _reticleH];
-
- _bodyX = (SafeZoneXAbs + SafeZoneWAbs/2 - (SafeZoneWAbs / _aspectRatio));
- _bodyY = SafeZoneY - (SafeZoneH/2);
- _bodyW = SafeZoneWAbs / _aspectRatio * 2;
- _bodyH = SafeZoneH * 2;
-
- // Body night
- (_scope displayCtrl 5) ctrlSetPosition [_bodyX, _bodyY, _bodyW, _bodyH];
- // Body
- (_scope displayCtrl 6) ctrlSetPosition [_bodyX, _bodyY, _bodyW, _bodyH];
-
- _centerDelay = 0.01;
- (_scope displayCtrl 1) ctrlCommit _centerDelay;
- (_scope displayCtrl 2) ctrlCommit _centerDelay;
- (_scope displayCtrl 5) ctrlCommit _centerDelay;
- (_scope displayCtrl 6) ctrlCommit _centerDelay;
-
- /////////
- // Create and commit recoil effect
-
- // Move reticle
-
- (_scope displayCtrl 1) ctrlSetPosition [_reticleX - (_recoilScope/2) + _randomReticleShiftX, _reticleY - (_recoilScope/2) + _randomReticleShiftY, _reticleW + _recoilScope, _reticleH + _recoilScope];
- (_scope displayCtrl 2) ctrlSetPosition [_reticleX - (_recoilScope/2) + _randomReticleShiftX, _reticleY - (_recoilScope/2) + _randomReticleShiftY, _reticleW + _recoilScope, _reticleH + _recoilScope];
-
- // Move body
-
- (_scope displayCtrl 5) ctrlSetPosition [_bodyX - (_recoilScope/2) + _randomScopeShiftX, _bodyY - (_recoilScope/2), _bodyW + _recoilScope, _bodyH + _recoilScope];
- (_scope displayCtrl 6) ctrlSetPosition [_bodyX - (_recoilScope/2) + _randomScopeShiftX, _bodyY - (_recoilScope/2), _bodyW + _recoilScope, _bodyH + _recoilScope];
-
- _recoilDelay = 0.036;
- _fa = false;
- _cwm = currentWeaponMode player;
- if (_cwm == "FullAuto" || _cwm == "manual" || _cwm == "Burst") then {
- _recoilDelay = getNumber (_config >> _cwm >> "reloadTime")/2.2;
- _fa = true;
- };
- (_scope displayCtrl 1) ctrlCommit _recoilDelay;
- (_scope displayCtrl 2) ctrlCommit _recoilDelay;
- (_scope displayCtrl 5) ctrlCommit _recoilDelay;
- (_scope displayCtrl 6) ctrlCommit _recoilDelay;
-
- //////////////
-
- waituntil {sleep 0.01; ctrlCommitted (_scope displayCtrl 6)};
-
- //////////////
-
- //////
- // Bring them all back
- (_scope displayCtrl 1) ctrlSetPosition [_reticleX, _reticleY, _reticleW, _reticleH];
- (_scope displayCtrl 2) ctrlSetPosition [_reticleX, _reticleY, _reticleW, _reticleH];
- (_scope displayCtrl 5) ctrlSetPosition [_bodyX, _bodyY, _bodyW, _bodyH];
- (_scope displayCtrl 6) ctrlSetPosition [_bodyX, _bodyY, _bodyW, _bodyH];
-
- _recenterDelay = 0.09;
- if (_fa) then {
- _recenterDelay = getNumber (_config >> _cwm >> "reloadTime")/2.2;
- };
- (_scope displayCtrl 1) ctrlCommit _recenterDelay;
- (_scope displayCtrl 2) ctrlCommit _recenterDelay;
- (_scope displayCtrl 5) ctrlCommit _recenterDelay;
- (_scope displayCtrl 6) ctrlCommit _recenterDelay;
-};
diff --git a/TO_MERGE/agm/Optics/functions/fn_hideScope.sqf b/TO_MERGE/agm/Optics/functions/fn_hideScope.sqf
deleted file mode 100644
index 8b048f1bd7..0000000000
--- a/TO_MERGE/agm/Optics/functions/fn_hideScope.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Original Author: Taosenai
- * Adapted By: KoffeinFlummi
- *
- * Hides the scope.
- *
- */
-
-private ["_scope"];
-
-((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 1) ctrlSetTextColor [1,1,1,0];
-((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 2) ctrlSetTextColor [1,1,1,0];
-((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 5) ctrlSetTextColor [1,1,1,0];
-((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 6) ctrlSetTextColor [1,1,1,0];
-
-((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 1) ctrlCommit 0;
-((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 2) ctrlCommit 0;
-((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 5) ctrlCommit 0;
-((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 6) ctrlCommit 0;
diff --git a/TO_MERGE/agm/Optics/functions/fn_initScope.sqf b/TO_MERGE/agm/Optics/functions/fn_initScope.sqf
deleted file mode 100644
index f2e078ebbe..0000000000
--- a/TO_MERGE/agm/Optics/functions/fn_initScope.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Original Author: Taosenai
- * Adapted By: KoffeinFlummi
- *
- * Initializes the scope resources.
- *
- */
-
-private ["_display"];
-
-// Make sure we only cutRsc when the resource isn't already available
-if (isNil {uiNameSpace getVariable "AGM_Optics_Scope"} or {isNull (uiNameSpace getVariable "AGM_Optics_Scope")}) exitWith {
- AGM_Optics_scopeRSC cutRsc ["AGM_Optics_Scope","PLAIN",0];
- ((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 1) ctrlSetTextColor [1,1,1,0];
- ((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 2) ctrlSetTextColor [1,1,1,0];
- ((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 5) ctrlSetTextColor [1,1,1,0];
- ((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 6) ctrlSetTextColor [1,1,1,0];
-
- ((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 1) ctrlCommit 0;
- ((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 2) ctrlCommit 0;
- ((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 5) ctrlCommit 0;
- ((uiNameSpace getVariable "AGM_Optics_Scope") displayCtrl 6) ctrlCommit 0;
- True
-};
-False
diff --git a/TO_MERGE/agm/Optics/functions/fn_mainLoop.sqf b/TO_MERGE/agm/Optics/functions/fn_mainLoop.sqf
deleted file mode 100644
index e73b56db37..0000000000
--- a/TO_MERGE/agm/Optics/functions/fn_mainLoop.sqf
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Original Author: Taosenai
- * Adapted By: KoffeinFlummi
- *
- * Monitors the RscInGameUI and displays the overlays when needed.
- *
- * Arguments:
- * None
- *
- * Return Value:
- * None
- */
-
-if !(cameraOn == AGM_player && {alive AGM_player} && {!visibleMap} && {ctrlShown ((uinamespace getVariable "AGM_OpticsIGUI") displayCtrl 154)}) exitWith {
- // Failed the state check, hide the scope if it's up
- if (AGM_Optics_inScope) then {
- // Hide the scope
- AGM_Optics_inScope = false;
- AGM_Optics_inScope_FOV = ([] call cba_fnc_getFOV) select 0;
-
- [] call AGM_Optics_fnc_hideScope;
- };
-};
-
-AGM_Optics_Camera setposATL (positioncameratoworld [0,0,0.4]);
-AGM_Optics_Camera camPrepareTarget (positioncameratoworld [0,0,50]);
-AGM_Optics_Camera camCommitPrepared 0;
-
-if (cameraView == "Gunner") then {
- AGM_Optics_Camera camsetFOV 0.7;
- AGM_Optics_Camera camcommit 0;
-} else {
- AGM_Optics_Camera camsetFOV 0.01;
- AGM_Optics_Camera camcommit 0;
-};
-
-private ["_optic", "_scope"];
-
-disableSerialization;
-
-// Get the name of the attached optic
-_optic = (primaryWeaponItems AGM_player) select 2;
-_scope = uiNameSpace getVariable "AGM_Optics_Scope";
-
-// Init the scope (if needed)
-[] call AGM_Optics_fnc_initScope;
-
-// Check if the optic has changed since we last drew it
-_doUpdateAllLayers = false;
-if (AGM_Optics_currentOptic != _optic) then {
- AGM_Optics_currentOptic = _optic;
- _doUpdateAllLayers = true;
-};
-
-// Check if Splendid Camera, unit switch, etc. has blanked out our displays for no good reason (grrr)
-if (ctrlText (_scope displayCtrl 1) == "") then {
- _doUpdateAllLayers = true;
-};
-
-// Draw the correct layers (don't show them)
-if (_doUpdateAllLayers) then {
- (_scope displayCtrl 1) ctrlSetText getText (configFile >> "CfgWeapons" >> _optic >> "AGM_Optics_reticle");
- (_scope displayCtrl 2) ctrlSetText getText (configFile >> "CfgWeapons" >> _optic >> "AGM_Optics_reticleIllum");
- (_scope displayCtrl 5) ctrlSetText getText (configFile >> "CfgWeapons" >> _optic >> "AGM_Optics_bodyNight");
- (_scope displayCtrl 6) ctrlSetText getText (configFile >> "CfgWeapons" >> _optic >> "AGM_Optics_body");
-};
-
-// Stop processing if already in the scope view and FOV hasn't changed
-if (AGM_Optics_inScope) exitwith {};
-
-// Mark that we're in enhanced scope view
-AGM_Optics_inScope = true;
-
-// Calculate lighting
-_lighting = sunOrMoon; // 1 is day, 0 is night
-
-_nightOpacity = 1;
-_dayOpacity = (0 max moonIntensity * (1 - (0 max overcast)))/5;
-
-if (_lighting == 1) then {
- _nightOpacity = 0;
- _dayOpacity = 1;
-};
-
-// Apply lighting and make layers visible
-(_scope displayCtrl 1) ctrlSetTextColor [1,1,1,1];
-(_scope displayCtrl 2) ctrlSetTextColor [1,1,1,_nightOpacity];
-(_scope displayCtrl 5) ctrlSetTextColor [1,1,1,_nightOpacity];
-(_scope displayCtrl 6) ctrlSetTextColor [1,1,1,_dayOpacity];
-
-(_scope displayCtrl 1) ctrlCommit 0;
-(_scope displayCtrl 2) ctrlCommit 0;
-(_scope displayCtrl 5) ctrlCommit 0;
-(_scope displayCtrl 6) ctrlCommit 0;
diff --git a/TO_MERGE/agm/Parachute/Gurtgeschirr.p3d b/TO_MERGE/agm/Parachute/Gurtgeschirr.p3d
deleted file mode 100644
index 91456b87a8..0000000000
Binary files a/TO_MERGE/agm/Parachute/Gurtgeschirr.p3d and /dev/null differ
diff --git a/TO_MERGE/agm/Parachute/T10Schirm.p3d b/TO_MERGE/agm/Parachute/T10Schirm.p3d
deleted file mode 100644
index 18ab0548f6..0000000000
Binary files a/TO_MERGE/agm/Parachute/T10Schirm.p3d and /dev/null differ
diff --git a/TO_MERGE/agm/TopDownAttack/Optics.hpp b/TO_MERGE/agm/TopDownAttack/Optics.hpp
deleted file mode 100644
index e44578bffd..0000000000
--- a/TO_MERGE/agm/TopDownAttack/Optics.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-class RscControlsGroup;
-class RscPicture;
-class RscMapControl;
-
-class RscInGameUI {
- class RscOptics_titan {
- onLoad = "uiNamespace setVariable ['AGM_dlgJavelinOptics', _this select 0]; missionNamespace setVariable ['AGM_Disposable_modeJavelin', 0];";
-
- class CA_javelin_elements_group: RscControlsGroup {
- class Controls {
- class CA_Javelin_Day_mode_off: RscPicture {};
- class CA_Javelin_SEEK_off: CA_Javelin_Day_mode_off {
- idc = 1005;
- };
- class GetLockedTarget: RscMapControl {
- onDraw = "call AGM_TopDownAttack_fnc_getLockedTarget";
- idc = -1;
- w = 0;
- h = 0;
- };
- };
- };
- };
-};
-
-//_dlg = uiNamespace getVariable ["AGM_dlgJavelinOptics", displayNull]; _ctrl = _dlg displayCtrl 1006; _ctrl ctrlSetTextColor [0.2941,0.8745,0.2157,1.0]
-
-// on colorText[] = {0.2941, 0.8745, 0.2157, 1.0};
-// off colorText[] = {0.2941, 0.2941, 0.2941, 1.0};
-// orange colorText[] = {0.9255, 0.5216, 0.1216, 1.0};
-
-/*
-CA_javelin_elements_group: 170
-CA_Javelin_Day_mode_off: 1001
-CA_Javelin_Day_mode: 160
-CA_Javelin_WFOV_mode_off: 1004
-CA_Javelin_WFOV_mode_group: 163
-CA_Javelin_NFOV_mode_off: 1003
-CA_Javelin_NFOV_mode_group: 162
-CA_Javelin_SEEK_off: 1005 //1001
-CA_Javelin_SEEK: 166
-CA_Javelin_Missle_off: 1032
-CA_Javelin_Missle: 167
-CA_Javelin_CLU_off: 1027
-CA_Javelin_HangFire_off: 1028
-CA_Javelin_TOP_off: 1006
-CA_Javelin_DIR: 1007
-CA_Javelin_FLTR_mode_off: 1002
-CA_Javelin_FLTR_mode: 161
-*/
diff --git a/TO_MERGE/agm/TopDownAttack/config.cpp b/TO_MERGE/agm/TopDownAttack/config.cpp
deleted file mode 100644
index 0fb6f920a2..0000000000
--- a/TO_MERGE/agm/TopDownAttack/config.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-
-class CfgPatches {
- class AGM_TopDownAttack {
- units[] = {};
- weapons[] = {};
- requiredVersion = 0.60;
- requiredAddons[] = {AGM_Core};
- version = "0.95";
- versionStr = "0.95";
- versionAr[] = {0,95,0};
- author[] = {"commy2"};
- authorUrl = "https://github.com/commy2/";
- };
-};
-
-class CfgFunctions {
- class AGM_TopDownAttack {
- class AGM_TopDownAttack {
- file = "\AGM_TopDownAttack\functions";
- class canToggleTopDownAttack;
- class getLockedTarget;
- class toggleTopDownAttack;
- class topDownAttack;
- };
- };
-};
-
-class Extended_FiredBIS_EventHandlers {
- class CAManBase {
- class AGM_TopDownAttack_FireMissile {
- FiredBIS = "if (local (_this select 0)) then {_this call AGM_TopDownAttack_fnc_topDownAttack};";
- };
- };
-};
-
-class AGM_Core_Default_Keys {
- class toggleTopDownAttack {
- displayName = "$STR_AGM_ToggleTopDownAttack";
- condition = "[_player] call AGM_TopDownAttack_fnc_canToggleTopDownAttack";
- statement = "[_player] call AGM_TopDownAttack_fnc_toggleTopDownAttack";
- key = 25;
- shift = 0;
- control = 0;
- alt = 0;
- };
-};
-
-class CfgSounds {
- class AGM_Sound_Locked1 {
- sound[] = {"\A3\Sounds_F\weapons\Rockets\locked_3", 0.316228, 2.5, 200};
- titles[] = {};
- };
- class AGM_Sound_Locked2 {
- sound[] = {"\A3\Sounds_F\weapons\Rockets\locked_1", 0.316228, 1, 200};
- titles[] = {};
- };
-};
-
-#include
-
-class CfgWeapons {
- class Launcher_Base_F;
-
- class launch_Titan_base: Launcher_Base_F {
- AGM_enableTopDownAttack = 0;
- AGM_lockTargetMode = 0;
- };
- class launch_Titan_short_base: launch_Titan_base {
- AGM_enableTopDownAttack = 1;
- AGM_lockTargetMode = 1;
- };
-};
diff --git a/TO_MERGE/agm/TopDownAttack/functions/fn_canToggleTopDownAttack.sqf b/TO_MERGE/agm/TopDownAttack/functions/fn_canToggleTopDownAttack.sqf
deleted file mode 100644
index 97eb1ddd00..0000000000
--- a/TO_MERGE/agm/TopDownAttack/functions/fn_canToggleTopDownAttack.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-// by commy2
-
-private ["_player", "_ctrlJavelinMode"];
-
-_player = _this select 0;
-
-disableSerialization;
-_ctrlJavelinMode = (uiNamespace getVariable ["AGM_dlgJavelinOptics", displayNull]) displayCtrl 1006;
-
-getNumber (configFile >> "CfgWeapons" >> currentWeapon _player >> "AGM_enableTopDownAttack") == 1
-&& {ctrlShown _ctrlJavelinMode}
diff --git a/TO_MERGE/agm/TopDownAttack/functions/fn_getLockedTarget.sqf b/TO_MERGE/agm/TopDownAttack/functions/fn_getLockedTarget.sqf
deleted file mode 100644
index c7a924a62c..0000000000
--- a/TO_MERGE/agm/TopDownAttack/functions/fn_getLockedTarget.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-// by commy2
-
-// cursorTarget doesn't work for lockable weapons in fired event handlers
-if (!isNull cursorTarget) then {
- AGM_TopDownAttack_LockedTarget = cursorTarget;
- AGM_TopDownAttack_LockedTargetTime = time;
-} else {
- if (time - (missionNamespace getVariable ["AGM_TopDownAttack_LockedTargetTime", -1]) > 1) then {
- AGM_TopDownAttack_LockedTarget = objNull;
- };
-};
diff --git a/TO_MERGE/agm/TopDownAttack/functions/fn_toggleTopDownAttack.sqf b/TO_MERGE/agm/TopDownAttack/functions/fn_toggleTopDownAttack.sqf
deleted file mode 100644
index cced4dd24b..0000000000
--- a/TO_MERGE/agm/TopDownAttack/functions/fn_toggleTopDownAttack.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-// by commy2
-
-#define COLOR_ON [0.2941, 0.8745, 0.2157, 1.0]
-#define COLOR_OFF [0.2941, 0.2941, 0.2941, 1.0]
-
-private ["_state", "_dlgJavelinOptics", "_ctrlJavelinModeTop", "_ctrlJavelinModeDir"];
-
-_state = missionNamespace getVariable ["AGM_TopDownAttack_modeJavelin", 0];
-
-_state = [1, 0] select _state;
-
-AGM_TopDownAttack_modeJavelin = _state;
-
-playSound "AGM_Sound_Click";
-
-disableSerialization;
-_dlgJavelinOptics = uiNamespace getVariable ["AGM_dlgJavelinOptics", displayNull];
-
-_ctrlJavelinModeTop = _dlgJavelinOptics displayCtrl 1006;
-_ctrlJavelinModeDir = _dlgJavelinOptics displayCtrl 1007;
-
-_ctrlJavelinModeTop ctrlSetTextColor ([COLOR_OFF, COLOR_ON] select _state);
-_ctrlJavelinModeDir ctrlSetTextColor ([COLOR_ON, COLOR_OFF] select _state);
diff --git a/TO_MERGE/agm/TopDownAttack/functions/fn_topDownAttack.sqf b/TO_MERGE/agm/TopDownAttack/functions/fn_topDownAttack.sqf
deleted file mode 100644
index f96330f125..0000000000
--- a/TO_MERGE/agm/TopDownAttack/functions/fn_topDownAttack.sqf
+++ /dev/null
@@ -1,170 +0,0 @@
-// by commy2
-
-if (getNumber (configFile >> "CfgWeapons" >> _this select 1 >> "AGM_enableTopDownAttack") != 1) exitWith {};
-
-_this spawn {
- _projectile = _this select 6;
-
- if (missionNamespace getVariable ["AGM_TopDownAttack_modeJavelin", 0] == 0) exitWith {};
- _flyInHeight = 100;
-
- // cursorTarget doesn't work for lockable weapons in fired event handlers
- _target = missionNamespace getVariable ["AGM_TopDownAttack_LockedTarget", objNull];
- AGM_TopDownAttack_LockedTarget = objNull;
-
- // save values of the auto-guided missile
- _type = typeOf _projectile;
- _position = position _projectile;
- _vector = [vectorDir _projectile, vectorUp _projectile];
- _velocity = velocity _projectile;
-
- deleteVehicle _projectile;
-
- // create new non-guided missile
- _projectile = createVehicle [_type, _position, [], 0, "FLY"];
- _projectile setVectorDirAndUp _vector;
- _projectile setVelocity _velocity;
-
- // common functions
- _heightStart = getPosASL _projectile select 2;
- _fnc_getHeight = {(getPosASL _this select 2) - _heightStart};
-
- _fnc_getPitch = {asin (vectorDir _this select 2)};
-
- _fnc_getHorizontalDistance = {
- private "_v";
-
- _v = getPosASL (_this select 0) vectorDiff getPosASL (_this select 1);
-
- sqrt ((_v select 0) ^ 2 + (_v select 1) ^ 2)
- };
-
- _fnc_getDirTo = {
- private "_v";
-
- _v = getPosASL (_this select 0) vectorFromTo getPosASL (_this select 1);
-
- (_v select 0) atan2 (_v select 1)
- };
-
- _getPitchTo = {
- private ["_p", "_v"];
-
- _p = getPosASL (_this select 1);
- _p set [2, (_p select 2) + 1];
-
- _v = getPosASL (_this select 0) vectorFromTo _p;
-
- asin (_v select 2)
- };
-
- _fnc_changeMissileDirection = {
- private ["_projectile", "_v", "_l", "_r"];
-
- _projectile = _this select 0;
- _v = _this select 1;
-
- _l = sqrt ((_v select 0) ^ 2 + (_v select 1) ^ 2);
- _r = -(_v select 2) / _l;
-
- _projectile setVectorDirAndUp [
- _v,
- [
- (_v select 0) * _r,
- (_v select 1) * _r,
- _l
- ]
- ];
- _projectile setVelocity _v vectorMultiply vectorMagnitude velocity _projectile;
- };
-
- // init phase
- sleep 0.5;
-
- // top down attack
- if (!isNil "_flyInHeight") then {
- // premature explosion
- if (!alive _projectile) exitWith {};
-
- // get in travel height phase, abrupt direction change
- _vector = vectorDir _projectile;
- _vector set [2, 2];
- _vector = vectorNormalized _vector;
-
- [_projectile, _vector] call _fnc_changeMissileDirection;
-
- // missile reached travel height, change direction again
- waitUntil {!alive _projectile || {_projectile call _fnc_getHeight > _flyInHeight}};
-
- // premature explosion2
- if (!alive _projectile) exitWith {};
-
- // stay in travel height phase, another abrupt direction change
- _vector = vectorDir _projectile;
- _vector set [2, 0];
- _vector = vectorNormalized _vector;
-
- [_projectile, _vector] call _fnc_changeMissileDirection;
-
- // no target, self destruct
- if (isNull _target) exitWith {
- sleep 2;
- deleteVehicle _projectile;
- };
-
- // loop to stay in travel height and correct altitude
- _time = time;
- while {
- alive _projectile
- && {!isNull _target}
- && {[_projectile, _target] call _fnc_getHorizontalDistance > 100}
- } do {
- _height = _projectile call _fnc_getHeight;
- _pitch = _projectile call _fnc_getPitch;
-
- _dir = ([_projectile, _target] call _fnc_getDirTo) - direction _projectile;
- _up = if (abs (_flyInHeight - _height) < 1) then {
- -_pitch min 10 max -10
- } else {
- ([-20, 20] select (_height < _flyInHeight)) * (time - _time)
- };
-
- [_projectile, _dir, _up] call AGM_Core_fnc_changeProjectileDirection;
-
- _time = time;
- sleep 0.05;
- };
- };
-
- // missile missed target or hit a bird or something
- if (!alive _projectile) exitWith {};
-
- // allah ackbar, motherfucker
- while {
- alive _projectile
- && {!isNull _target}
- } do {
-
- // flare near target. Target flare instead if the target isn't a flare already
- // @todo some config values
- if !(_target isKindOf "CMflareAmmo") then {
- _flares = position _target nearObjects ["CMflareAmmo", 10];
-
- _count = count _flares;
- if (_count > 0) then {
- _target = _flares select floor random _count;
- };
- };
-
- _height = _projectile call _fnc_getHeight;
- _pitch = _projectile call _fnc_getPitch;
-
- _dir = ([_projectile, _target] call _fnc_getDirTo) - direction _projectile;
- _up = ([_projectile, _target] call _getPitchTo) - (_projectile call _fnc_getPitch);
-
- [_projectile, _dir, _up] call AGM_Core_fnc_changeProjectileDirection;
-
- _time = time;
- sleep 0.05;
- };
-};
diff --git a/TO_MERGE/agm/TopDownAttack/stringtable.xml b/TO_MERGE/agm/TopDownAttack/stringtable.xml
deleted file mode 100644
index bdede11d8f..0000000000
--- a/TO_MERGE/agm/TopDownAttack/stringtable.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- Toggle Top Down Attack
- Angriffsmodus umschalten
- Cambiar a ataque vertical
- Fentröl-támadás kapcsolása
- Przełącznik trybu ataku
- Переключить режим атаки
- Raketomet - Sepnout vertikální útok
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/agm/Wind/clientInit.sqf b/TO_MERGE/agm/Wind/clientInit.sqf
deleted file mode 100644
index af21636287..0000000000
--- a/TO_MERGE/agm/Wind/clientInit.sqf
+++ /dev/null
@@ -1,89 +0,0 @@
-// by CAA-Picard
-
-if !(hasInterface) exitWith {};
-
-// Kestrel Stuff
-AGM_isKestrel = false;
-AGM_isKestrelWheel = false;
-
-0 spawn {
- waitUntil {preloadTitleRsc ["AGM_Kestrel", "PLAIN"]};
- waitUntil {preloadTitleRsc ["AGM_KestrelWheel", "PLAIN"]};
- waitUntil {preloadTitleRsc ["AGM_KestrelWheel_Preload", "PLAIN"]};
-};
-
-// Air temperature and air density
-if (isNumber (configFile >> "CfgWorlds" >> worldName >> "AGM_TempMeanJan")) then {
- AGM_TempMeanJan = getNumber (configFile >> "CfgWorlds" >> worldName >> "AGM_TempMeanJan");
- AGM_TempMeanJul = getNumber (configFile >> "CfgWorlds" >> worldName >> "AGM_TempMeanJul");
- AGM_TempAmplitudeJan = getNumber (configFile >> "CfgWorlds" >> worldName >> "AGM_TempAmplitudeJan");
- AGM_TempAmplitudeJul = getNumber (configFile >> "CfgWorlds" >> worldName >> "AGM_TempAmplitudeJul");
-} else {
- _lat = - getNumber (configFile >> "CfgWorlds" >> worldName >> "latitude");
- if (_lat == 0) then {_lat = 0.1;};
- _yearlyTempMean = 28 min (28 - (abs(_lat) - 23.5) * (3.14159/180) * 6371 / 145);
- AGM_TempMeanJan = _yearlyTempMean - _lat / abs(_lat) * ((abs(_lat) max 25) - 25) * 30 / 65;
- AGM_TempMeanJul = _yearlyTempMean + _lat / abs(_lat) * ((abs(_lat) max 25) - 25) * 30 / 65;
- AGM_TempAmplitudeJan = 10;
- AGM_TempAmplitudeJul = 10;
-};
-
-0 spawn {
- while {true} do {
- _annualCoef = 0.5 - 0.5 * cos(360 * dateToNumber date);
- _dailyTempMean = AGM_TempMeanJan * (1 - _annualCoef) + AGM_TempMeanJul * _annualCoef;
- _dailyTempAmplitude = AGM_TempAmplitudeJan * (1 - _annualCoef) + AGM_TempAmplitudeJul * _annualCoef;
-
- _hourlyCoef = -0.5 * sin(360 * ((3 + (date select 3))/24 + (date select 4)/1440));
- AGM_Wind_currentTemperature = _dailyTempMean + _hourlyCoef * _dailyTempAmplitude - 2 * humidity - 4 * overcast;
- AGM_Wind_currentRelativeDensity = (273.15 + 20) / (273.15 + AGM_Wind_currentTemperature);
- sleep 60;
- };
-};
-
-// Wind & Temperature Readings
-0 spawn {
- while {true} do {
- waitUntil {(inputAction "Compass" > 0 or inputAction "CompassToggle" > 0) and (vehicle player == player)};
-
- _windStrength = sqrt((wind select 0) ^ 2 + (wind select 1) ^ 2);
-
- _arrowRscString = "";
- switch true do {
- case (_windStrength <= 0.5) : {};
- case (_windStrength <= 3) : {_arrowRscString = "VeryLight";};
- case (_windStrength <= 5) : {_arrowRscString = "Light";};
- case (_windStrength <= 7) : {_arrowRscString = "Moderate";};
- default {_arrowRscString = "Strong";};
- };
-
- _approxTemp = (round (AGM_Wind_currentTemperature / 5)) * 5; // in steps of 5
- hintSilent format ["%1: %2 °C", localize "STR_AGM_Wind_ApproximateTemp", _approxTemp];
-
- // Draw arrow indicator
- 186186 cutRsc ["AGM_Wind_Arrow", "PLAIN"];
-
- // Calculate relative direction between player
- #define numSectors 16
- _relAngle = windDir - (getdir (player));
- _sector = round(_relAngle / (360/numSectors)) + 1;
- if (_sector < 1) then {
- _sector = _sector + numSectors;
- };
- if (_sector > numSectors) then {
- _sector = _sector - numSectors;
- };
-
- // Update arrow indicator texture
- _textureName = if (_arrowRscString == "") then {
- "\AGM_Wind\ui\AGM_noWind.paa"
- } else {
- format["\AGM_Wind\ui\AGM_Wind%1-%2.paa", _arrowRscString, if (_sector < 10) then {"0"+str(_sector)} else {str(_sector)}]
- };
- ((uiNamespace getVariable "AGM_Wind_Arrow") displayCtrl 185185) ctrlSetText _textureName;
-
- sleep 0.1;
- //186186 cutText ["", "PLAIN"];
- hint "";
- };
-};
diff --git a/TO_MERGE/agm/Wind/config.cpp b/TO_MERGE/agm/Wind/config.cpp
deleted file mode 100644
index 5ec1605d99..0000000000
--- a/TO_MERGE/agm/Wind/config.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-class CfgPatches {
- class AGM_Wind {
- units[] = {"AGM_Item_ItemKestrel"};
- weapons[] = {"AGM_ItemKestrel"};
- requiredVersion = 0.60;
- requiredAddons[] = {AGM_Core, AGM_Interaction};
- version = "0.95";
- versionStr = "0.95";
- versionAr[] = {0,95,0};
- author[] = {"Falke", "commy2", "KoffeinFlummi", "CAA-Picard"};
- authorUrl = "https://github.com/KoffeinFlummi/";
- };
-};
-
-class CfgFunctions {
- class AGM_Wind {
- class AGM_Wind {
- file = "AGM_Wind\functions";
- class firedEH;
- class init;
- class openKestrel;
- };
- };
-};
-
-class Extended_PostInit_EventHandlers {
- class AGM_Wind {
- serverInit = "if (isServer && {call AGM_Core_fnc_isAutoWind}) then {setWind [wind select 0, wind select 1, true]};";
- clientInit = "call compile preprocessFileLineNumbers '\AGM_Wind\clientInit.sqf'";
- };
-};
-
-class Extended_InitPost_EventHandlers {
- class CAManBase {
- class AGM_Wind {
- init = "_this call AGM_Wind_fnc_init";
- };
- };
-};
-
-class Extended_Fired_EventHandlers {
- class CAManBase {
- class AGM_Wind {
- clientFired = "_this call AGM_Wind_fnc_firedEH";
- };
- };
-};
-
-class CfgWeapons {
- class AGM_ItemCore;
- class InventoryItem_Base_F;
-
- class AGM_ItemKestrel: AGM_ItemCore {
- author = "Falke";
- scope = 2;
- displayName = "$STR_AGM_Kestrel_Name";
- descriptionShort = "$STR_AGM_Kestrel_Description";
- model = "\AGM_Wind\kestrel4500.p3d";
- picture = "\AGM_Wind\data\4500NV.paa";
- icon = "iconObject_circle";
- mapSize = 0.034;
- class ItemInfo: InventoryItem_Base_F {
- mass = 2;
- };
- };
-};
-
-class CfgVehicles {
- class Man;
- class CAManBase: Man {
- class AGM_SelfActions {
- class AGM_OpenKestrel {
- displayName = "$STR_AGM_Wind_OpenKestrel";
- condition = "'AGM_ItemKestrel' in items player && {!underwater player} && {cameraView != 'Gunner'} && {!AGM_isKestrel}";
- statement = "call AGM_Wind_fnc_openKestrel";
- showDisabled = 0;
- priority = 2;
- icon = "AGM_Wind\data\4500NV1.paa";
- hotkey = "K";
- };
- class AGM_CloseKestrel {
- displayName = "$STR_AGM_Wind_CloseKestrel";
- condition = "AGM_isKestrel";
- statement = "AGM_isKestrel = false";
- showDisabled = 0;
- priority = 2;
- icon = "AGM_Wind\data\4500NV1.paa";
- hotkey = "K";
- };
- };
- };
-
- class Item_Base_F;
- class AGM_Item_ItemKestrel: Item_Base_F {
- author = "Falke";
- scope = 2;
- scopeCurator = 2;
- displayName = "$STR_AGM_Kestrel_Name";
- vehicleClass = "Items";
- class TransportItems {
- class AGM_ItemKestrel {
- name = "AGM_ItemKestrel";
- count = 1;
- };
- };
- };
-
- class Box_NATO_Support_F;
- class AGM_Box_Misc: Box_NATO_Support_F {
- class TransportItems {
- class _xx_AGM_ItemKestrel {
- name = "AGM_ItemKestrel";
- count = 6;
- };
- };
- };
-};
-
-
-class CfgAmmo {
- class Default;
- class BulletCore;
- class B_127x108_Ball;
- class B_127x99_Ball;
- class BulletBase : BulletCore {
- AGM_Bullet_Dispersion = 0;
- };
- class B_127x108_APDS : B_127x108_Ball {
- AGM_Bullet_Dispersion = 0.017;
- };
- class B_127x99_SLAP : B_127x99_Ball {
- AGM_Bullet_Dispersion = 0.017;
- };
-};
-
-class RscText;
-class AGM_Rsc_Control_Base;
-class AGM_Rsc_Display_Base;
-class RscTitles {
- titles[] = {AGM_Kestrel, AGM_KestrelWheel};
-
- class AGM_Wind_Arrow {
- idd = -1;
- movingEnable=0;
- duration=0.5;
- fadeIn=0;
- fadeOut=0.25;
- onLoad = "with uiNameSpace do { AGM_Wind_Arrow = _this select 0 };";
- controls[] = {"AGM_Wind_Arrow_BG","AGM_Wind_Arrow_FW"};
- class AGM_Wind_Arrow_BG: RscText {
- idc = -1;
- type = 0;
- style = 128;
- colorBackground[] = {0,0,0,0};
- colorText[] = {0,0,0,0};
- text = "";
- sizeEx = 0.027;
- x = "SafeZoneX + 0.001";
- y = "SafeZoneY + 0.05";
- w = 0.25;
- h = 0.25;
- size = 0.034;
- };
- class AGM_Wind_Arrow_FW: AGM_Wind_Arrow_BG {
- idc = 185185;
- style = 48;
- colorText[] = {1,1,1,1};
- sizeEx = 0.03;
- text = "";
- };
- };
-
- class AGM_Kestrel {
- idd = -1;
- movingEnable = 0;
- enableSimulation = 1;
- enableDisplay = 1;
- onLoad = "_this spawn compile preprocessFileLineNumbers '\AGM_Wind\scripts\KestrelonLoad.sqf'";
- duration = 1e+011;
- fadein = 0;
- fadeout = 0;
- name = "AGM_Kestrel";
- class RscPicture;
- class RscText;
- class controls {
- class AGM_KestrelHUDpic: RscPicture {
- idc = 42001;
- type = 0;
- text = "AGM_Wind\data\4500NV1.paa";
- style = 48 + 0x800;
- x = safeZoneX -0.25;
- y = safeZoneY + safeZoneH - 0.8;
- h = 0.75;
- w = 0.75;
- scale = 1;
- font = "PuristaMedium";
- sizeEx = 1;
- colorText[] = {1, 1, 1, 1};
- colorBackground[] = {1, 1, 1, 1};
- shadow = 0;
- };
- class AGM_KestrelHUDpic_Night: RscPicture {
- idc = 42006;
- type = 0;
- text = "AGM_Wind\data\4500NV2.paa";
- style = 48 + 0x800;
- x = safeZoneX -0.25;
- y = safeZoneY + safeZoneH - 0.8;
- h = 0.75;
- w = 0.75;
- scale = 1;
- font = "PuristaMedium";
- sizeEx = 1;
- colorText[] = {0,0,0,1-(sunOrMoon*sunOrMoon+(moonIntensity/5))};
- colorBackground[] = {1, 1, 1, 1};
- shadow = 0;
- };
- class AGM_KestrelHUD1: RscText {
- idc = 42002;
- type = 0;
- style = 1;
- x = safeZoneX +0.08;
- y = safeZoneY + safeZoneH -0.51;
- h = 0.09;
- w = 0.108;
- sizeEx = 0.04;
- lineSpacing = 1;
- font = "PuristaMedium";
- text = " 0000";
- colorText[] = {0.0745,0.2196,0.1216, 0.7};
- colorBackground[] = {0, 0, 0, 0};
- shadow = 0;
- };
- class AGM_KestrelHUD2: RscText {
- idc = 42003;
- type = 0;
- style = 1;
- x = safeZoneX +0.08;
- y = safeZoneY + safeZoneH -0.48;
- h = 0.09;
- w = 0.108;
- sizeEx = 0.04;
- lineSpacing = 1;
- font = "PuristaMedium";
- text = " 0000";
- colorText[] = {0.0745,0.2196,0.1216, 0.7};
- colorBackground[] = {0, 0, 0, 0};
- shadow = 0;
- };
- class AGM_KestrelHUD3: RscText {
- idc = 42004;
- type = 0;
- style = 1;
- x = safeZoneX +0.08;
- y = safeZoneY + safeZoneH -0.45;
- h = 0.09;
- w = 0.108;
- sizeEx = 0.04;
- lineSpacing = 1;
- font = "PuristaMedium";
- text = " 0000";
- colorText[] = {0.0745,0.2196,0.1216, 0.7};
- colorBackground[] = {0, 0, 0, 0};
- shadow = 0;
- };
- class AGM_KestrelHUD4: RscText {
- idc = 42005;
- type = 0;
- style = 1;
- //x = safeZoneX +0.068;
- x = safeZoneX + 0.08;
- y = safeZoneY + safeZoneH - 0.418;
- h = 0.09;
- w = 0.108;
- //w = 0.138;
- sizeEx = 0.04;
- lineSpacing = 1;
- font = "PuristaMedium";
- text = " 0000";
- colorText[] = {0.0745,0.2196,0.1216, 0.7};
- colorBackground[] = {0, 0, 0, 0};
- shadow = 0;
- };
- };
- };
- class AGM_KestrelWheel {
- idd = -1;
- movingEnable = 0;
- enableSimulation = 1;
- enableDisplay = 1;
- onLoad = "_this spawn compile preprocessFileLineNumbers '\AGM_Wind\scripts\KestrelonLoadRad.sqf'";
- duration = 1e+011;
- fadein = 0;
- fadeout = 0;
- name = "AGM_KestrelWheel";
- class RscPicture;
- class controls {
- class AGM_KestrelHUDrad: RscPicture {
- idc = 42010;
- type = 0;
- text = "AGM_Wind\data\kestrel_0.paa";
- style = 48 + 0x800;
- x = safeZoneX + 0.07;
- y = safeZoneY + safeZoneH - 0.76;
- h = 0.15;
- w = 0.15;
- scale = 1;
- font = "PuristaMedium";
- sizeEx = 1;
- colorText[] = {1, 1, 1, 1};
- colorBackground[] = {1, 1, 1, 1};
- shadow = 0;
- };
- };
- };
-
- class AGM_KestrelWheel_Preload: AGM_Rsc_Display_Base {
- class controlsBackground {
- class Preload_0: AGM_Rsc_Control_Base {
- text = "\AGM_Wind\data\kestrel_0.paa";
- };
- class Preload_1: Preload_0 {
- text = "\AGM_Wind\data\kestrel_1.paa";
- };
- class Preload_2: Preload_0 {
- text = "\AGM_Wind\data\kestrel_2.paa";
- };
- class Preload_3: Preload_0 {
- text = "\AGM_Wind\data\kestrel_3.paa";
- };
- class Preload_4: Preload_0 {
- text = "\AGM_Wind\data\kestrel_4.paa";
- };
- class Preload_5: Preload_0 {
- text = "\AGM_Wind\data\kestrel_5.paa";
- };
- class Preload_6: Preload_0 {
- text = "\AGM_Wind\data\kestrel_6.paa";
- };
- class Preload_7: Preload_0 {
- text = "\AGM_Wind\data\kestrel_7.paa";
- };
- class Preload_8: Preload_0 {
- text = "\AGM_Wind\data\kestrel_8.paa";
- };
- class Preload_9: Preload_0 {
- text = "\AGM_Wind\data\kestrel_9.paa";
- };
- };
- };
-};
-
-class CfgWorlds {
- class CAWorld;
-
- class Stratis: CAWorld {
- AGM_TempMeanJan = 7.4;
- AGM_TempMeanJul = 25.9;
- AGM_TempAmplitudeJan = 6.4;
- AGM_TempAmplitudeJul = 9.2;
- };
-
- class Altis: CAWorld {
- AGM_TempMeanJan = 7.4;
- AGM_TempMeanJul = 25.9;
- AGM_TempAmplitudeJan = 6.4;
- AGM_TempAmplitudeJul = 9.2;
- };
-};
diff --git a/TO_MERGE/agm/Wind/data/4500NV.paa b/TO_MERGE/agm/Wind/data/4500NV.paa
deleted file mode 100644
index fd72433b9e..0000000000
Binary files a/TO_MERGE/agm/Wind/data/4500NV.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/4500NV1.paa b/TO_MERGE/agm/Wind/data/4500NV1.paa
deleted file mode 100644
index 9a29b346fb..0000000000
Binary files a/TO_MERGE/agm/Wind/data/4500NV1.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/4500NV2.paa b/TO_MERGE/agm/Wind/data/4500NV2.paa
deleted file mode 100644
index 992743a3a6..0000000000
Binary files a/TO_MERGE/agm/Wind/data/4500NV2.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/arrow1.paa b/TO_MERGE/agm/Wind/data/arrow1.paa
deleted file mode 100644
index 8edb257ead..0000000000
Binary files a/TO_MERGE/agm/Wind/data/arrow1.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/body.paa b/TO_MERGE/agm/Wind/data/body.paa
deleted file mode 100644
index bec55bb418..0000000000
Binary files a/TO_MERGE/agm/Wind/data/body.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/gpstemp.paa b/TO_MERGE/agm/Wind/data/gpstemp.paa
deleted file mode 100644
index ef45fe406c..0000000000
Binary files a/TO_MERGE/agm/Wind/data/gpstemp.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_0.paa b/TO_MERGE/agm/Wind/data/kestrel_0.paa
deleted file mode 100644
index 190c25f100..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_0.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_1.paa b/TO_MERGE/agm/Wind/data/kestrel_1.paa
deleted file mode 100644
index fe757888e4..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_1.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_2.paa b/TO_MERGE/agm/Wind/data/kestrel_2.paa
deleted file mode 100644
index 1b0fda0a65..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_2.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_3.paa b/TO_MERGE/agm/Wind/data/kestrel_3.paa
deleted file mode 100644
index 659f4597a3..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_3.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_4.paa b/TO_MERGE/agm/Wind/data/kestrel_4.paa
deleted file mode 100644
index abb1ed6580..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_4.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_5.paa b/TO_MERGE/agm/Wind/data/kestrel_5.paa
deleted file mode 100644
index 800ed80d8b..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_5.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_6.paa b/TO_MERGE/agm/Wind/data/kestrel_6.paa
deleted file mode 100644
index 784e441c21..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_6.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_7.paa b/TO_MERGE/agm/Wind/data/kestrel_7.paa
deleted file mode 100644
index 9452286c2d..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_7.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_8.paa b/TO_MERGE/agm/Wind/data/kestrel_8.paa
deleted file mode 100644
index 31fe71ce84..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_8.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/kestrel_9.paa b/TO_MERGE/agm/Wind/data/kestrel_9.paa
deleted file mode 100644
index 978506ef5d..0000000000
Binary files a/TO_MERGE/agm/Wind/data/kestrel_9.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/rad.paa b/TO_MERGE/agm/Wind/data/rad.paa
deleted file mode 100644
index 13a3ffe6f7..0000000000
Binary files a/TO_MERGE/agm/Wind/data/rad.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/tasten.paa b/TO_MERGE/agm/Wind/data/tasten.paa
deleted file mode 100644
index 8a140ec5f0..0000000000
Binary files a/TO_MERGE/agm/Wind/data/tasten.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/data/tasten1.paa b/TO_MERGE/agm/Wind/data/tasten1.paa
deleted file mode 100644
index af441a51de..0000000000
Binary files a/TO_MERGE/agm/Wind/data/tasten1.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/functions/fn_firedEH.sqf b/TO_MERGE/agm/Wind/functions/fn_firedEH.sqf
deleted file mode 100644
index df714cf5df..0000000000
--- a/TO_MERGE/agm/Wind/functions/fn_firedEH.sqf
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Authors: KoffeinFlummi, esteldunedain
- *
- * Changes the bullet trajectory depending on wind, density and temperature.
- *
- * Arguments:
- * Fired EH
- *
- * Return Value:
- * none
- */
-
-private ["_unit", "_ammoType", "_round", "_dispersion", "_additionalVel"];
-
-_unit = _this select 0;
-_ammoType = _this select 4;
-_round = _this select 5;
-
-if !(local _unit) exitWith {};
-if !([_unit] call AGM_Core_fnc_isPlayer) exitWith {};
-if (_round isKindOf "GrenadeHand") exitWith {};
-
-// Additional dispersion
-_dispersion = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "AGM_Bullet_Dispersion");
-
-// Powder temp effect
-_additionalVel = (vectorMagnitude (velocity _round)) * ((((AGM_Wind_currentTemperature + 273.13) / 288.13 - 1) / 2.5 + 1 ) - 1);
-
-[_round, ((random 2) - 1) * _dispersion, ((random 2) - 1) * _dispersion, _additionalVel] call AGM_Core_fnc_changeProjectileDirection;
-
-_this spawn {
- _ammoType = _this select 4;
- _round = _this select 5;
-
- _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "airFriction");
- _simulation = getText (configFile >> "CfgAmmo" >> _ammoType >> "simulation");
- _time = time;
-
- if (_airFriction >= 0 || {_simulation == "shotMissile"} || {_simulation == "shotRocket"}) then {
- // Do not correct for airDensity if airFriction is not logical on the first place
- _airFriction = -0.0007;
- while {!isNull _round and alive _round} do {
- _deltaTime = time - _time;
-
- _velocity = velocity _round;
- _velocityNew = _velocity
- // Calculate approximate wind drag
- vectorDiff (wind vectorMultiply (vectorMagnitude (_velocity vectorDiff wind) * AGM_Wind_currentRelativeDensity * _airFriction * _deltaTime));
- _round setVelocity _velocityNew;
-
- _time = time;
- sleep 0.05;
- };
- } else {
- // Calculate total drag based on aparent wind
- while {!isNull _round and alive _round} do {
- _deltaTime = time - _time;
-
- // See https://github.com/KoffeinFlummi/AGM/issues/996 and See https://github.com/KoffeinFlummi/AGM/issues/1732
- _velocity = velocity _round;
- _aparentWind = wind vectorDiff _velocity;
- _velocityNew = (_velocity
- // Undo engine's drag calculation (airFriction * V^2 * dt)
- vectorDiff (_velocity vectorMultiply (vectorMagnitude _velocity * _airFriction * _deltaTime)))
- // Calculate total drag based on aparent wind
- vectorDiff (_aparentWind vectorMultiply (vectorMagnitude _aparentWind * AGM_Wind_currentRelativeDensity * _airFriction * _deltaTime));
-
- _round setVelocity _velocityNew;
-
- _time = time;
- sleep 0.05;
- };
- };
-};
diff --git a/TO_MERGE/agm/Wind/functions/fn_init.sqf b/TO_MERGE/agm/Wind/functions/fn_init.sqf
deleted file mode 100644
index 1c7b385963..0000000000
--- a/TO_MERGE/agm/Wind/functions/fn_init.sqf
+++ /dev/null
@@ -1,9 +0,0 @@
-private ["_unit"];
-
-_unit = _this select 0;
-
-// Substitute wind calculations for AI by lowering accuracy
-if !(isPlayer _unit) exitWith {
- _windStrength = sqrt((wind select 0) ^ 2 + (wind select 1) ^ 2);
- _unit setSkill ["aimingAccuracy", (_unit skill "aimingAccuracy") * (1 - _windStrength / 14)];
-};
diff --git a/TO_MERGE/agm/Wind/functions/fn_openKestrel.sqf b/TO_MERGE/agm/Wind/functions/fn_openKestrel.sqf
deleted file mode 100644
index 9fc7cefeb8..0000000000
--- a/TO_MERGE/agm/Wind/functions/fn_openKestrel.sqf
+++ /dev/null
@@ -1,7 +0,0 @@
-// by commy2
-
-AGM_isKestrel = true;
-AGM_isKestrelWheel = true;
-
-(["AGM_KestrelWheel"] call BIS_fnc_rscLayer) cutRsc ["AGM_KestrelWheel", "PLAIN", 0, false];
-(["AGM_Kestrel"] call BIS_fnc_rscLayer) cutRsc ["AGM_Kestrel", "PLAIN", 0, false];
diff --git a/TO_MERGE/agm/Wind/kestrel4500.p3d b/TO_MERGE/agm/Wind/kestrel4500.p3d
deleted file mode 100644
index af487e33a6..0000000000
Binary files a/TO_MERGE/agm/Wind/kestrel4500.p3d and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/kestrel4500rad.p3d b/TO_MERGE/agm/Wind/kestrel4500rad.p3d
deleted file mode 100644
index 128c3be2d9..0000000000
Binary files a/TO_MERGE/agm/Wind/kestrel4500rad.p3d and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/scripts/KestrelonLoad.sqf b/TO_MERGE/agm/Wind/scripts/KestrelonLoad.sqf
deleted file mode 100644
index 78e793deb0..0000000000
--- a/TO_MERGE/agm/Wind/scripts/KestrelonLoad.sqf
+++ /dev/null
@@ -1,125 +0,0 @@
-// by Falke
-
-disableSerialization;
-_display = _this select 0;
-_ctrl1 = _display displayCtrl 42001;
-_ctrl2 = _display displayCtrl 42002;
-_ctrl3 = _display displayCtrl 42003;
-_ctrl4 = _display displayCtrl 42004;
-_ctrl5 = _display displayCtrl 42005;
-_ctrl6 = _display displayCtrl 42006;
-_sleep1 = 0.5;
-AGM_Kestrel_wind_Head=0;
-//unIFormItems _player+backpackItems _player+vestItems _player
-//assigneditems _player
-
-_player = AGM_player;
-
-IF (!("AGM_ItemKestrel" in items _player )) THEN {AGM_isKestrel = FALSE;};
-IF (underwater _player) THEN {AGM_isKestrel = FALSE;};
-
-WHILE {AGM_isKestrel} DO {
- _dSpotter = direction _player;
- _windrarray = WIND;
- _windrA= _windrarray select 0;
- _windrB= _windrarray select 1;
- _windrC= sqrt ((_windrA * _windrA) + (_windrB * _windrB));
- _windrD= _windrA atan2 _windrB;
- _windrR = _dSpotter - _windrD;
- IF (_windrR < 0) THEN {_windrR = 360+_windrR;};
- _windrBB = _windrC * sin (_windrR);
- _windrAA = sqrt ((_windrC * _windrC) - (_windrBB * _windrBB));
- IF (_windrR < 90) THEN {_windrAA= _windrAA - (_windrAA*2);};
- IF (_windrR > 270) THEN {_windrAA= _windrAA - (_windrAA*2);};
-
- _OrtPlayer = eyePos _player;
- _Pos0 = _OrtPlayer select 0;
- _Pos1 = _OrtPlayer select 1;
- _Pos2 = _OrtPlayer select 2;
-
- // im Gebaude
- _Ort=0;
- IF (lineIntersects [_OrtPlayer, [_Pos0,_Pos1,_Pos2 + 15]]) THEN {_Ort=_Ort+1};
- /*
- if (lineIntersects [_OrtPlayer, [_Pos0,_Pos1 + 15,_Pos2]]) then {_Ort=_Ort+1};
- if (lineIntersects [_OrtPlayer, [_Pos0,_Pos1 - 15,_Pos2]]) then {_Ort=_Ort+1};
- if (lineIntersects [_OrtPlayer, [_Pos0 + 15,_Pos1,_Pos2]]) then {_Ort=_Ort+1};
- if (lineIntersects [_OrtPlayer, [_Pos0 - 15,_Pos1,_Pos2]]) then {_Ort=_Ort+1};
- */
- IF (lineIntersects [[(_Pos0) , (_Pos1), (_Pos2)], [(_Pos0) - (sin windDir) * 15, (_Pos1) - (cos windDir) * 15, (_Pos2)]]) THEN {_Ort=_Ort+1};
- IF (lineIntersects [[(_Pos0) , (_Pos1), (_Pos2)], [(_Pos0) - (sin (windDir-90)) * 15, (_Pos1) - (cos (windDir-90)) * 15, (_Pos2)]]) THEN {_Ort=_Ort+1};
- IF (lineIntersects [[(_Pos0) , (_Pos1), (_Pos2)], [(_Pos0) - (sin (windDir+90)) * 15, (_Pos1) - (cos (windDir+90)) * 15, (_Pos2)]]) THEN {_Ort=_Ort+1};
- IF (lineIntersects [[(_Pos0) , (_Pos1), (_Pos2)], [(_Pos0) - (sin (windDir+180)) * 15, (_Pos1) - (cos (windDir+180)) * 15, (_Pos2)]]) THEN {_Ort=_Ort+1};
- if (_Ort>3) then {_windrAA=99.99;_windrBB=99.99};
-
- // in Windrichtung
- _Ort=0;
- IF (lineIntersects [[(_Pos0) , (_Pos1), (_Pos2)], [(_Pos0) - (sin windDir) * 5, (_Pos1) - (cos windDir) * 5, (_Pos2)]]) THEN {_Ort=_Ort+1};
- IF (lineIntersects [[(_Pos0) , (_Pos1), (_Pos2)], [(_Pos0) - (sin (windDir-15)) * 5, (_Pos1) - (cos (windDir-15)) * 5, (_Pos2)]]) THEN {_Ort=_Ort+1};
- IF (lineIntersects [[(_Pos0) , (_Pos1), (_Pos2)], [(_Pos0) - (sin (windDir+15)) * 5, (_Pos1) - (cos (windDir+15)) * 5, (_Pos2)]]) THEN {_Ort=_Ort+1};
- //IF (lineIntersects [_OrtPLAYER, [_Pos0,_Pos1,_Pos2 + 10]]) THEN {_Ort=_Ort+1};
- IF (_Ort>2) THEN {_windrAA=99.99;_windrBB=99.99};
-
- /*
- onEachFrame {
- _OrtPLAYER = eyePos _player;
- _Pos0=_OrtPLAYER select 0;
- _Pos1=_OrtPLAYER select 1;
- _Pos2=_OrtPLAYER select 2;
- drawLine3D [[(_Pos0) , (_Pos1), (_Pos2)-(getPosASL _player SELECT 2)], [(_Pos0) - (sin windDir) * 5, (_Pos1) - (cos windDir) * 5, (_Pos2)-(getPosASL _player SELECT 2)], [1,0,0,1]];
- drawLine3D [[(_Pos0) , (_Pos1), (_Pos2)-(getPosASL _player SELECT 2)], [(_Pos0) - (sin (windDir-15)) * 5, (_Pos1) - (cos (windDir-15)) * 5, (_Pos2)-(getPosASL _player SELECT 2)], [1,0,0,1]];
- drawLine3D [[(_Pos0) , (_Pos1), (_Pos2)-(getPosASL _player SELECT 2)], [(_Pos0) - (sin (windDir+15)) * 5, (_Pos1) - (cos (windDir+15)) * 5, (_Pos2)-(getPosASL _player SELECT 2)], [1,0,0,1]];
-
- drawLine3D [[(_Pos0) , (_Pos1), (_Pos2)-(getPosASL _player SELECT 2)], [_Pos0,_Pos1,_Pos2 + 15-(getPosASL _player SELECT 2)], [0,0,1,1]];
-
- drawLine3D [[(_Pos0) , (_Pos1), (_Pos2)-(getPosASL _player SELECT 2)], [(_Pos0) - (sin (windDir)) * 15, (_Pos1) - (cos (windDir)) * 15, (_Pos2)-(getPosASL _player SELECT 2)], [0,1,0,1]];
- drawLine3D [[(_Pos0) , (_Pos1), (_Pos2)-(getPosASL _player SELECT 2)], [(_Pos0) - (sin (windDir+90)) * 15, (_Pos1) - (cos (windDir+90)) * 15, (_Pos2)-(getPosASL _player SELECT 2)], [0,1,0,1]];
- drawLine3D [[(_Pos0) , (_Pos1), (_Pos2)-(getPosASL _player SELECT 2)], [(_Pos0) - (sin (windDir-90)) * 15, (_Pos1) - (cos (windDir-90)) * 15, (_Pos2)-(getPosASL _player SELECT 2)], [0,1,0,1]];
- drawLine3D [[(_Pos0) , (_Pos1), (_Pos2)-(getPosASL _player SELECT 2)], [(_Pos0) - (sin (windDir+180)) * 15, (_Pos1) - (cos (windDir+180)) * 15, (_Pos2)-(getPosASL _player SELECT 2)], [0,1,0,1]];
- };
- */
- //IF (vehicle _player != _player) THEN {_windrAA=0;_windrBB=0};
- IF (_player != vehicle _player) THEN {_windrAA=0;_windrBB=0};
-
- IF (_windrAA == 99.99) then {
- AGM_Kestrel_wind_Head = 0;
- _windrAA= "0.00";
- _windrBB= "0.00";
- }ELSE{
- AGM_Kestrel_wind_Head=_windrAA;
- IF (_windrAA < 0) THEN {
- _windrAA= FORMAT["-%1",[_windrAA*-1, 1, 2] call CBA_fnc_FORMATNumber];
- }ELSE{
- _windrAA= FORMAT["%1",[_windrAA, 1, 2] call CBA_fnc_FORMATNumber];
- };
- IF (_windrBB < 0) THEN {
- _windrBB= FORMAT["-%1",[_windrBB*-1, 1, 2] call CBA_fnc_FORMATNumber];
- }ELSE{
- _windrBB= FORMAT["%1",[_windrBB, 1, 2] call CBA_fnc_FORMATNumber];
- };
- };
-
- _ctrl2 ctrlSetText _windrAA;
- _ctrl3 ctrlSetText _windrBB;
- _ctrl4 ctrlSetText FORMAT["%1",round (direction _player)];
- _ctrl5 ctrlSetText FORMAT["%1", (round (AGM_Wind_currentTemperature * 10)) / 10];
- _ctrl6 ctrlsettextcolor [0,0,0,1-(sunOrMoon*sunOrMoon+(moonIntensity/5))];
-
- IF (!("AGM_ItemKestrel" in items _player)) THEN {AGM_isKestrel = FALSE;};
- IF (
- underwater _player ||
- //{_player != vehicle _player} ||
- {cameraView == "GUNNER"} ||
- {!alive _player}
- ) THEN {AGM_isKestrel = FALSE;};
- IF (!AGM_isKestrel) THEN {_sleep1 = 0.01;};
-
- SLEEP _sleep1;
-};
-AGM_isKestrelWheel=False;
-_ctrl1 ctrlShow false;
-_ctrl2 ctrlShow false;
-_ctrl3 ctrlShow false;
-_ctrl4 ctrlShow false;
-_ctrl5 ctrlShow false;
-_ctrl6 ctrlShow false;
diff --git a/TO_MERGE/agm/Wind/scripts/KestrelonLoadRad.sqf b/TO_MERGE/agm/Wind/scripts/KestrelonLoadRad.sqf
deleted file mode 100644
index 82c7dcc7f5..0000000000
--- a/TO_MERGE/agm/Wind/scripts/KestrelonLoadRad.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-// by Falke
-
-disableSerialization;
-_display1 = _this select 0;
-_ctrl10 = _display1 displayCtrl 42010;
-_rad1=1;
-AGM_Kestrel_wind_Head=0;
-while {AGM_isKestrelWheel} do {
- _rad2=(AGM_Kestrel_wind_Head*2);
- if (_rad2 > 5) then { _rad2=5; };
- if (_rad2 < -5) then { _rad2=-5; };
- _rad1=_rad1+_rad2;
- if (_rad1 < 0) then { _rad1=_rad1+9; };
- if (_rad1 > 9) then { _rad1=_rad1-9; };
- waitUntil {preloadTitleRsc ["AGM_KestrelWheel_Preload", "PLAIN"]};
- _ctrl10 ctrlSetText format["AGM_Wind\data\kestrel_%1.paa",round _rad1];
- _Night = (sunOrMoon*sunOrMoon+(moonIntensity/5));
- _ctrl10 ctrlsettextcolor [_Night,_Night,_Night,1];
- sleep 0.01;
- _i = 0; waitUntil {_i = _i + 1; _i > 1};
-};
-_ctrl10 ctrlShow false;
diff --git a/TO_MERGE/agm/Wind/stringtable.xml b/TO_MERGE/agm/Wind/stringtable.xml
deleted file mode 100644
index be69952adb..0000000000
--- a/TO_MERGE/agm/Wind/stringtable.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
- Approximate Temperature
- Ungefähre Temperatur
- Temperatura aproximada
- Estimer la température
- Przybliżona temperatura
- Odhadovaná teplota
- Hőmérséklet nagyábol
- Примерная температура
-
-
- Kestrel 4500NV
- Kestrel 4500NV
- Kestrel 4500NV
- Kestrel 4500NV
- Kestrel 4500NV
- Kestrel 4500NV
- Kestrel 4500NV
- Kestrel 4500NV
- Kestrel 4500NV
- Kestrel 4500NV
-
-
- Applied Ballistics Meter
- Applied Ballistics Meter
- Anemómetro balístico
- Applied Ballistics Meter
- Urządzenie do monitorowania pogody
- Zařízení pro měření vítru
- Monitoraggio Balistico Attivo
- Applied Ballistics Meter
- Medidor Balístico Ativo
- метеостанция
-
-
- Open Kestrel
- Kestrel öffnen
- Abrir Kestrel
- Ouvrir Kestrel
- Otwórz Kestrel
- Otevřít Kestrel
- Abrir Kestrel
- Apri Kestrel
- Kestrel bekapcsolása
- Открыть Kestrel
-
-
- Close Kestrel
- Kestrel schließen
- Cerrar Kestrel
- Fermer Kestrel
- Zamknij Kestrel
- Zavřít Kestrel
- Fechar Kestrel
- Chiudi Kestrel
- Kestrel kikapcsolása
- Закрыть Kestrel
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-01.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-01.paa
deleted file mode 100644
index 9865029c93..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-01.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-02.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-02.paa
deleted file mode 100644
index a02147e6ee..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-02.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-03.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-03.paa
deleted file mode 100644
index 340cfdcd6e..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-03.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-04.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-04.paa
deleted file mode 100644
index 6d8404fb86..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-04.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-05.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-05.paa
deleted file mode 100644
index 2de5cdbd74..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-05.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-06.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-06.paa
deleted file mode 100644
index c5e0a40af7..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-06.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-07.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-07.paa
deleted file mode 100644
index 4df57f7585..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-07.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-08.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-08.paa
deleted file mode 100644
index 8c5012502f..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-08.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-09.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-09.paa
deleted file mode 100644
index 15173a56ab..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-09.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-10.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-10.paa
deleted file mode 100644
index 83c860cecb..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-10.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-11.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-11.paa
deleted file mode 100644
index 8beeb80d98..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-11.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-12.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-12.paa
deleted file mode 100644
index d9a62f9e81..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-12.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-13.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-13.paa
deleted file mode 100644
index 87a8dfcca9..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-13.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-14.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-14.paa
deleted file mode 100644
index f9200aaf2d..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-14.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-15.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-15.paa
deleted file mode 100644
index e3ee52d21e..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-15.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindLight-16.paa b/TO_MERGE/agm/Wind/ui/AGM_WindLight-16.paa
deleted file mode 100644
index 9b835e62c4..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindLight-16.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-01.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-01.paa
deleted file mode 100644
index fd4d255c35..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-01.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-02.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-02.paa
deleted file mode 100644
index db6e8dcebc..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-02.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-03.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-03.paa
deleted file mode 100644
index 300934ff37..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-03.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-04.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-04.paa
deleted file mode 100644
index f7b8331dae..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-04.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-05.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-05.paa
deleted file mode 100644
index a3b0a532ff..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-05.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-06.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-06.paa
deleted file mode 100644
index 495ec6bc15..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-06.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-07.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-07.paa
deleted file mode 100644
index d0471a4c4f..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-07.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-08.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-08.paa
deleted file mode 100644
index 967e9d8ef7..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-08.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-09.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-09.paa
deleted file mode 100644
index 54ef3eabf9..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-09.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-10.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-10.paa
deleted file mode 100644
index e7608c2e02..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-10.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-11.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-11.paa
deleted file mode 100644
index 6d1ce9418e..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-11.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-12.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-12.paa
deleted file mode 100644
index 2b853dca89..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-12.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-13.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-13.paa
deleted file mode 100644
index 56443ab4f9..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-13.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-14.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-14.paa
deleted file mode 100644
index 06cb4610fb..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-14.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-15.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-15.paa
deleted file mode 100644
index 5f548b6ac9..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-15.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-16.paa b/TO_MERGE/agm/Wind/ui/AGM_WindModerate-16.paa
deleted file mode 100644
index 617e83193d..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindModerate-16.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-01.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-01.paa
deleted file mode 100644
index 87c2db663c..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-01.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-02.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-02.paa
deleted file mode 100644
index 8d29483635..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-02.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-03.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-03.paa
deleted file mode 100644
index fc08f14e1b..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-03.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-04.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-04.paa
deleted file mode 100644
index 3fbbd70302..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-04.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-05.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-05.paa
deleted file mode 100644
index 2254b0d545..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-05.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-06.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-06.paa
deleted file mode 100644
index 6054696d61..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-06.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-07.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-07.paa
deleted file mode 100644
index d62308dfc9..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-07.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-08.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-08.paa
deleted file mode 100644
index cce04ab099..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-08.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-09.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-09.paa
deleted file mode 100644
index e2c53aec6f..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-09.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-10.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-10.paa
deleted file mode 100644
index 609b54096a..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-10.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-11.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-11.paa
deleted file mode 100644
index 705cc5bd10..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-11.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-12.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-12.paa
deleted file mode 100644
index d8d585d6eb..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-12.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-13.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-13.paa
deleted file mode 100644
index d903c832ab..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-13.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-14.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-14.paa
deleted file mode 100644
index 91153a801b..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-14.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-15.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-15.paa
deleted file mode 100644
index d0a34d79e4..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-15.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-16.paa b/TO_MERGE/agm/Wind/ui/AGM_WindStrong-16.paa
deleted file mode 100644
index 1be25039e4..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindStrong-16.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-01.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-01.paa
deleted file mode 100644
index 561e52ec88..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-01.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-02.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-02.paa
deleted file mode 100644
index fbce91664a..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-02.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-03.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-03.paa
deleted file mode 100644
index f20ced9770..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-03.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-04.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-04.paa
deleted file mode 100644
index 6b104848da..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-04.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-05.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-05.paa
deleted file mode 100644
index f8e30a0c64..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-05.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-06.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-06.paa
deleted file mode 100644
index 3a11d94cba..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-06.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-07.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-07.paa
deleted file mode 100644
index b956cb478b..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-07.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-08.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-08.paa
deleted file mode 100644
index 090f630d8f..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-08.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-09.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-09.paa
deleted file mode 100644
index d8b8b7eff1..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-09.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-10.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-10.paa
deleted file mode 100644
index 0151ad3779..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-10.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-11.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-11.paa
deleted file mode 100644
index 241980a1e0..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-11.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-12.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-12.paa
deleted file mode 100644
index adcaf136fa..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-12.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-13.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-13.paa
deleted file mode 100644
index d381f0cc9e..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-13.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-14.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-14.paa
deleted file mode 100644
index 0e77f697e2..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-14.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-15.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-15.paa
deleted file mode 100644
index ad283a4d76..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-15.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-16.paa b/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-16.paa
deleted file mode 100644
index b7ae70a989..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_WindVeryLight-16.paa and /dev/null differ
diff --git a/TO_MERGE/agm/Wind/ui/AGM_noWind.paa b/TO_MERGE/agm/Wind/ui/AGM_noWind.paa
deleted file mode 100644
index 8fa262c286..0000000000
Binary files a/TO_MERGE/agm/Wind/ui/AGM_noWind.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/CfgAddons.h b/TO_MERGE/cse/sys_advanced_interaction/CfgAddons.h
deleted file mode 100644
index 8e5d5504f1..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/CfgAddons.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_advanced_interaction {
- list[] = {"cse_sys_advanced_interaction", "cse_moduleAmbientCivilians"};
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_advanced_interaction/CfgFunctions.h b/TO_MERGE/cse/sys_advanced_interaction/CfgFunctions.h
deleted file mode 100644
index cebd88dc5e..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/CfgFunctions.h
+++ /dev/null
@@ -1,45 +0,0 @@
-class CfgFunctions {
- class CSE {
- class AdvancedInteraction {
- file = "cse\cse_sys_advanced_Interaction\functions";
- class arrest_AIM { recompile = 1; };
- class displayArrestOptions_AIM { recompile = 1; };
- class load_AIM { recompile = 1; };
- class loadLocal_AIM { recompile = 1; };
- class move_AIM { recompile = 1; };
- class placedown_AIM { recompile = 1; };
- class release_AIM { recompile = 1; };
- class searchPerson_AIM { recompile = 1; };
- class searchPersonCondition_AIM { recompile = 1; };
- class unload_AIM { recompile = 1; };
- class onCivilianKilled_AIM { recompile = 1; };
- class getDialogLines_AIM { recompile = 1; };
- class getReactionTypeOfUnit_AIM { recompile = 1; };
- class playerStartConverationWith_AIM { recompile = 1; };
- class dialogMovementOrder_AIM { recompile = 1; };
- class fillDialogWithConversationLines_AIM { recompile = 1; };
- class personSpeaksLine_AIM { recompile = 1; };
- class getAvailableProfileSetsFor_AIM { recompile = 1; };
- class generateProfileInformation_AIM { recompile = 1; };
- class getPlayerSpokenLineType_AIM { recompile = 1; };
- class playerSpeaksLine_AIM { recompile = 1; };
- class personReactionToLine_AIM { recompile = 1; };
- class getProfileInformation_AIM { recompile = 1; };
- class getReactionLinesOfPerson_AIM { recompile = 1; };
- class addToConversationLog_AIM { recompile = 1; };
- class getALiVECivData_AIM { recompile = 1; };
- class isALIVECivlianSystemActive_AIM { recompile = 1; };
- class disarmPerson_AIM { recompile = 1; };
- class canDetain { recompile = 1; };
- class canPerformArrestActions_AIM { recompile = 1; };
- class canPerformAction_AIM { recompile = 1; };
- class callForSurrender_AIM { recompile = 1; };
- };
-
- class AmbientCivilians {
- file = "cse\cse_sys_advanced_Interaction\ambient\functions";
- class moduleAmbientcivilians { recompile = 1; };
- class getAvailableUnits_faction { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/CfgMagazines.h b/TO_MERGE/cse/sys_advanced_interaction/CfgMagazines.h
deleted file mode 100644
index 746fdc6619..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/CfgMagazines.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// keep present for sometime, to allow backwards compatibility. Note: We will not support this in the code!
-
-class CfgMagazines {
- class Default;
- class CA_magazine: Default{};
- class cse_Keycuffs: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Keycuffs";
- picture = "cse\cse_sys_advanced_interaction\img\keycuffs.paa";
- descriptionShort = "Keycuffs, used for detaining a suspect";
- };
- class cse_HIIDE: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 3;
- descriptionUse = "Biometric Scanner";
- descriptionShort = "";
- displayName = "Biometric Scanner (HIIDE)";
- picture = "cse\cse_sys_advanced_interaction\img\HIIDE.paa";
- model = "cse\cse_sys_advanced_interaction\hiide.p3d";
- };
- class cse_oldphone: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Old Phone";
- picture = "cse\cse_sys_advanced_interaction\img\oldphone.paa";
- model = "cse\cse_sys_advanced_interaction\mobile.p3d";
- };
- class cse_oldphone_folded: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Old Phone (Folded)";
- picture = "cse\cse_sys_advanced_interaction\img\oldphone.paa";
- model = "cse\cse_sys_advanced_interaction\mobile_folded.p3d";
- };
- class cse_watch_expensive: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Watch";
- picture ="cse\cse_sys_advanced_interaction\img\watch_expensive.paa";
- };
- class cse_wallet: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Wallet";
- picture = "cse\cse_sys_advanced_interaction\img\wallet.paa";
- };
- class cse_9v_battery: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "9 volt battery";
- picture = "cse\cse_sys_advanced_interaction\img\9v_battery.paa";
- model = "\A3\Structures_F_EPA\Items\Electronics\Battery_F.p3d";
- };
- class cse_notebook: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Notebook";
- picture = "cse\cse_sys_advanced_interaction\img\notebook.paa";
- };
- class cse_scissors: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Scissors";
- picture = "cse\cse_sys_advanced_interaction\img\scissor.paa";
- } ;
- class cse_wires: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Wires";
- picture = "cse\cse_sys_advanced_interaction\img\wires.paa";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/CfgSounds.h b/TO_MERGE/cse/sys_advanced_interaction/CfgSounds.h
deleted file mode 100644
index b21c8521f3..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/CfgSounds.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgSounds {
- class cse_cable_tie_zipping {
- name = "cse_cable_tie_zipping";
- sound[] = {"cse\cse_sys_advanced_interaction\sounds\cse_cable_tie_zipping.ogg","db-1",1.0};
- titles[] = {};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/CfgVehicles.h b/TO_MERGE/cse/sys_advanced_interaction/CfgVehicles.h
deleted file mode 100644
index e47f165a49..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/CfgVehicles.h
+++ /dev/null
@@ -1,355 +0,0 @@
-class CfgVehicles
-{
- class Logic;
- class Module_F: Logic
- {
- class ArgumentsBaseUnits
- {
- };
- };
- class cse_sys_advanced_interaction: Module_F {
- scope = 2;
- displayName = "Advanced Interaction [CSE]";
- icon = "\cse\cse_main\data\cse_aim_module.paa";
- category = "cseModules";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments
- {
-
- class enableDetain {
- displayName = "Allow detaining";
- description = "Allow players to detain other units";
- typeName = "NUMBER";
- defaultValue = 2;
- class values {
- class all {name="Everyone"; value=3; };
- class onlyOtherSide {name="Opposite side"; value=2; default=1;};
- class onlyAI {name="AI Only"; value=1; };
- class onlyOtherSideAI {name="Opposite side AI only"; value=0; };
- class disable {name="Disable"; value=-1; };
- };
- };
- class enableSearch {
- displayName = "Allow search";
- description = "Allow players to search other units and vehicles";
- typeName = "NUMBER";
- defaultValue = 2;
- class values {
- class all {name="Everyone"; value=3; };
- class onlyOtherSide {name="Opposite side"; value=2; default=1;};
- class onlyAI {name="AI Only"; value=1; };
- class onlyOtherSideAI {name="Opposite side (AI Only)"; value=0; };
- class disable {name="Disable"; value=-1; };
- };
- };
- class enableBiometric {
- displayName = "Biometric Scanner";
- description = "Allow players to use the biometric scanner on other units";
- typeName = "NUMBER";
- defaultValue = 2;
- class values {
- class all {name="Everyone"; value=3; };
- class onlyOtherSide {name="Opposite side"; value=2; default=1;};
- class onlyAI {name="AI Only"; value=1; };
- class onlyOtherSideAI {name="Opposite side (AI Only)"; value=0; };
- class disable {name="Disable"; value=-1; };
- };
- };
- class enableConversation {
- displayName = "Enable Conversation";
- description = "Allow Conversation with civilians";
- typeName = "BOOL";
- defaultValue = false;
- };
- class useEquipment {
- displayName = "Equipment Required";
- description = "Is AIM equipment required for performing actions?";
- typeName = "BOOL";
- defaultValue = true;
- };
- };
- };
- class cse_moduleAmbientCivilians: Module_F {
- scope = 2;
- displayName = "Ambient civilians [CSE]";
- icon = "\cse\cse_main\data\cse_aim_module.paa";
- category = "cseMisc";
- function = "cse_fnc_moduleAmbientcivilians";
- functionPriority = 1;
- isGlobal = 0;
- isTriggerActivated = 0;
- class Arguments {
- class maxCivilians {
- displayName = "Max Civilians";
- description = "The maximum amount of civilians at any given time";
- typeName = "NUMBER";
- defaultValue = 50;
- };
- class maxRadius {
- displayName = "Max Radius";
- description = "The maximum radus around object";
- typeName = "NUMBER";
- defaultValue = 1000;
- };
- class minPlayerDistance {
- displayName = "Minimal Player distance";
- description = "The minimal distance players can be near spawn locations";
- typeName = "NUMBER";
- defaultValue = 250;
- };
- class percentageOf {
- displayName = "Percentage";
- description = "Chance of building occupied ( 1 = 100%, 0 = 0%)";
- typeName = "NUMBER";
- defaultValue = 0.3;
- };
-
- class factionOf {
- displayName = "Faction";
- description = "Of what faction should the civilians be";
- typeName = "STRING";
- defaultValue = "CIV_F";
- };
- class weaponChance {
- displayName = "Chance of Weapons";
- description = "What is the chance that spawned civilans have weapons";
- typeName = "NUMBER";
- defaultValue = 0;
- };
- class hostilityToBlufor {
- displayName = "Hostility to BLUFOR";
- description = "What is the initial stance towards BLUFOR";
- typeName = "NUMBER";
- defaultValue = 0;
- };
- class hostilityToOPfor {
- displayName = "Hostility to OPFOR";
- description = "What is the initial stance towards OPFOR";
- typeName = "NUMBER";
- defaultValue = 0;
- };
-
- };
- };
- class NATO_Box_Base;
- class cse_advancedInteractionItems: NATO_Box_Base
- {
- scope = 2;
- displayName = "Advanced Interaction Items [CSE]";
- author = "Combat Space Enhancement";
- model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
- class TransportWeapons
- {
- class _xx_cse_Keycuffs
- {
- weapon="cse_Keycuffs";
- count=5;
- };
- class _xx_cse_HIIDE
- {
- weapon="cse_HIIDE";
- count=5;
- };
- class _xx_cse_oldphone
- {
- weapon="cse_oldphone";
- count=5;
- };
- class _xx_cse_oldphone_folded
- {
- weapon="cse_oldphone_folded";
- count=5;
- };
- class _xx_cse_watch_expensive
- {
- weapon="cse_watch_expensive";
- count=5;
- };
- class _xx_cse_wallet
- {
- weapon="cse_wallet";
- count=5;
- };
- class _xx_cse_9v_battery
- {
- weapon="cse_9v_battery";
- count=5;
- };
- class _xx_cse_notebook
- {
- weapon="cse_notebook";
- count=5;
- };
- class _xx_cse_scissors
- {
- weapon="cse_scissors";
- count=5;
- };
- class _xx_cse_wires
- {
- weapon="cse_wires";
- count=5;
- };
- };
- };
-
- class Item_Base_F;
- class cse_KeycuffsItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Keycuffs";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_Keycuffs
- {
- name = "cse_Keycuffs";
- count = 1;
- };
- };
- };
- class cse_HIIDEItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- descriptionUse = "Biometric Scanner";
- descriptionShort = "";
- displayName = "Biometric Scanner (HIIDE)";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_HIIDE
- {
- name = "cse_HIIDE";
- count = 1;
- };
- };
- };
- class cse_oldphoneItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Old Phone";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_oldphone
- {
- name = "cse_oldphone";
- count = 1;
- };
- };
- };
- class cse_oldphone_foldedItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Old Phone (Folded)";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_oldphone_folded
- {
- name = "cse_oldphone_folded";
- count = 1;
- };
- };
- };
- class cse_watch_expensiveItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Watch";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_watch_expensive
- {
- name = "cse_watch_expensive";
- count = 1;
- };
- };
- };
- class cse_walletItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Wallet";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_wallet
- {
- name = "cse_wallet";
- count = 1;
- };
- };
- };
- class cse_9v_batteryItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "9 volt battery";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_9v_battery
- {
- name = "cse_9v_battery";
- count = 1;
- };
- };
- };
- class cse_notebookItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Notebook";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_notebook
- {
- name = "cse_notebook";
- count = 1;
- };
- };
- };
- class cse_scissorsItem: Item_Base_F {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Scissors";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_scissors
- {
- name = "cse_scissors";
- count = 1;
- };
- };
- };
- class cse_wiresItem: Item_Base_F {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = "Wires";
- vehicleClass = "Items";
- scopeCurator = 2;
- class TransportItems
- {
- class cse_wires
- {
- name = "cse_wires";
- count = 1;
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/CfgWeapons.h b/TO_MERGE/cse/sys_advanced_interaction/CfgWeapons.h
deleted file mode 100644
index 220f8d5150..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/CfgWeapons.h
+++ /dev/null
@@ -1,141 +0,0 @@
-class CfgWeapons {
- class ItemCore;
- class InventoryItem_Base_F;
-
- class cse_Keycuffs: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_CSE_ITEM_KEYCUFFS_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\keycuffs.paa";
- descriptionShort = $STR_CSE_ITEM_KEYCUFFS_DESC;
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_HIIDE: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- descriptionUse = $STR_CSE_ITEM_HIIDE_DESC;
- descriptionShort = $STR_CSE_ITEM_HIIDE_DESC;
- displayName = $STR_CSE_ITEM_HIIDE_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\HIIDE.paa";
- model = "\cse\cse_sys_advanced_interaction\hiide.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_oldphone: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_CSE_ITEM_PHONE_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\oldphone.paa";
- model = "\cse\cse_sys_advanced_interaction\mobile.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_oldphone_folded: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_CSE_ITEM_PHONE_FOLDED_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\oldphone.paa";
- model = "\cse\cse_sys_advanced_interaction\mobile_folded.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_watch_expensive: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_CSE_ITEM_WATCH_EXPENSIVE_DISPLAY;
- picture ="cse\cse_sys_advanced_interaction\img\watch_expensive.paa";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_wallet: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_CSE_ITEM_WALLET_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\wallet.paa";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_9v_battery: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_CSE_ITEM_9v_BATTERY_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\9v_battery.paa";
- model = "\A3\Structures_F_EPA\Items\Electronics\Battery_F.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_notebook: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_CSE_ITEM_NOTEBOOK_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\notebook.paa";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_scissors: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_CSE_ITEM_SCISSORS_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\scissor.paa";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
- class cse_wires: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- mass = 1;
- displayName = $STR_CSE_ITEM_WIRES_DISPLAY;
- picture = "\cse\cse_sys_advanced_interaction\img\wires.paa";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
-
- mass=10;
- type=201;
- };
- };
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_advanced_interaction/Combat_Space_Enhancement.h
deleted file mode 100644
index 01a86078ec..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#define MENU_KEYBINDING 1
-#define ACTION_KEYBINDING 2
-#define CLIENT_SETTING 3
-
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_advanced_interaction {
- init = "call compile preprocessFile 'cse\cse_sys_advanced_interaction\fn_aim_init.sqf';";
- name = "Advanced Interaction Module";
- class EventHandlers {
- class CAManBase {
- //init = "waituntil{player==player}; hint 'AIM TEST';";
- killed = "_this call cse_fnc_onCivilianKilled_AIM;";
- };
- };
-
- class dialog_module {
- class lines {
- class agressive_OutOfMyFace {
- text = "I already told you to go away! Now get out of my face!";
- };
- class agressive_YouWontListen: agressive_OutOfMyFace {
- text = "You just won't listen, won't you?";
- };
- class agressive_SlapInFace: agressive_OutOfMyFace {
- text = "Someone should slap you in the face.";
- };
- class agressive_LeaveAlone: agressive_OutOfMyFace {
- text = "Leave me alone!";
- };
- class friendly_hello_friend {
- text = "Hello my friend!";
- stance = "Friendly";
- };
- class friendly_haveNiceDay: friendly_hello_friend {
- text = "Good Sir, I hope you have a nice day";
- };
- class friendly_welcome: friendly_hello_friend {
- text = "Welcome";
- };
- class friendly_whatbringsyouhere: friendly_hello_friend {
- text = "Hello, what brings you here?";
- };
- };
- };
-
- class Configurations {
- class open_biometric_scanner_aim {
- type = MENU_KEYBINDING;
- title = "Open Biometric Scanner";
- description = "Opens the biometric scanner if the action is available. The action will be available if you are looking at another Person.";
- value[] = {0,0,0,0};
- onPressed = "if (CSE_ENABLED_BIOMETRIC_SCANNER_AIM) then {_target = cursorTarget;if (!iSNull _target) then {if ((_target isKindOf 'CAManBase') && ((player distance _target) < 10)) then {[player,_target] call cse_fnc_biometricScanner;};};};";
- idd = 432231;
- };
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/GUI.h b/TO_MERGE/cse/sys_advanced_interaction/GUI.h
deleted file mode 100644
index 6ebf7b736c..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/GUI.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "biometric_scanner\define.hpp"
-#include "biometric_scanner\biometricScannerDialog.hpp"
-
-#include "gui\define.h"
-#include "gui\dialog_menu.h"
-#include "gui\search_menu.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/ambient/functions/fn_getAvailableUnits_faction.sqf b/TO_MERGE/cse/sys_advanced_interaction/ambient/functions/fn_getAvailableUnits_faction.sqf
deleted file mode 100644
index 9dbe7d817e..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/ambient/functions/fn_getAvailableUnits_faction.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * fn_getAvailableGroups_faction.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_factionOfEntry", "_faction", "_factionConfig", "_return", "_sideN", "_sideT", "_sideConfig", "_entry", "_scopeOfEntry"];
-_faction = _this select 0;
-_baseclass = _this select 1;
-
-_factionConfig = (configFile >> "CfgFactionClasses" >> _faction);
-_return = [];
-_filtered_non_base = [];
-if (isclass _factionConfig) then {
- _configCivs = (configFile >> "CfgVehicles");
- _numberOfConfig = count _configCivs;
- for [{_i=0}, {(_i< _numberOfConfig)}, {_i=_i+1}] do {
- _entry = _configCivs select _i;
- if (isClass _entry) then {
- _factionOfEntry = getText(_entry >> "faction");
- _scopeOfEntry = getNumber (_entry >> "scope");
- if (_factionOfEntry == _faction && _scopeOfEntry >= 2) then {
- if ([_entry, _baseclass] call cse_fnc_inheritsFrom) then {
- _return pushback (configName _entry);
- } else {
- _filtered_non_base pushback (configName _entry);
- };
- };
- };
- };
- //};
-} else {
- []
-};
-[format["Filtered non base config entries: %1", _filtered_non_base]] call cse_fnc_debug;
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/ambient/functions/fn_moduleAmbientCivilians.sqf b/TO_MERGE/cse/sys_advanced_interaction/ambient/functions/fn_moduleAmbientCivilians.sqf
deleted file mode 100644
index 3140bfea01..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/ambient/functions/fn_moduleAmbientCivilians.sqf
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * fn_moduleAmbientCivilians.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define BUILDING_SEARCH_RADIUS 1000
-#define PERCENTAGE_OF_BUILDINGS 0.3
-#define MINIMAL_DISTANCE_PLAYERS 10
-#define MAX_AMOUNT_CIVS_TOTAL 100
-#define MAX_UNITS_IN_GROUP 3
-
-// only run this on the server
-if !(isServer) exitwith {};
-
-_this spawn {
- waitUntil {time > 1};
-
- _logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
- if (!isNull _logic) then {
- _MAX_CIVS_TOTAL = _logic getvariable ["maxCivilians", MAX_AMOUNT_CIVS_TOTAL];
- _MAX_RADIUS = _logic getvariable ["maxRadius", BUILDING_SEARCH_RADIUS];
- _MIN_DISTANCE_PLAYERS = _logic getvariable ["minPlayerDistance", MINIMAL_DISTANCE_PLAYERS];
- _PERCENTAGE = _logic getvariable ["percentageOf", PERCENTAGE_OF_BUILDINGS];
- _FACTION_OF = _logic getVariable ["factionOf", "CIV_F"];
-
- _availableUnitClasses = [_FACTION_OF, "CaManBase"] call cse_fnc_getAvailableUnits_faction;
- [format["Found available classes: %1", _availableUnitClasses]] call cse_fnc_debug;
- if (_availableUnitClasses isEqualTo []) exitwith { [format["AvailableClasses for %1 is empty", _FACTION_OF]] call cse_fnc_debug; };
- _allSpawnedUnits = [];
- _allSpawnedGroups = [];
- _playerUnits = [];
- _allCheckedBuildings = [];
-
- while {alive _logic} do {
- sleep 1;
- if (isMultiplayer) then {
- waituntil {count playableUnits > 0};
- _playerUnits = playableUnits;
- } else {
- _playerUnits = [player];
- };
- _spawnLocatationObjects = [_logic];
-
- {
- _playableUnit = _x;
- if (count _allSpawnedUnits < _MAX_CIVS_TOTAL && {_playableUnit distance _logic < _MAX_RADIUS}) then {
- _availableBuildings = [];
- _buildingsWithInArea = nearestObjects [_playableUnit, ["house"], _MAX_RADIUS];
- {
- _building = _x;
- if !(_building in _allCheckedBuildings) then {
- _buildingPos = [_x] call BIS_fnc_buildingPositions;
- _invalid = false;
- {
- if (_building distance _x <= _MIN_DISTANCE_PLAYERS) exitwith {
- _invalid = true;
- };
- }foreach _playerUnits;
- if !(_invalid) then {
- _availableBuildings pushback [_building, _buildingPos];
- _allCheckedBuildings pushback _building;
- };
- };
- }foreach _buildingsWithInArea;
-
- {
- _building = _x select 0;
- _buildingPos = _x select 1;
-
- if (({_x getvariable ["cse_ambientcivilianModule_Building", objNull] == _building}count _allSpawnedGroups) == 0 && (count _allSpawnedUnits < _MAX_CIVS_TOTAL)) then {
- if (random(1) >= (1 - _PERCENTAGE)) then {
- _group = createGroup civilian;
-
- _group setvariable ["cse_ambientcivilianModule_Building", _building];
- if (isNull _group) exitwith {
- ["Group was null - most likely hit the 144 limit!"] call cse_fnc_debug;
- };
- {
- if ((random(1) >= 0.7 && (count _allSpawnedUnits < _MAX_CIVS_TOTAL) && {(count units _group < MAX_UNITS_IN_GROUP)})|| (count units _group == 0)) then {
- _className = _availableUnitClasses select (round(random((count _availableUnitClasses)-1)));
- _unit = _group createUnit [_className, _x, [], 0, "NONE"];
- _unit setOwner (owner _logic);
- _allSpawnedUnits pushback _unit;
- };
- }foreach _buildingPos;
-
- if (count units _group == 0) then {
- deleteGroup _group;
- } else {
- _allSpawnedGroups pushback _group;
- _group addWaypoint [(getPos _building), 100, 1, "initial_waypoint_ambientCiv"];
- [_group, 1] setWaypointSpeed "LIMITED";
- };
- };
- };
-
- // lets exit, since we ran into the limit.
- if ((count _allSpawnedUnits >= _MAX_CIVS_TOTAL)) exitwith {};
- }foreach _availableBuildings;
- };
- }foreach _playerUnits;
-
- sleep 0.5;
-
- _unitsRemoved = 0;
- {
- _unit = _x;
- _cannotRemove = false;
- {
- if (_unit distance _x <= _MIN_DISTANCE_PLAYERS) exitwith {
- _cannotRemove = true;
- };
- }foreach _playerUnits;
- if !(_cannotRemove) then {
- if ({(_unit distance _x > _MAX_RADIUS)}count _playerUnits == count _playerUnits) then {
- deleteVehicle _unit;
- _allSpawnedUnits set [_foreachIndex, ObjNull];
- _unitsRemoved = _unitsRemoved + 1;
- };
- };
- }foreach _allSpawnedUnits;
- _allSpawnedUnits = _allSpawnedUnits - [objNull];
- {
- if (count units _x == 0) then {
- deleteGroup _x;
- _allSpawnedGroups set [_foreachIndex, ObjNull];
- } else {
- _group = _x;
- // HANDLE WAYPOINTS FOR GROUPS
- if (currentWaypoint _group == (count waypoints _group)) then {
- _building = _group getvariable "cse_ambientcivilianModule_Building";
- _group addWaypoint [(getPos _building), 200, currentWaypoint _group];
- };
- };
- }foreach _allSpawnedGroups;
- _allSpawnedGroups = _allSpawnedGroups - [objNull];
-
- sleep 0.5;
- {
- _building = _x;
- _cannotRemove = false;
- {
- if (_building distance _x <= _MIN_DISTANCE_PLAYERS) exitwith {
- _cannotRemove = true;
- };
- }foreach _playerUnits;
- if !(_cannotRemove) then {
- if ({(_building distance _x > _MAX_RADIUS)}count _playerUnits == count _playerUnits) then {
- _allCheckedBuildings set [_foreachIndex, ObjNull];
- };
- };
- }foreach _allCheckedBuildings;
- _allCheckedBuildings = _allCheckedBuildings - [objNull];
-
- if (_unitsRemoved > 0) then {
- [format["%1- %2 - Removed %3", count _allSpawnedUnits, _allSpawnedUnits, _unitsRemoved]] call cse_fnc_debug;
- };
- };
-
- [["Finished ambient Civilians module. Cleaning up all units"]] call cse_fnc_Debug;
- // Finished this module. Cleaning up everything.
- _cleanUpStartTime = time;
- // CLEAN UP ALL UNITS, ENSURE PLAYERS ARE NOT NEARBY
- while {(count _allSpawnedUnits > 0 && count _allSpawnedGroups > 0)} do {
- {
- _unit = _x;
- _cannotRemove = false;
- {
- if (_unit distance _x <= _MIN_DISTANCE_PLAYERS) exitwith {
- _cannotRemove = true;
- };
- }foreach _playerUnits;
-
- // force clean up if this loop has been running for 60 seconds already
- if (!(_cannotRemove) || (time - _cleanUpStartTime > 60)) then {
- if ({(_unit distance _x > _MAX_RADIUS)}count _playerUnits == count _playerUnits) then {
- deleteVehicle _unit;
- _allSpawnedUnits set [_foreachIndex, ObjNull];
- _unitsRemoved = _unitsRemoved + 1;
- };
- };
- }foreach _allSpawnedUnits;
- _allSpawnedUnits = _allSpawnedUnits - [objNull];
- {
- if (count units _x == 0) then {
- deleteGroup _x;
- _allSpawnedGroups set [_foreachIndex, ObjNull];
- } else {
- // HANDLE WAYPOINTS FOR GROUPS
-
- };
- }foreach _allSpawnedGroups;
- _allSpawnedGroups = _allSpawnedGroups - [objNull];
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/battery.p3d b/TO_MERGE/cse/sys_advanced_interaction/battery.p3d
deleted file mode 100644
index 1a0cf71a94..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/battery.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/Thumbs.db b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/Thumbs.db
deleted file mode 100644
index b30616897b..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/Thumbs.db and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/biometricScannerDialog.hpp b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/biometricScannerDialog.hpp
deleted file mode 100644
index 630b7a7263..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/biometricScannerDialog.hpp
+++ /dev/null
@@ -1,196 +0,0 @@
-// GBL_BiometricDialog
-// Displays a HIIDE inderface for a biometric scan.
-// by gobbo
-
-class cse_biometricScanner {
- idd = 432231;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_biometricScanner', _this select 0];";
-
- class controlsBackground {
- class cse_backgroundImageScanner : cse_backgroundBase {
- text = "cse\cse_sys_advanced_interaction\biometric_scanner\data\biometricScanner_background.paa";
- idc = 21314;
- x = -0.3;
- y = 0.2;
- w = 1.6;
- h = 1;
- };
-
- };
-
- class controls {
-
- class cse_title: cse_staticBase {
- idc = 100;
- x = 0.29;
- y = 0.45;
- w = 0.33825;
- h = 0.104575;
- sizeEx = 0.04;
- text = "HIIDE - ";
- };
- class cse_subtitle: cse_staticBase {
- idc = 101;
- x = 0.29;
- y = 0.49;
- w = 0.33825;
- h = 0.104575;
- sizeEx = 0.025;
- text = "";
- };
-
- class cse_infoText1: cse_title {
- idc = 111;
- x = 100.3025;
- y = 110.64;
- w = 0.2;
- h = 0.104575;
- sizeEx = 0.03021;
- text = "";
- style = ST_STATIC + ST_CENTER;
- };
- class cse_infoText2: cse_infoText1 {
- idc = 112;
- x = 100.3025;
- y = 110.69;
- w = 0.2;
- h = 0.104575;
- sizeEx = 0.03021;
- text = "";
- };
-
- class cse_text1: cse_title {
- idc = 121;
- x = 100.3025;
- y = 110.64;
- w = 0.183825;
- h = 0.104575;
- sizeEx = 0.03021;
- text = "NAME: ";
- };
- class cse_text2: cse_text1 {
- idc = 122;
- x = 100.3025;
- y = 110.69;
- w = 0.183825;
- h = 0.104575;
- sizeEx = 0.03021;
- text = "AGE: ";
- };
- class cse_text3: cse_text1 {
- idc = 123;
- x = 100.3025;
- y = 110.74;
- w = 0.183825;
- h = 0.104575;
- sizeEx = 0.03021;
- text = "Known Info: ";
- };
- class cse_text4: cse_text1 {
- idc = 124;
- x = 100.3025;
- y = 110.79;
- w = 0.183825;
- h = 0.104575;
- sizeEx = 0.03021;
- text = "Additional 1: ";
- };
- class cse_text5: cse_text1 {
- idc = 125;
- x = 100.3025;
- y = 110.84;
- w = 0.183825;
- h = 0.104575;
- sizeEx = 0.03021;
- text = "Additional 2: ";
- };
- class cse_editableBox1: cse_editBase
- {
- idc = 701;
- x = 100.42;
- y = 110.68;
- h = 0.03;
- w = 0.3;
- sizeEx = 0.03021;
- text = "";
- autocomplete = "";
- };
- class cse_editableBox2: cse_editBase
- {
- idc = 702;
- x = 100.42;
- y = 110.73;
- h = 0.03;
- w = 0.3;
- sizeEx = 0.03021;
- text = "";
- autocomplete = "";
- };
- class cse_editableBox3: cse_editBase
- {
- idc = 703;
- x = 100.42;
- y = 110.78;
- h = 0.03;
- w = 0.3;
- sizeEx = 0.03021;
- text = "";
- autocomplete = "";
- };
- class cse_editableBox4: cse_editBase
- {
- idc = 704;
- x = 100.42;
- y = 110.83;
- h = 0.03;
- w = 0.3;
- sizeEx = 0.03021;
- text = "";
- autocomplete = "";
- };
- class cse_editableBox5: cse_editBase
- {
- idc = 705;
- x = 100.42;
- y = 110.88;
- h = 0.03;
- w = 0.3;
- sizeEx = 0.03021;
- text = "";
- autocomplete = "";
- };
-
- class cse_option1 : cse_buttonBase {
- idc = 151;
- text = "";
- onButtonClick = "";
- x = 0.27;
- y = 0.87;
- w = 0.14;
- h = 0.04;
- color[] = {0.0, 0.0, 0.0, 1};
- color2[] = {0.0, 0.0, 0.0, 1};
- colorBackground[] = {1, 1, 1, 1};
- colorbackground2[] = {1, 1, 1, 1};
- colorDisabled[] = {1, 1, 1, 0.5};
- animTextureNormal = "cse\cse_sys_advanced_interaction\biometric_scanner\data\scanner_button.paa";
- animTextureDisabled = "cse\cse_sys_advanced_interaction\biometric_scanner\data\scanner_button.paa";
- animTextureOver = "cse\cse_sys_advanced_interaction\biometric_scanner\data\scanner_button.paa";
- animTextureFocused = "cse\cse_sys_advanced_interaction\biometric_scanner\data\scanner_button.paa";
- animTexturePressed = "cse\cse_sys_advanced_interaction\biometric_scanner\data\scanner_button.paa";
- animTextureDefault = "cse\cse_sys_advanced_interaction\biometric_scanner\data\scanner_button.paa";
- };
- class cse_option2 : cse_option1 {
- idc = 152;
- text = "";
- x = 0.425;
- };
- class cse_option3 : cse_option1 {
- idc = 153;
- text = "";
- x = 0.58;
- };
- };
- objects[] = {};
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/biometricScanner_background.paa b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/biometricScanner_background.paa
deleted file mode 100644
index 8931e0c8d5..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/biometricScanner_background.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/icon_biometricscanner.paa b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/icon_biometricscanner.paa
deleted file mode 100644
index 424789eee8..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/icon_biometricscanner.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/scanner_button.paa b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/scanner_button.paa
deleted file mode 100644
index 277ba5ab87..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/data/scanner_button.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/define.hpp b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/define.hpp
deleted file mode 100644
index 49827e2dbd..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/define.hpp
+++ /dev/null
@@ -1,271 +0,0 @@
-// define.hpp
-
-#define true 1
-#define false 0
-
-#define CT_STATIC 0
-#define CT_BUTTON 1
-#define CT_EDIT 2
-#define CT_SLIDER 3
-#define CT_COMBO 4
-#define CT_LISTBOX 5
-#define CT_TOOLBOX 6
-#define CT_CHECKBOXES 7
-#define CT_PROGRESS 8
-#define CT_HTML 9
-#define CT_STATIC_SKEW 10
-#define CT_ACTIVETEXT 11
-#define CT_TREE 12
-#define CT_STRUCTURED_TEXT 13
-#define CT_CONTEXT_MENU 14
-#define CT_CONTROLS_GROUP 15
-#define CT_SHORTCUTBUTTON 16
-#define CT_XKEYDESC 40
-#define CT_XBUTTON 41
-#define CT_XLISTBOX 42
-#define CT_XSLIDER 43
-#define CT_XCOMBO 44
-#define CT_ANIMATED_TEXTURE 45
-#define CT_OBJECT 80
-#define CT_OBJECT_ZOOM 81
-#define CT_OBJECT_CONTAINER 82
-#define CT_OBJECT_CONT_ANIM 83
-#define CT_LINEBREAK 98
-#define CT_ANIMATED_USER 99
-#define CT_MAP 100
-#define CT_MAP_MAIN 101
-#define CT_LISTNBOX 102
-
-// Static styles
-#define ST_POS 0x0F
-#define ST_HPOS 0x03
-#define ST_VPOS 0x0C
-#define ST_LEFT 0x00
-#define ST_RIGHT 0x01
-#define ST_CENTER 0x02
-#define ST_DOWN 0x04
-#define ST_UP 0x08
-#define ST_VCENTER 0x0c
-
-#define ST_TYPE 0xF0
-#define ST_SINGLE 0
-#define ST_MULTI 16
-#define ST_TITLE_BAR 32
-#define ST_PICTURE 48
-#define ST_FRAME 64
-#define ST_BACKGROUND 80
-#define ST_GROUP_BOX 96
-#define ST_GROUP_BOX2 112
-#define ST_HUD_BACKGROUND 128
-#define ST_TILE_PICTURE 144
-#define ST_WITH_RECT 160
-#define ST_LINE 176
-
-#define ST_SHADOW 0x100
-#define ST_NO_RECT 0x200 // this style works for CT_STATIC in conjunction with ST_MULTI
-#define ST_KEEP_ASPECT_RATIO 0x800
-
-#define ST_TITLE ST_TITLE_BAR + ST_CENTER
-
-// Slider styles
-#define SL_DIR 0x400
-#define SL_VERT 0
-#define SL_HORZ 0x400
-
-#define SL_TEXTURES 0x10
-
-// Listbox styles
-#define LB_TEXTURES 0x10
-#define LB_MULTI 0x20
-#define FontCSE "PuristaMedium"
-
-class cse_backgroundBase {
- type = CT_STATIC;
- idc = -1;
- style = ST_PICTURE;
- colorBackground[] = {0,0,0,0};
- colorText[] = {1, 1, 1, 1};
- font = FontCSE;
- text = "";
- sizeEx = 0.032;
-};
-
-class cse_editBase
-{
- access = 0;
- type = CT_EDIT;
- style = ST_STATIC;
- x = 0;
- y = 0;
- h = 1;
- w = 1;
- colorBackground[] = {0,0,0,0};
- colorText[] = {1,1,1,1};
- colorSelection[] = {1,1,1,0};
- colorDisabled[] = {1, 1, 1, 0.25};
- font = FontCSE;
- sizeEx = 0.03921;
- autocomplete = "";
- text = "";
- size = 0.03921;
- shadow = 0;
-};
-
-
-class cse_buttonBase {
- idc = -1;
- type = 16;
- style = 0;
- text = "";
- action = "";
- x = 0.0;
- y = 0.0;
- w = 0.2;
- h = 0.04;
- size = 0.03921;
- sizeEx = 0.03921;
- color[] = {1.0, 1.0, 1.0, 1};
- color2[] = {1.0, 1.0, 1.0, 1};
- colorBackground[] = {1, 1, 1, 0.6};
- colorbackground2[] = {1, 1, 1, 0.4};
- colorDisabled[] = {1, 1, 1, 0.25};
- colorFocused[] = {1,1,1,1};
- colorBackgroundFocused[] = {1,1,1,0.6};
-
- periodFocus = 1.2;
- periodOver = 0.8;
- default = false;
- class HitZone {
- left = 0.00;
- top = 0.00;
- right = 0.00;
- bottom = 0.00;
- };
-
- class ShortcutPos {
- left = 0.00;
- top = 0.00;
- w = 0.00;
- h = 0.00;
- };
-
- class TextPos {
- left = 0.002;
- top = 0.0004;
- right = 0.0;
- bottom = 0.00;
- };
- textureNoShortcut = "";
- animTextureNormal = "cse\cse_gui\data\cse_cms_button.paa";
- animTextureDisabled = "cse\cse_gui\data\cse_cms_button.paa";
- animTextureOver = "cse\cse_gui\data\cse_cms_button.paa";
- animTextureFocused = "cse\cse_gui\data\cse_cms_button.paa";
- animTexturePressed = "cse\cse_gui\data\cse_cms_button.paa";
- animTextureDefault = "cse\cse_gui\data\cse_cms_button.paa";
- period = 0.5;
- font = FontCSE;
- soundEnter[] = {"\A3\ui_f\data\sound\onover",0.09,1};
- soundPush[] = {"\A3\ui_f\data\sound\new1",0.0,0};
- soundClick[] = {"\A3\ui_f\data\sound\onclick",0.07,1};
- soundEscape[] = {"\A3\ui_f\data\sound\onescape",0.09,1};
- class Attributes {
- font = FontCSE;
- color = "#E5E5E5";
- align = "center";
- shadow = "true";
- };
- class AttributesImage {
- font = FontCSE;
- color = "#E5E5E5";
- align = "left";
- shadow = "true";
- };
-};
-
-
-
-class cse_staticBase {
- idc = -1;
- type = CT_STATIC;
- x = 0.0;
- y = 0.0;
- w = 0.183825;
- h = 0.104575;
- style = ST_LEFT;
- font = FontCSE;
- sizeEx = 0.03921;
- colorText[] = {0.95, 0.95, 0.95, 1.0};
- colorBackground[] = {0, 0, 0, 0};
- text = "";
-};
-
-class cse_listBoxBase {
- type = CT_LISTBOX;
- style = ST_MULTI;
- font = FontCSE;
- sizeEx = 0.03921;
- color[] = {1, 1, 1, 1};
- colorText[] = {0.543, 0.5742, 0.4102, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 1};
- colorSelectBackground2[] = {0.543, 0.5742, 0.4102, 1.0};
- period = 1.2;
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 1};
- maxHistoryDelay = 1.0;
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- soundSelect[] = {"",0.1,1};
- soundExpand[] = {"",0.1,1};
- soundCollapse[] = {"",0.1,1};
-
- class ScrollBar {
- color[] = {1, 1, 1, 0.6};
- colorActive[] = {1, 1, 1, 1};
- colorDisabled[] = {1, 1, 1, 0.3};
- thumb = "";
- arrowFull = "";
- arrowEmpty = "";
- border = "";
- };
-};
-
-class cse_comboBoxBase {
- idc = -1;
- type = 4;
- style = 1;
- x = 0;
- y = 0;
- w = 0.3;
- h = 0.035;
- colorSelect[] = {0.023529,0,0.0313725,1};
- colorText[] = {0.023529,0,0.0313725,1};
- colorBackground[] = {0.95,0.95,0.95,1};
- colorSelectBackground[] = {0.543,0.5742,0.4102,1.0};
- colorScrollbar[] = {0.023529,0,0.0313725,1};
- arrowEmpty = "";
- arrowFull = "";
- wholeHeight = 0.45;
- color[] = {0,0,0,0.6};
- colorActive[] = {0,0,0,1};
- colorDisabled[] = {0,0,0,0.3};
- font = FontCSE;
- sizeEx = 0.031;
- soundSelect[] = {"",0.09,1};
- soundExpand[] = {"",0.09,1};
- soundCollapse[] = {"",0.09,1};
- maxHistoryDelay = 1.0;
- class ScrollBar
- {
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- thumb = "";
- arrowFull = "";
- arrowEmpty = "";
- border = "";
- };
-};
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScanStart.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScanStart.sqf
deleted file mode 100644
index e7982c595d..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScanStart.sqf
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- NAME: fnc_biometricScanner
- USAGE: opens the biometric Scanner dialog and starts up all functionality needed
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
- private ["_caller", "_cursor", "_interactionDialog", "_button1", "_button2", "_button3", "_textDisplays", "_infoDisplays", "_editableColums", "_positionCenter"];
- _caller = _this select 0;
- _cursor = _this select 1;
- CSE_biometricScannerTarget = _cursor;
-ctrlSetText [100,"HIIDE - Scanning"];
- call cse_fnc_clearScreenBiometricScanner;
-
- disableSerialization;
- _interactionDialog = uiNamespace getvariable "cse_biometricScanner";
-
- _button1 = (_interactionDialog displayCtrl 151);
- _button2 = (_interactionDialog displayCtrl 152);
- _button3 = (_interactionDialog displayCtrl 153);
-
- // adjusting positions:
- _textDisplays = [(_interactionDialog displayCtrl 111),(_interactionDialog displayCtrl 112)];
- _infoDisplays = [(_interactionDialog displayCtrl 121),(_interactionDialog displayCtrl 122),(_interactionDialog displayCtrl 123),
- (_interactionDialog displayCtrl 124),(_interactionDialog displayCtrl 125)];
- _editableColums = [(_interactionDialog displayCtrl 701),(_interactionDialog displayCtrl 702),(_interactionDialog displayCtrl 703),
- (_interactionDialog displayCtrl 704),(_interactionDialog displayCtrl 705)];
-
-
-
- _button1 ctrlSetEventHandler ["ButtonClick", format["[player,CSE_biometricScannerTarget] spawn cse_fnc_hiideMainMenu"]];
-
- // LOGIN FUNCTIONALITY
- _button1 ctrlSetText "Cancel";
- _button2 ctrlSetText "";
- _button3 ctrlSetText "";
-
- _positionCenter = [0.35,0.54];
- {
- _x ctrlSetPosition _positionCenter;
- _positionCenter = [_positionCenter select 0, (_positionCenter select 1) + 0.05];
- }foreach _textDisplays;
- (_interactionDialog displayCtrl 111) ctrlSetText "Scanning Database";
- (_interactionDialog displayCtrl 112) ctrlSetText "Please Wait";
-
- (_interactionDialog displayCtrl 111) ctrlCommit 0.0001;
- (_interactionDialog displayCtrl 112) ctrlCommit 0.0001;
-
- sleep 2 + random(10);
- if (!dialog) exitwith{};
-
- [player,CSE_biometricScannerTarget] call cse_fnc_biometricScannerInfo;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScanner.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScanner.sqf
deleted file mode 100644
index 54aa84a87d..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScanner.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- NAME: fnc_biometricScanner
- USAGE: opens the biometric Scanner dialog and starts up all functionality needed
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
-private ["_caller","_cursor"];
-_caller = _this select 0;
-_cursor = _this select 1;
-CSE_biometricScannerTarget = _cursor;
-[] call cse_fnc_closeAllDialogs_f;
-createDialog "cse_biometricScanner";
-
-if (isnil ("cse_biometricScannerLogin")) then {
- cse_biometricScannerLogin = false;
-};
-
-if (cse_biometricScannerLogin) then {
- [player,CSE_biometricScannerTarget] call cse_fnc_hiideMainMenu;
-} else {
- call cse_fnc_biometricScannerLoginScreen;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerInfo.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerInfo.sqf
deleted file mode 100644
index bc5fc90bdb..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerInfo.sqf
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- NAME: fnc_biometricScanner
- USAGE: opens the biometric Scanner dialog and starts up all functionality needed
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
- private ["_caller","_cursor"];
- _caller = _this select 0;
- _cursor = _this select 1;
-
- call cse_fnc_clearScreenBiometricScanner;
-
- ctrlSetText [100,"HIIDE - Details"];
-
-
- disableSerialization;
- _interactionDialog = uiNamespace getvariable "cse_biometricScanner";
-
- _button1 = (_interactionDialog displayCtrl 151);
- _button2 = (_interactionDialog displayCtrl 152);
- _button3 = (_interactionDialog displayCtrl 153);
-
- // adjusting positions:
- _textDisplays = [(_interactionDialog displayCtrl 111),(_interactionDialog displayCtrl 112)];
- _infoDisplays = [(_interactionDialog displayCtrl 121),(_interactionDialog displayCtrl 122),(_interactionDialog displayCtrl 123),
- (_interactionDialog displayCtrl 124),(_interactionDialog displayCtrl 125)];
- _editableColums = [(_interactionDialog displayCtrl 701),(_interactionDialog displayCtrl 702),(_interactionDialog displayCtrl 703),
- (_interactionDialog displayCtrl 704),(_interactionDialog displayCtrl 705)];
-
-
-
- _button1 ctrlSetEventHandler ["ButtonClick", format["[player,CSE_biometricScannerTarget] spawn cse_fnc_hiideMainMenu"]]; // logout
- _button3 ctrlSetEventHandler ["ButtonClick", format["[player,CSE_biometricScannerTarget] spawn cse_fnc_saveSettingsBiometric"]]; // scan something
-
- // LOGIN FUNCTIONALITY
- _button1 ctrlSetText "Cancel";
- _button2 ctrlSetText "";
- _button3 ctrlSetText "Save";
-
- _counter = 0;
- _leftText = ["Name","DOB","Known Info","Additional"];
- _positionCenter = [0.3,0.54];
- {
- if (_counter < count _leftText) then {
- _x ctrlSetPosition _positionCenter;
- _positionCenter = [_positionCenter select 0, (_positionCenter select 1) + 0.05];
- _x ctrlCommit 0.0001;
- _x ctrlSetText (_leftText select _counter);
- };
- _counter = _counter + 1;
- }foreach _infoDisplays;
-
- _text = _cursor getvariable "cse_biometricScannerInfo";
- if (!isnil ("_text")) then {
- ctrlSetText [701, _text select 0];
- ctrlSetText [702,_text select 1];
- ctrlSetText [703,_text select 2];
- ctrlSetText [704,_text select 3];
- ctrlSetText [705,_text select 4];
- ctrlSetText [101,"Entry in database found"];
- } else {
- ctrlSetText [101,"No Entry in database found - Please fill in details"];
- };
-
- _counter = 0;
- _positionCenter = [0.42,0.58];
- {
- if (_counter < count _leftText) then {
- _x ctrlSetPosition _positionCenter;
- _positionCenter = [_positionCenter select 0, (_positionCenter select 1) + 0.05];
- _x ctrlCommit 0.0001;
- };
- _counter = _counter + 1;
- }foreach _editableColums;
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerLogin.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerLogin.sqf
deleted file mode 100644
index f484462ab6..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerLogin.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- NAME: fnc_biometricScannerLogin
- USAGE: checks if the username and password have been typed correctly
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
-private ["_caller","_cursor","_return","_foundName"];
-_caller = _this select 0;
-_cursor = _this select 1;
-_return = false;
-cse_biometricScannerLogin = false;
-
-_inputName = ctrlText 701;
-_inputPass = ctrlText 702;
-
-_foundName = "";
-_foundUnit = "";
-if (Ismultiplayer) then {
- {
- if (isPlayer _x) then {
- if ([_x] call cse_fnc_getName == _inputName) then {
- _foundName = [_x] call cse_fnc_getName;
- _foundUnit = _x;
- };
- };
- }foreach playableUnits;
-} else {
- _foundName = [player] call cse_fnc_getName;
- _foundUnit = player;
-};
-
-if (_foundName != _inputName) exitwith {
- hint "Username incorrect!";
-};
-
-if (_inputPass == "Password") then {
- hint "Password and Username correct!";
- _return = true;
-} else {
- hint "Wrong Password!";
-};
-
-if (_return) then {
- [player,CSE_biometricScannerTarget] call cse_fnc_hiideMainMenu;
- cse_biometricScannerLogin = true;
-};
-[] spawn {
- sleep 5;
- hintSilent "";
-};
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerLoginScreen.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerLoginScreen.sqf
deleted file mode 100644
index 2796ef4b0d..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_biometricScannerLoginScreen.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- NAME: fnc_biometricScannerLoginScreen
- USAGE: checks if the username and password have been typed correctly
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-call cse_fnc_clearScreenBiometricScanner;
-ctrlSetText [100,"HIIDE - Login"];
-disableSerialization;
-_interactionDialog = uiNamespace getvariable "cse_biometricScanner";
-_button1 = (_interactionDialog displayCtrl 151);
-_button2 = (_interactionDialog displayCtrl 152);
-_button3 = (_interactionDialog displayCtrl 153);
-
-_button1 ctrlSetEventHandler ["ButtonClick", "closedialog 21314"];
-_button2 ctrlSetEventHandler ["ButtonClick", format["[player,CSE_biometricScannerTarget] spawn cse_fnc_hiideMainMenu"]];
-_button3 ctrlSetEventHandler ["ButtonClick", format["[player,CSE_biometricScannerTarget] spawn cse_fnc_biometricScannerLogin"]];
-
-// LOGIN FUNCTIONALITY
-_button1 ctrlSetText "Cancel";
-_button2 ctrlSetText "Iris Login";
-_button3 ctrlSetText "Login";
-
-
-(_interactionDialog displayCtrl 121) ctrlSetPosition [0.3,0.54];
-(_interactionDialog displayCtrl 121) ctrlCommit 0.0001;
-(_interactionDialog displayCtrl 121) ctrlSetText "Username";
-
-(_interactionDialog displayCtrl 122) ctrlSetposition [0.3,0.59];
-(_interactionDialog displayCtrl 122) ctrlCommit 0.0001;
-(_interactionDialog displayCtrl 122) ctrlSetText "Password";
-
-(_interactionDialog displayCtrl 701) ctrlSetposition [0.42,0.58];
-(_interactionDialog displayCtrl 701) ctrlCommit 0.0001;
-
-(_interactionDialog displayCtrl 702) ctrlSetposition [0.42,0.63];
-(_interactionDialog displayCtrl 702) ctrlCommit 0.0001;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_cancelBiometric.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_cancelBiometric.sqf
deleted file mode 100644
index 7d84781973..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_cancelBiometric.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- NAME: fnc_biometricScanner
- USAGE: opens the biometric Scanner dialog and starts up all functionality needed
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
- private ["_caller","_cursor"];
- _caller = _this select 0;
- _cursor = _this select 1;
-
-hint "cancel biometric ";
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_clearScreenBiometricScanner.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_clearScreenBiometricScanner.sqf
deleted file mode 100644
index c83303add8..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_clearScreenBiometricScanner.sqf
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/**
- * fnc_clearScreenBiometricScanner.sqf
- * @Descr: Clears the screen on the biometric scanner of all ctrl objects
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-private ["_interactionDialog","_button1","_button2","_button3","_textDisplays","_infoDisplays","_editableColums"];
-
-disableSerialization;
-_interactionDialog = uiNamespace getvariable "cse_biometricScanner";
-_button1 = (_interactionDialog displayCtrl 151);
-_button2 = (_interactionDialog displayCtrl 152);
-_button3 = (_interactionDialog displayCtrl 153);
-
-// adjusting positions:
-_textDisplays = [(_interactionDialog displayCtrl 111),(_interactionDialog displayCtrl 112)];
-_infoDisplays = [(_interactionDialog displayCtrl 121),(_interactionDialog displayCtrl 122),(_interactionDialog displayCtrl 123),
- (_interactionDialog displayCtrl 124),(_interactionDialog displayCtrl 125)];
-_editableColums = [(_interactionDialog displayCtrl 701),(_interactionDialog displayCtrl 702),(_interactionDialog displayCtrl 703),
- (_interactionDialog displayCtrl 704),(_interactionDialog displayCtrl 705)];
-
-_position = [100.0,100.0];
-{
- _x ctrlsetText "";
- _x ctrlSetPosition _position;
- _x ctrlCommit 0;
-}foreach _textDisplays;
-{
- _x ctrlSetPosition _position;
- _x ctrlsetText "";
- _x ctrlCommit 0;
-
-}foreach _infoDisplays;
-{
- _x ctrlsetText "";
- _x ctrlSetPosition _position;
- _x ctrlCommit 0;
-}foreach _editableColums;
-
-_button1 ctrlRemoveAllEventHandlers "ButtonClick";
-_button2 ctrlRemoveAllEventHandlers "ButtonClick";
-_button3 ctrlRemoveAllEventHandlers "ButtonClick";
-_button1 ctrlSetText "";
-_button2 ctrlSetText "";
-_button3 ctrlSetText "";
-ctrlSetText [101,""];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_conditionBiometricScanner.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_conditionBiometricScanner.sqf
deleted file mode 100644
index cf47702902..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_conditionBiometricScanner.sqf
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- NAME: fnc_conditionBiometricScanner
- USAGE: checks if unit can be checked with a biometric scanner
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: boolean
-*/
-
-
- private ["_caller","_cursor"];
- _caller = _this select 0;
- _cursor = _this select 1;
- _return = false;
-
- if (_cursor iskindof "man" && group _cursor != group _caller) then {
- _return = true;
- };
- _return
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_hiideMainMenu.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_hiideMainMenu.sqf
deleted file mode 100644
index bd86215877..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_hiideMainMenu.sqf
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- NAME: fnc_biometricScanner
- USAGE: opens the biometric Scanner dialog and starts up all functionality needed
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
- private ["_caller","_cursor"];
- _caller = _this select 0;
- _cursor = _this select 1;
- CSE_biometricScannerTarget = _cursor;
-
- disableSerialization;
- _interactionDialog = uiNamespace getvariable "cse_biometricScanner";
- call cse_fnc_clearScreenBiometricScanner;
- ctrlSetText [100,"HIIDE - Menu"];
- _button1 = (_interactionDialog displayCtrl 151);
- _button2 = (_interactionDialog displayCtrl 152);
- _button3 = (_interactionDialog displayCtrl 153);
-
-// adjusting positions:
-_textDisplays = [(_interactionDialog displayCtrl 111),(_interactionDialog displayCtrl 112)];
-_infoDisplays = [(_interactionDialog displayCtrl 121),(_interactionDialog displayCtrl 122),(_interactionDialog displayCtrl 123),
- (_interactionDialog displayCtrl 124),(_interactionDialog displayCtrl 125)];
-_editableColums = [(_interactionDialog displayCtrl 701),(_interactionDialog displayCtrl 702),(_interactionDialog displayCtrl 703),
- (_interactionDialog displayCtrl 704),(_interactionDialog displayCtrl 705)];
-
-
-
- _button1 ctrlSetEventHandler ["ButtonClick", format["[player,CSE_biometricScannerTarget] spawn cse_fnc_biometricScannerLoginScreen; cse_biometricScannerLogin = false;"]];
- _button2 ctrlSetEventHandler ["ButtonClick", format["[player,CSE_biometricScannerTarget] spawn cse_fnc_biometricScanStart"]]; // scan something
- _button3 ctrlSetEventHandler ["ButtonClick", format["[player,CSE_biometricScannerTarget] spawn cse_fnc_biometricScanStart"]]; // scan something
-
- _button1 ctrlSetText "Logout";
- _button2 ctrlSetText "Scan Hands";
- _button3 ctrlSetText "Scan Iris";
-
-
- _positionCenter = [0.35,0.54];
- {
- _x ctrlSetPosition _positionCenter;
- _positionCenter = [_positionCenter select 0, (_positionCenter select 1) + 0.05];
- }foreach _textDisplays;
-
- (_interactionDialog displayCtrl 111) ctrlSetText "You are now logged in";
- (_interactionDialog displayCtrl 112) ctrlSetText "Select any option below to begin";
- (_interactionDialog displayCtrl 111) ctrlCommit 0.0001;
- (_interactionDialog displayCtrl 112) ctrlCommit 0.0001;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_saveSettingsBiometric.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_saveSettingsBiometric.sqf
deleted file mode 100644
index 48a303ccd5..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/fnc_saveSettingsBiometric.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- NAME: fnc_biometricScanner
- USAGE: Saves the information of the biometric scanner for _cursor UNIT
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
- private ["_caller","_cursor"];
- _caller = _this select 0;
- _cursor = _this select 1;
-
-
-_text1 = ctrlText 701;
-_text2 = ctrlText 702;
-_text3 = ctrlText 703;
-_text4 = ctrlText 704;
-_text5 = ctrlText 705;
-
-_cursor setvariable ["cse_biometricScannerInfo",[_text1,_text2,_text3,_text4,_text5],true];
-hint "Saved biometric";
-
-[format["AIM - Biometric Scanner Saving. Target: %1 Information: %2",_cursor,[_text1,_text2,_text3,_text4,_text5]],2] call cse_fnc_debug;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/functions.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/functions.sqf
deleted file mode 100644
index 7eb977eda8..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/functions.sqf
+++ /dev/null
@@ -1,12 +0,0 @@
-
-cse_fnc_biometricScanner = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_biometricScanner.sqf";
-cse_fnc_conditionBiometricScanner = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_conditionBiometricScanner.sqf";
-cse_fnc_saveSettingsBiometric = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_saveSettingsBiometric.sqf";
-cse_fnc_cancelBiometric = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_cancelBiometric.sqf";
-cse_fnc_hiideMainMenu = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_hiideMainMenu.sqf";
-cse_fnc_clearScreenBiometricScanner = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_clearScreenBiometricScanner.sqf";
-cse_fnc_biometricScanStart = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_biometricScanStart.sqf";
-cse_fnc_biometricScannerInfo = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_biometricScannerInfo.sqf";
-cse_fnc_biometricScannerLogin = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_biometricScannerLogin.sqf";
-cse_fnc_biometricScannerLoginScreen = compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\fnc_biometricScannerLoginScreen.sqf";
-
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/init.sqf b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/init.sqf
deleted file mode 100644
index bfcf654d80..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/init.sqf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-call compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\functions.sqf";
-
- [format["AIM - Biometric Scanner Component initialisation completed"],3] call cse_fnc_debug;
-
diff --git a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/scanner.png b/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/scanner.png
deleted file mode 100644
index d8d304b120..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/biometric_scanner/scanner.png and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/config.cpp b/TO_MERGE/cse/sys_advanced_interaction/config.cpp
deleted file mode 100644
index adcc70ea9e..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/config.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#define _ARMA_
-class CfgPatches
-{
- class cse_sys_advanced_interaction
- {
- units[] = {"cse_advancedInteractionItems", "cse_KeycuffsItem", "cse_HIIDEItem", "cse_oldphoneItem", "cse_oldphone_foldedItem", "cse_watch_expensiveItem", "cse_walletItem", "cse_9v_batteryItem", "cse_notebookItem", "cse_scissorsItem", "cse_wiresItem"};
- weapons[] = {"cse_Keycuffs", "cse_HIIDE", "cse_oldphone", "cse_oldphone_folded", "cse_watch_expensive", "cse_wallet", "cse_9v_battery", "cse_notebook", "cse_scissors", "cse_wires"};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_gui","cse_main"};
- version = "0.10.0";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
- class cse_moduleAmbientCivilians
- {
- units[] = {};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_gui","cse_main"};
- version = "0.10.0";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-#include "CfgAddOns.h"
-#include "CfgVehicles.h"
-#include "Combat_Space_Enhancement.h"
-#include "GUI.h"
-
-// Here for backwards compatability. To be removed at a later moment.
-// #include "CfgMagazines.h"
-
-#include "CfgWeapons.h"
-#include "CfgFunctions.h"
-#include "CfgSounds.h"
-
-// EOF
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/data/battery_co.paa b/TO_MERGE/cse/sys_advanced_interaction/data/battery_co.paa
deleted file mode 100644
index 58a57b8333..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/data/battery_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/data/hiide_back.paa b/TO_MERGE/cse/sys_advanced_interaction/data/hiide_back.paa
deleted file mode 100644
index 980599cdfe..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/data/hiide_back.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/data/hiide_side.paa b/TO_MERGE/cse/sys_advanced_interaction/data/hiide_side.paa
deleted file mode 100644
index fc6c3866b8..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/data/hiide_side.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/data/mobile-folded.paa b/TO_MERGE/cse/sys_advanced_interaction/data/mobile-folded.paa
deleted file mode 100644
index 2bf3e3c9cf..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/data/mobile-folded.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/data/mobile.paa b/TO_MERGE/cse/sys_advanced_interaction/data/mobile.paa
deleted file mode 100644
index 2752620925..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/data/mobile.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/data/mobile_folded_side.paa b/TO_MERGE/cse/sys_advanced_interaction/data/mobile_folded_side.paa
deleted file mode 100644
index 13cf71bdf3..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/data/mobile_folded_side.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/dialog_module/init.sqf b/TO_MERGE/cse/sys_advanced_interaction/dialog_module/init.sqf
deleted file mode 100644
index d0acf782ad..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/dialog_module/init.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-if (Isnil ("cse_stance_systemBlufor")) then {cse_stance_systemBlufor = 10;};
-if (Isnil ("cse_stance_systemOpfor")) then {cse_stance_systemOpfor = 10;};
-if (Isnil ("cse_stance_systemRes")) then {cse_stance_systemRes = 10; };
-
-[format["AIM - Conversation Component initialisation completed"],3] call cse_fnc_debug;
-
-
-if (!isnil "CSE_SYS_AIM_DIALOG_MODULE_TALKTO_AIM") then {
- player removeAction CSE_SYS_AIM_DIALOG_MODULE_TALKTO_AIM;
- CSE_SYS_AIM_DIALOG_MODULE_TALKTO_AIM = nil;
-};
-CSE_SYS_AIM_DIALOG_MODULE_TALKTO_AIM = player addAction ["Talk to", {[cursorTarget, _this select 1] call cse_fnc_playerStartConverationWith_AIM;}, [], 1, false, false, "", "((cursortarget isKindOf 'CAManBase') && [cursortarget] call cse_fnc_isAwake && !(IsPlayer cursorTarget))"];
-
-
-["cse_profile_information_aim", [], true, "aim"] call cse_fnc_defineVariable;
-["cse_dialog_recorded_conversation_aim", [], false, "aim"] call cse_fnc_defineVariable;
-
-CSE_PERFORMING_TALKING_ACTION_AIM = false;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/dialog_module/talking_lines_default.sqf b/TO_MERGE/cse/sys_advanced_interaction/dialog_module/talking_lines_default.sqf
deleted file mode 100644
index 6cfb9060da..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/dialog_module/talking_lines_default.sqf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-/**
-* This file is here temporarly. It will be replaced by config entries in the near future.
-*
-*/
diff --git a/TO_MERGE/cse/sys_advanced_interaction/fn_aim_init.sqf b/TO_MERGE/cse/sys_advanced_interaction/fn_aim_init.sqf
deleted file mode 100644
index ab9bdb70c5..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/fn_aim_init.sqf
+++ /dev/null
@@ -1,142 +0,0 @@
-private ["_args"];
-_args = _this;
-CSE_ENABLED_DIALOG_INTERACTION_AIM = true;
-CSE_USE_EQUIPMENT_AIM = false;
-CSE_BIOMETRIC_SCANNER_SETTING_AIM = 0;
-CSE_DETAIN_SETTING_AIM = 0;
-CSE_SEARCH_SETTING_AIM = 0;
-
-{
- _value = _x select 1;
- if (!isnil "_value") then {
- if (_x select 0 == "enableDetain") exitwith {
- CSE_DETAIN_SETTING_AIM = _value;
- if ((_x select 1) > 0) then {
- CSE_ENABLED_DETAIN_AIM = true;
- } else {
- CSE_ENABLED_DETAIN_AIM = false;
- };
- };
-
- if (_x select 0 == "enableSearch") exitwith {
- CSE_SEARCH_SETTING_AIM = _value;
- if ((_x select 1) > 0) then {
- CSE_ENABLED_SEARCH_AIM = true;
- } else {
- CSE_ENABLED_SEARCH_AIM = false;
- };
- };
-
- if (_x select 0 == "enableBiometric") exitwith {
- CSE_BIOMETRIC_SCANNER_SETTING_AIM = _x select 1;
- if ((_x select 1) > 0) then {
- CSE_ENABLED_BIOMETRIC_SCANNER_AIM = true;
- } else {
- CSE_ENABLED_BIOMETRIC_SCANNER_AIM = false;
- };
- };
- if (_x select 0 == "enableConversation") exitwith {
- CSE_ENABLED_DIALOG_INTERACTION_AIM = (_x select 1);
- };
-
- if (_x select 0 == "useEquipment") exitwith {
- CSE_USE_EQUIPMENT_AIM = (_x select 1);
- };
-} ;
-}foreach _args;
-
-[format["AIM - Advanced Interaction initialisation started"],3] call cse_fnc_debug;
-waituntil{!isnil "cse_gui"};
-
-[format["AIM - Advanced Interaction initialisation completed"],3] call cse_fnc_debug;
-
-
-cse_fnc_action_openBiometricScanner_AIM = {
- private ["_target"];
- if (CSE_ENABLED_BIOMETRIC_SCANNER_AIM && (!CSE_USE_EQUIPMENT_AIM || [player, "cse_HIDDE"] call cse_fnc_hasItem)) then {
- _target = cursorTarget;
- if (!iSNull _target) then {
- if ((_target isKindOf "CAManBase") && ((player distance _target) < 10)) then {
- [player,_target] call cse_fnc_biometricScanner;
- };
- };
- };
-};
-
-if (CSE_ENABLED_BIOMETRIC_SCANNER_AIM) then {
-
- call compile preprocessFile "cse\cse_sys_advanced_interaction\biometric_scanner\init.sqf";
- _entries = [
- ["Biometric",
- {
- ([_this select 0, _this select 1, CSE_BIOMETRIC_SCANNER_SETTING_AIM, "cse_HIDDE"] call cse_fnc_canPerformAction_AIM)
- }, "cse\cse_sys_advanced_interaction\biometric_scanner\data\icon_biometricscanner.paa",
- { closeDialog 0; [(_this select 0),(_this select 1)] call cse_fnc_biometricScanner; }, "Use Biometric Scanner"]
- ];
- ["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
-
-if (CSE_ENABLED_SEARCH_AIM) then {
- _entries = [
- ["Search",
- { ([_this select 0, _this select 1, CSE_SEARCH_SETTING_AIM, ""] call cse_fnc_canPerformAction_AIM) }, CSE_ICON_PATH + "icon_search.paa",
- {
- closeDialog 0; [(_this select 0),(_this select 1)] call cse_fnc_searchPerson_AIM;
- },"Search Person"]
- ];
- ["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
-
-if (CSE_ENABLED_DIALOG_INTERACTION_AIM) then {
- call compile preprocessFile "cse\cse_sys_advanced_interaction\dialog_module\init.sqf";
- _entries = [
- ["Speak",{(((_this select 1) iskindof "CaManBase") && {((player distance (_this select 1)) < 10)} && {((_this select 1) != (_this select 0))} && {!Isplayer (_this select 1)})}, CSE_ICON_PATH + "icon_speak.paa",
- {
- if ([_this select 1] call cse_fnc_isAwake) then {
- closeDialog 0; [_this select 1, player] call cse_fnc_playerStartConverationWith_AIM;
- };
- },"Speak with Person"]
- ];
- ["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
-
-if (CSE_ENABLED_DETAIN_AIM) then {
- _entries = [
- ["Arrest",{[player, _this select 1] call cse_fnc_canDetain}, CSE_ICON_PATH + "icon_handcuffs.paa",
- {
- closeDialog 0; [(_this select 0),(_this select 1)] call cse_fnc_arrest_AIM;
- },"Arrest Person"],
-
- ["Release",{[player, _this select 1] call cse_fnc_canPerformArrestActions_AIM}, CSE_ICON_PATH + "icon_handcuffs.paa",
- {
- closeDialog 0; [(_this select 0),(_this select 1)] call cse_fnc_release_AIM;
- },"Release Person"],
-
- ["Move",{[player, _this select 1] call cse_fnc_canPerformArrestActions_AIM}, CSE_ICON_PATH + "icon_movement.paa",
- {
- closeDialog 0; [(_this select 0),(_this select 1)] call cse_fnc_move_AIM;
- },"Move Person"],
- ["Place",{[player, _this select 1] call cse_fnc_canPerformArrestActions_AIM}, CSE_ICON_PATH + "icon_placedown.paa",
- {
- closeDialog 0; [(_this select 0),(_this select 1)] call cse_fnc_placedown_AIM;
- },"Place down"],
- ["Load",{[player, _this select 1] call cse_fnc_canPerformArrestActions_AIM}, CSE_ICON_PATH + "icon_place_in.paa",
- {
- closeDialog 0; [(_this select 0),(_this select 1)] call cse_fnc_load_AIM;
- },"Load in nearby vehicle"]
- ];
- ["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
- _entries = [
- ["Unload (Pris)", {((_this call cse_fnc_interactWithVehicle_Crew_Condition) && (count ((_this select 1) getvariable ["cse_loaded_detainees_AIM",[]]) > 0))}, CSE_ICON_PATH + "icon_open_dialog.paa",
- {
- closeDialog 0;
- _loaded = ((_this select 1) getvariable ["cse_loaded_detainees_AIM",[]]);
- {
- [player,_x,false] call cse_fnc_unload_AIM;
- }foreach _loaded
- }, "Unload Prisoners"]
- ];
- ["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_addToConversationLog_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_addToConversationLog_AIM.sqf
deleted file mode 100644
index ac404ff451..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_addToConversationLog_AIM.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_addToConversationLog_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_caller","_type","_activity","_log"];
-_unit = _this select 0;
-_nameOf = _this select 1;
-_message = _this select 2;
-
-_log = [_unit,"cse_dialog_recorded_conversation_aim"] call cse_fnc_getVariable;
-if (count _log >= 12) then {
- _newLog = [];
- _counter = 0;
- {
- if (_counter > 0) then {
- _newLog pushback _x;
- } else {
- _counter = _counter + 1;
- };
- }foreach _log;
- _log = _newLog;
-};
-_log set [count _log, [_nameOf,_message]];
-
-[_unit,"cse_dialog_recorded_conversation_aim",_log] call cse_fnc_setVariable;
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_arrest_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_arrest_aim.sqf
deleted file mode 100644
index 60c6fdb953..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_arrest_aim.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- NAME: fnc_setArrested
- USAGE: switches state of unit to arrested
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
-private ["_caller","_cursor"];
-_caller = _this select 0;
-_target = _this select 1;
-
-playSound "cse_cable_tie_zipping";
-
-[_target, true] call cse_fnc_setArrestState;
-hint format["You arrrest this person"];
-
-if (CSE_USE_EQUIPMENT_AIM) then {
- [_caller, "cse_Keycuffs", false] call cse_fnc_useItem;
-};
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_callForSurrender_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_callForSurrender_AIM.sqf
deleted file mode 100644
index 749de803c9..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_callForSurrender_AIM.sqf
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * fn_callForSurrender_AIM.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define DISTANCE_AWAY 50
-
-// TODO add missing variables to private array
-private ["_nearest"];
-_nearest = (player nearEntities [["CAManBase"], DISTANCE_AWAY]);
-
-_amountOpfor = {side _x == EAST} count _nearest;
-_amountBlufor = {side _x == west} count _nearest;
-_amountInd = {side _x == independent} count _nearest;
-
-_amountOfSideCaller = switch (playerSide) do {
- case west: {_amountOpfor};
- case east: {_amountBlufor};
- case independent: {_amountInd};
- default {0};
-};
-if (_amountOfSideCaller == 0) exitwith {};
-
-{
- if (side _x != playerSide && !(isPlayer _x)) then {
- if (!(lineIntersects [eyePos player, eyePos _x, _x, player]) || (random(1)>=0.75)) then {
-
- _amountOfSideTarget = switch (side _x) do {
- case west: {_amountOpfor};
- case east: {_amountBlufor};
- case independent: {_amountInd};
- default {0};
- };
- _magCount = count magazines _x;
- _allWeapons = weapons _x;
- _availableMags = 0;
- {
- if (isArray (configFile >> "CfgWeapons" >> _x >> "magazines")) then {
- _magazineArray = getArray (configFile >> "CfgWeapons" >> _x >> "magazines");
- _canFitInWeapon = {_x in _magazineArray} count _magCount;
- _availableMags = _availableMags + _canFitInWeapon;
- };
- }foreach _allWeapons;
-
- if (_amountOfSideTarget / _amountOfSideCaller <= (0.1) + random(0.1)) then {
- if (_availableMags <= 1) then {
- // unit is out as well, so surrender here.
- [format["UNIT %1 is surrendering", _x]] call cse_fnc_debug;
-
- // TODO implement surrender functionality
- };
- };
-
- };
- };
-}count _nearest;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canDetain.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canDetain.sqf
deleted file mode 100644
index 974540cea5..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canDetain.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_canDetain.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_target", "_caller"];
-_caller = _this select 0;
-_target = _this select 1;
-
-
-([_caller, _target, CSE_DETAIN_SETTING_AIM, "cse_Keycuffs"] call cse_fnc_canPerformAction_AIM) && !([_target] call cse_fnc_isArrested);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canPerformAction_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canPerformAction_AIM.sqf
deleted file mode 100644
index bd2fbfb892..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canPerformAction_AIM.sqf
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * fn_canPerformAction_AIM.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-private [ "_caller", "_target", "_return", "_settingNumber", "_item"];
-_caller = _this select 0;
-_target = _this select 1;
-_settingNumber = _this select 2;
-_item = _this select 3;
-
-if ((_target iskindof "CaManBase") && {((_caller distance _target) < 10)} && (_caller != _target) && (!CSE_USE_EQUIPMENT_AIM || [_caller, _item] call cse_fnc_hasItem || _item == "")) exitwith {
-
- _return = switch (_settingNumber ) do {
- case 3: {true};
- case 2: {side _caller != side _target};
- case 1: {!(isPlayer _target)};
- case 0: {side _caller != side _target && !(isPlayer _target)};
- default { false };
- };
- _return
-};
-false;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canPerformArrestActions_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canPerformArrestActions_AIM.sqf
deleted file mode 100644
index 62c1cd179c..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_canPerformArrestActions_AIM.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * fn_canPerformArrestActions_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_target", "_caller"];
-_caller = _this select 0;
-_target = _this select 1;
-
-
-([_caller, _target, CSE_DETAIN_SETTING_AIM, ""] call cse_fnc_canPerformAction_AIM) && ([_target] call cse_fnc_isArrested);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_dialogMovementOrder_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_dialogMovementOrder_AIM.sqf
deleted file mode 100644
index 45dd2406c4..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_dialogMovementOrder_AIM.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_dialogMovementOrder_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_target","_order"];
-_target = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param;
-_order = [_this, 1, "",[""]] call BIS_fnc_Param;
-
-switch (_order) do {
- case "Stop": {
- _target stop true;
- };
- case "Move": {
- _target stop false;
- };
- default {
-
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_disarmPerson_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_disarmPerson_AIM.sqf
deleted file mode 100644
index cf63b2d13f..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_disarmPerson_AIM.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_disarmPerson_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_caller","_cursor", "_weaponHolder"];
-_caller = _this select 0;
-_target = _this select 1;
-
-_weaponHolder = createVehicle ["GroundWeaponHolder" , getPos _target, [], 0, "NONE"];
-
-{
- _target action ["DropWeapon", _weaponHolder, _X];
-}foreach weapons _target;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_displayArrestOptions_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_displayArrestOptions_aim.sqf
deleted file mode 100644
index 29943eace0..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_displayArrestOptions_aim.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_displayArrestOptions_aim.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
- _subMenus = [
- ["Arrest",{!(CSE_interactionTarget getvariable ["cse_unitArrested",false])},
- {
- [(_this select 0),(_this select 1)] call cse_fnc_arrest_AIM;
-
- }],
-
- ["Release",{(CSE_interactionTarget getvariable ["cse_unitArrested",false])},{
- [(_this select 0),(_this select 1)] call cse_fnc_release_AIM;
- }],
-
- ["Move",{(CSE_interactionTarget getvariable ["cse_unitArrested",false])},{
- [(_this select 0),(_this select 1)] call cse_fnc_move_AIM;
- }],
-
- ["Place down",{(CSE_interactionTarget getvariable ["cse_unitArrested",false])},{
- [(_this select 0),(_this select 1)] call cse_fnc_placedown_AIM;
- }]
- ];
- ["Arresting",_this select 2,_subMenus] call cse_fnc_gui_displaySubMenuButtons;
-
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_fillDialogWithConversationLines_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_fillDialogWithConversationLines_AIM.sqf
deleted file mode 100644
index 6a8b2e7786..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_fillDialogWithConversationLines_AIM.sqf
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * fn_fillDialogWithConversationLines_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_display","_target","_list","_conversation"];
-_target = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-
-disableSerialization;
-_display = uiNamespace getvariable "cse_dialog_menu_aim";
-_list = _display displayCtrl 200;
-
-while {dialog} do {
-
- lbClear 200;
- _conversation = _target getvariable ["cse_dialog_recorded_conversation_aim",[]];
- {
- _list lbAdd format["%1:",(_x select 0)];
- _list lbAdd (_x select 1); // should localize here!
- }foreach _conversation;
-
- uisleep 0.1; // got to put this in a oneachframe EH instead!
-};
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_generateProfileInformation_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_generateProfileInformation_AIM.sqf
deleted file mode 100644
index 42d5aa7939..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_generateProfileInformation_AIM.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * fn_generateProfileInformation_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define SELECT_RANDOM_ITEM(ARRAY) ARRAY select (round(random(count ARRAY -1)));
-
-private ["_unit","_occupation","_dateOfBirth","_politicalViews","_culture","_homeTown", "_availableCultures","_availableOccupations", "_availablePoliticalStances", "_availableSidesToSupport", "_availableHomeTown", "_supportedSides", "_profile"];
-_unit = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param;
-
-_occupation = "Soldier";
-_dateOfBirth = "0/0/0";
-_politicalViews = ["Unknown"];
-_culture = "Unknown";
-_homeTown = "Unknown";
-
-_sideOfUnit = side _unit;
-_factionOfUnit = faction _unit;
-
-_availableCultures = [_unit, _sideOfUnit, _factionOfUnit,"Cultures"] call cse_fnc_getAvailableProfileSetsFor_AIM;
-_availableOccupations = [_unit, _sideOfUnit, _factionOfUnit,"Occupations"] call cse_fnc_getAvailableProfileSetsFor_AIM;
-_availablePoliticalStances = [_unit, _sideOfUnit, _factionOfUnit,"PoliticalViews"] call cse_fnc_getAvailableProfileSetsFor_AIM;
-_availableSidesToSupport = [_unit, _sideOfUnit, _factionOfUnit,"SupportedSides"] call cse_fnc_getAvailableProfileSetsFor_AIM;
-_availableHomeTown = [_unit, _sideOfUnit, _factionOfUnit,"homeTown"] call cse_fnc_getAvailableProfileSetsFor_AIM;
-
-
-_occupation = SELECT_RANDOM_ITEM(_availableOccupations);
-_dateOfBirth = SELECT_RANDOM_ITEM(["Unknown"]);
-_politicalViews = SELECT_RANDOM_ITEM(_availablePoliticalStances);
-_culture = SELECT_RANDOM_ITEM(_availableCultures);
-_supportedSides = SELECT_RANDOM_ITEM(_availableSidesToSupport);
-_homeTown = SELECT_RANDOM_ITEM(_availableHomeTown);
-
-_profile = [_occupation, _dateOfBirth, _politicalViews, _culture, _supportedSides, _homeTown];
-
-[_unit, "cse_profile_information_aim", _profile] call cse_fnc_setVariable;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getALiVECivData_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getALiVECivData_AIM.sqf
deleted file mode 100644
index 348c9d9db6..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getALiVECivData_AIM.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_getALiVECivData_AIM.sqf
- * Descr: Get the ALiVE Civ data from a Civilian unit
- * Author: Glowbal
- *
- * Arguments: [unit OBJECT (Civilian unit to pull the data from.)]
- * Return: ARRAY Civlian Data if system is enabled. Otherwise returns empty array.
- * PublicAPI: true
- */
-
-
-private ["_unit","_civData"];
-_unit = [_this, 0, ObjNull, [ObjNull]] call BIS_fnc_Param;
-if ([] call cse_fnc_isLoaded_ALiVE_Mod) then {
- //_civData = ["server","CSE_GET_AGENT_DATA_ALIVE_AIM",[[_unit],{call ALIVE_fnc_getAgentData}]] call ALiVE_fnc_BUS_RetVal;
- _civData = [_unit] call ALIVE_fnc_getAgentData; // format: [ int POSTURE, array POSITION (HOME Postion), array TOWN Position, int Home town Posture]
-} else {
- _civData = [];
-};
-_civData
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getAvailableProfileSetsFor_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getAvailableProfileSetsFor_AIM.sqf
deleted file mode 100644
index 662c696b8b..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getAvailableProfileSetsFor_AIM.sqf
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * fn_getAvailableProfileSetsFor_AIM.sqf
- * Descr: Get available options for a profile set. Profile sets can be any of the following: Cultures, Occupations, PoliticalViews, SupportedSides, homeTown.
- *
- * Author: Glowbal
- *
- * Arguments: [unit OBJECT, side SIDE, faction STRING (Faction classname), set STRING (What set should be returned) ]
- * Return: ARRAY Returns an array with the available profile set options. Is an array of strings in all cases but homeTown, which returns a 2D array.
- * PublicAPI: true
- */
-
-
-#define ALL_LOCATIONS ["Strategic","StrongpointArea","FlatArea","FlatAreaCity","FlatAreaCitySmall","CityCenter","Airport","NameMarine","NameCityCapital","NameCity","NameVillage","NameLocal","Hill","ViewPoint","RockArea","BorderCrossing","VegetationBroadleaf","VegetationFir","VegetationPalm","VegetationVineyard"]
-#define NEAREST_LOCATION_RADIUS 700
-
-
-private ["_side","_faction","_set","_return", "_result", "_locationClose", "_locationFar", "_locationsClose", "_locationsFar", "_htReturn"];
-_unit = _this select 0;
-_side = _this select 1;
-_faction = _this select 2;
-_set = _this select 3;
-
-_return = switch (_set) do {
- case "Cultures": {
- switch (_side) do {
- case civilian: {
- ["Greek", "Other"]
- };
- default {["Unknown"]};
- };
- };
- case "Occupations": {
- switch (_side) do {
- case civilian: {
- ["Baker", "Butcher", "Mechanic", "Writer", "Law_Enforcement", "Retired", "None", "Unknown", "Farmer", "Software_Developer", "Hunter", "Artist", "Banker", "Fireman", "Cook", "Construction_Worker", "Fisher","Repair_man", "Cleaner", "Woods_man", "Painter"]
- };
- default {["Soldier"]};
- };
- };
- case "PoliticalViews": {
- switch (_side) do {
- case civilian: {
- ["Normal", "Radical", "Mild", "None"]
- };
- default {["Unknown"]};
- };
- };
- case "SupportedSides": {
- switch (_side) do {
- case civilian: {
- _stances = [];
- if (cse_stance_systemBlufor > 10) then {
- _stances pushback West;
- };
- if (cse_stance_systemOpfor > 10) then {
- _stances pushback east;
- };
- if (cse_stance_systemRes > 10) then {
- _stances pushback independent;
- };
- if (count _stances == 0) then {
- _stances set [ 0, Civilian ];
- };
-
- _stances
- };
- default {[_side]};
- };
- };
- case "homeTown": {
- _htReturn = [["Unknown","Unknown"]];
- switch (_side) do {
- case civilian: {
- if ([] call cse_fnc_isLoaded_ALiVE_Mod) then {
- ["ALiVE is loaded. Returning result with AlIVE settings", 1] call cse_fnc_debug;
- _result = [_unit] call cse_fnc_getALiVECivData_AIM;
- if (isnil "_result") then {
- _result = [];
- };
- _locationClose = "";
- _locationFar = "";
- if (count _result > 0) then {
- _locationsClose = (nearestLocations [_result select 1, ALL_LOCATIONS, NEAREST_LOCATION_RADIUS]);
- _locationsFar = (nearestLocations [_result select 2, ALL_LOCATIONS, NEAREST_LOCATION_RADIUS]);
- if (count _locationsClose > 0) then {
- _locationClose = text (_locationsClose select 0);
- };
- if (count _locationsFar > 0) then {
- if (count _locationsFar > 1) then {
- _locationFar = text (_locationsClose select 1);
- } else {
- _locationFar = text (_locationsClose select 0);
- };
- };
- _htReturn = [[_locationClose,_locationFar]];
- } else {
- _htReturn = [["Unknown","Unknown"]];
- };
- } else {
- _htReturn = [["Unknown","Unknown"]];
- };
- };
- default {_htReturn = [["Unknown","Unknown"]]};
- };
- _htReturn;
- };
- default {
- ["Unknown"]
- };
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getDialogLines_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getDialogLines_AIM.sqf
deleted file mode 100644
index d58ca2147e..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getDialogLines_AIM.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-// Made by Glowbal
-// Input: unit, object (Civ AI)
-// Returns String array, contains strings with possible sentences
-
-private ["_arrayWithStrings", "_behaviour"];
-_behaviour = _this select 0;
-_arrayWithStrings = [];
-
-switch (_behaviour) do {
- case "agressive":
- {
- _arrayWithStrings = CSE_AgressiveLines_AIM;
- };
-
- case "friendly":
- {
- _arrayWithStrings = CSE_FriendlyLines_AIM;
- };
-
- case "neutral":
- {
- _arrayWithStrings = CSE_NeutralLines_AIM;
- };
-
- case "careless":
- {
- _arrayWithStrings = CSE_CarelessLines_AIM;
- };
-
- case "hostile":
- {
- _arrayWithStrings = CSE_HostileLines_AIM;
- };
-
- case "lostchicken":
- {
- _arrayWithStrings = CSE_OtherLines_AIM;
- };
-
- case default
- {
- _arrayWithStrings = CSE_DefaultLines_AIM;
- };
-};
-
-_arrayWithStrings
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getPlayerSpokenLineType_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getPlayerSpokenLineType_AIM.sqf
deleted file mode 100644
index e714408240..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getPlayerSpokenLineType_AIM.sqf
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * fn_getPlayerSpokenLineType_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define MEET_AND_GREET 0
-#define ASK_ABOUT_OCCUPATION 1
-#define ASK_ABOUT_STANCE 2
-#define ASK_ABOUT_HOME 3
-#define ASK_ABOUT_CULTURE 4
-#define ASK_ABOUT_DOB 5
-#define ASK_ABOUT_INTEL 6
-#define ASK_ABOUT_ENEMY 7
-#define GIVE_MONEY 8
-#define GIVE_AID_PACKAGE 9
-#define OFFER_MEDICAL_AID 10
-
-private ["_target","_caller","_spokenLineType", "_spot", "_enemySide", "_allSides"];
-_target = _this select 0;
-_caller = _this select 1;
-_spokenLineType = _this select 2;
-
-_allSides = [west, independent, east, civilian];
-_spot = 0;
-{
- if ((_x getFriend side _caller) < ((_allSides select _spot) getFriend side _caller)) then {
- _spot = _foreachIndex;
- };
-}foreach _allSides;
-_enemySide = _allSides select _spot;
-
-switch (_spokenLineType) do {
- case MEET_AND_GREET: { // meet & greet
- ["Hello, how are you?",format["Hello, I am %1",[_caller] call cse_fnc_getName], "Hi", "Hello.."]
- };
- case ASK_ABOUT_OCCUPATION: {
- ["What do you do for a living?", "What is it that you do?", "What is your occupation?"]
- };
- case ASK_ABOUT_STANCE: {
- ["Who do you support?", "What do you think of our cause?"]
- };
- case ASK_ABOUT_HOME: {
- ["Where do you live?","Do you live nearby?","Where are you from?","What is your place?"]
- };
- case ASK_ABOUT_CULTURE: {
- ["From what area are you from?"]
- };
- case ASK_ABOUT_DOB: {
- ["How old are you?","From when are you?"]
- };
- case ASK_ABOUT_INTEL: {
- ["Do you know any information that could be of use for us?","Have you got any information for us?","Have you seen something suspicious?"]
- };
- case ASK_ABOUT_ENEMY: {
- [format["Have you seen %1 side?", _enemySide], format["Can you tell me anything about %1 side movements?", _enemySide]]
- };
- case GIVE_MONEY: {
- ["Sir, please accept this"]
- };
- case GIVE_AID_PACKAGE: {
- ["Sir, please accept this"]
- };
- case OFFER_MEDICAL_AID: {
- ["Do you need medical assistance?"]
- };
- default {
- ["Hello"]
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getProfileInformation_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getProfileInformation_AIM.sqf
deleted file mode 100644
index 276babad4e..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getProfileInformation_AIM.sqf
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * fn_getProfileInformation_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_set"];
-_unit = _this select 0;
-_set = _this select 1;
-if (count (_unit getvariable ["cse_profile_information_aim",[]]) == 0) then {
- [_unit] call cse_fnc_generateProfileInformation_AIM;
-};
-_profile = _unit getvariable ["cse_profile_information_aim",[]];
-// [_occupation, _dateOfBirth, _politicalViews, _culture, _supportedSides, _homeTown]
-
-switch (_set) do {
- case "Culture": {
- _profile select 3
- };
- case "Occupation": {
- _profile select 0
- };
- case "PoliticalViews": {
- _profile select 2
- };
- case "SupportedSides": {
- _profile select 4
- };
- case "homeTown": {
- _profile select 5
- };
- case "dateOfBirth": {
- _profile select 6
- };
- default {
- "Unknown"
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getReactionLinesOfPerson_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getReactionLinesOfPerson_AIM.sqf
deleted file mode 100644
index 19b60b9fd2..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getReactionLinesOfPerson_AIM.sqf
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- * fn_getReactionLinesOfPerson_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define MEET_AND_GREET 0
-#define ASK_ABOUT_OCCUPATION 1
-#define ASK_ABOUT_STANCE 2
-#define ASK_ABOUT_HOME 3
-#define ASK_ABOUT_CULTURE 4
-#define ASK_ABOUT_DOB 5
-#define ASK_ABOUT_INTEL 6
-#define ASK_ABOUT_ENEMY 7
-#define GIVE_MONEY 8
-#define GIVE_AID_PACKAGE 9
-#define OFFER_MEDICAL_AID 10
-
-#define ALL_LOCATIONS ["Strategic","StrongpointArea","FlatArea","FlatAreaCity","FlatAreaCitySmall","CityCenter","Airport","NameMarine","NameCityCapital","NameCity","NameVillage","NameLocal","Hill","ViewPoint","RockArea","BorderCrossing","VegetationBroadleaf","VegetationFir","VegetationPalm","VegetationVineyard"]
-#define NEAREST_LOCATION_RADIUS 700
-
-
-// TODO clean up this file. To massive, so split it up into multiple functions
-
-private ["_target", "_caller","_spokenLineType","_reactionType"];
-_target = _this select 0; // civilian
-_caller = _this select 1; // usually the player
-_spokenLineType = _this select 2;
-_reactionType = _this select 3;
-
-switch (_reactionType) do {
- case "agressive": {
- switch (_spokenLineType) do {
- case MEET_AND_GREET: { // meet & greet
- ["Go away...","We don't need you here!", "I won't talk to you", "GO AWAY!"]
- };
- case ASK_ABOUT_OCCUPATION: {
- ["Non of your business!"]
- };
- case ASK_ABOUT_STANCE: {
- ["Non of your business!", "I am warning you!"]
- };
- case ASK_ABOUT_HOME: {
- ["So you can destroy that?","Pfft.. someone should do something about you.."]
- };
- case ASK_ABOUT_CULTURE: {
- ["HA! You should die", "What..."]
- };
- case ASK_ABOUT_DOB: {
- ["Non of your business!"]
- };
- case ASK_ABOUT_INTEL: {
- ["As if I will help you!"]
- };
- case ASK_ABOUT_ENEMY: {
- if !([_target] call cse_fnc_isArrested) then {
- ["I will not tell you anything!"]
- } else {
- _nearEntities = _target nearEntities ["CaManBase", 1000];
- _enemyResults = [];
- {
- if (side _x != side _caller && {random(1)>0.8} && {side _x != side _target}) then {
- _foundLocations = (nearestLocations [getPos _x, ALL_LOCATIONS, NEAREST_LOCATION_RADIUS]);
- if !(_foundLocations isEqualTo []) then {
- _enemyResults pushback format["Alright! Perhaps something can be found near %2", side _x, text(_foundLocations select 0)];
- };
- };
- }foreach _nearEntities;
- if (_enemyResults isEqualTo []) then {
- _enemyResults = ["I will never tell you anything!", "You won't get anything from me..", "I do not know anything!", "hmmph!"];
- };
- _enemyResults;
- };
- };
- case GIVE_MONEY: {
- ["I DONT NEED YOUR MONEY","So you are going to buy my favour?"]
- };
- case GIVE_AID_PACKAGE: {
- ["Go away!","I dont want this!"]
- };
- case OFFER_MEDICAL_AID: {
- ["I dont need your help"]
- };
- default {
- ["Go","Leave me!","Someone should do something about you.."]
- };
- };
- };
- case "friendly": {
- switch (_spokenLineType) do {
- case MEET_AND_GREET: { // meet & greet
- ["Hello...",format["Hello, I am %1",[_target] call cse_fnc_getName], "Hi", "How are you, sir?"]
- };
- case ASK_ABOUT_OCCUPATION: {
- [format["My occupation is %1",[_target, "Occupation"] call cse_fnc_getProfileInformation_AIM]]
- };
- case ASK_ABOUT_STANCE: {
- [format["I support %1", str ([_target, "SupportedSides"] call cse_fnc_getProfileInformation_AIM)]]
- };
- case ASK_ABOUT_HOME: {
- ["Sorry, I won't answer that", format["I live near %1, that is nearby %2",str (([_target, "homeTown"] call cse_fnc_getProfileInformation_AIM) select 0), str (([_target, "homeTown"] call cse_fnc_getProfileInformation_AIM) select 1)]]
- };
- case ASK_ABOUT_CULTURE: {
- ["Sorry, I will not answer that"]
- };
- case ASK_ABOUT_DOB: {
- ["Sorry, I will not answer that"]
- };
- case ASK_ABOUT_INTEL: {
- ["Sorry, I don't know"]
- };
- case ASK_ABOUT_ENEMY: {
- _nearEntities = _target nearEntities ["CaManBase", 1000];
- _enemyResults = [];
- {
- if (side _x != side _caller && {random(1)>0.2} && {side _x != side _target}) then {
- _foundLocations = (nearestLocations [getPos _x, ALL_LOCATIONS, NEAREST_LOCATION_RADIUS]);
- if !(_foundLocations isEqualTo []) then {
- _enemyResults pushback format["There might be some from side %1 near %2", side _x, text(_foundLocations select 0)];
- };
- };
- }foreach _nearEntities;
- if (_enemyResults isEqualTo []) then {
- _enemyResults pushback "I'm afraid I cannot tell you anything";
- };
- _enemyResults;
- };
- case GIVE_MONEY: {
- ["Thank you"]
- };
- case GIVE_AID_PACKAGE: {
- ["Thank you"]
- };
- case OFFER_MEDICAL_AID: {
- ["Thank you"]
- };
- default {
- ["Hello"]
- };
- };
- };
- case "neutral": {
- switch (_spokenLineType) do {
- case MEET_AND_GREET: { // meet & greet
- ["Hello...",format["Hello, I am %1",[_target] call cse_fnc_getName], "Hi", "How are you, sir?"]
- };
- case ASK_ABOUT_OCCUPATION: {
- [format["My occupation is %1",[_target, "Occupation"] call cse_fnc_getProfileInformation_AIM]]
- };
- case ASK_ABOUT_STANCE: {
- [format["I support %1",str ([_target, "SupportedSides"] call cse_fnc_getProfileInformation_AIM)]]
- };
- case ASK_ABOUT_HOME: {
- ["Sorry, I won't answer that", format["I live near %1, that is nearby %2",str (([_target, "homeTown"] call cse_fnc_getProfileInformation_AIM) select 0), str (([_target, "homeTown"] call cse_fnc_getProfileInformation_AIM) select 1)]]
- };
- case ASK_ABOUT_CULTURE: {
- ["Sorry, I will not answer that"]
- };
- case ASK_ABOUT_DOB: {
- ["Sorry, I will not answer that"]
- };
- case ASK_ABOUT_INTEL: {
- ["Sorry, I don't know"]
- };
- case ASK_ABOUT_ENEMY: {
- _nearEntities = _target nearEntities ["CaManBase", 1000];
- _enemyResults = [];
- {
- if (side _x != side _caller && {random(1)>0.2} && {side _x != side _target}) then {
- _foundLocations = (nearestLocations [getPos _x, ALL_LOCATIONS, NEAREST_LOCATION_RADIUS]);
- if !(_foundLocations isEqualTo []) then {
- _enemyResults pushback format["There might be some from side %1 near %2", side _x, text(_foundLocations select 0)];
- };
- };
- }foreach _nearEntities;
- if (_enemyResults isEqualTo []) then {
- _enemyResults pushback "I'm afraid I cannot tell you anything";
- };
- _enemyResults;
- };
- case GIVE_MONEY: {
- ["Thank you"]
- };
- case GIVE_AID_PACKAGE: {
- ["Thank you"]
- };
- case OFFER_MEDICAL_AID: {
- ["Thank you"]
- };
- default {
- ["Hello"]
- };
- };
- };
- case "careless": {
- switch (_spokenLineType) do {
- case MEET_AND_GREET: { // meet & greet
- ["Hello...",format["Hello, I am %1",[_target] call cse_fnc_getName], "Hi", "How are you, sir?"]
- };
- case ASK_ABOUT_OCCUPATION: {
- [format["My occupation is %1",[_target, "Occupation"] call cse_fnc_getProfileInformation_AIM]]
- };
- case ASK_ABOUT_STANCE: {
- [format["I support %1",str ([_target, "SupportedSides"] call cse_fnc_getProfileInformation_AIM)]]
- };
- case ASK_ABOUT_HOME: {
- ["Sorry, I won't answer that", format["I live near %1, that is nearby %2",str (([_target, "homeTown"] call cse_fnc_getProfileInformation_AIM) select 0), str (([_target, "homeTown"] call cse_fnc_getProfileInformation_AIM) select 1)]]
- };
- case ASK_ABOUT_CULTURE: {
- ["Sorry, I will not answer that"]
- };
- case ASK_ABOUT_DOB: {
- ["Sorry, I will not answer that"]
- };
- case ASK_ABOUT_INTEL: {
- ["Sorry, I don't know"]
- };
- case ASK_ABOUT_ENEMY: {
- _nearEntities = _target nearEntities ["CaManBase", 1000];
- _enemyResults = [];
- {
- if (side _x != side _caller && {random(1)>0.2} && {side _x != side _target}) then {
- _foundLocations = (nearestLocations [getPos _x, ALL_LOCATIONS, NEAREST_LOCATION_RADIUS]);
- if !(_foundLocations isEqualTo []) then {
- _enemyResults pushback format["There might be some from side %1 near %2", side _x, text(_foundLocations select 0)];
- };
- };
- }foreach _nearEntities;
- if (_enemyResults isEqualTo []) then {
- _enemyResults pushback "I'm afraid I cannot tell you anything";
- };
- _enemyResults;
- };
- case GIVE_MONEY: {
- ["Thank you"]
- };
- case GIVE_AID_PACKAGE: {
- ["Thank you"]
- };
- case OFFER_MEDICAL_AID: {
- ["Thank you"]
- };
- default {
- ["Hello"]
- };
- };
- };
- case "hostile": {
- switch (_spokenLineType) do {
- case MEET_AND_GREET: { // meet & greet
- ["Go away...","We don't need you here!", "I won't talk to you", "GO AWAY!"]
- };
- case ASK_ABOUT_OCCUPATION: {
- ["Non of your business!", "What are you still doing here"]
- };
- case ASK_ABOUT_STANCE: {
- ["Non of your business!", "I am warning you!", "Should I push you in the face?"]
- };
- case ASK_ABOUT_HOME: {
- ["So you can destroy that?","Pfft.. someone should do something about you..", "Where do you live? Perhaps I should visit there.."]
- };
- case ASK_ABOUT_CULTURE: {
- ["HA! You should die", "What..."]
- };
- case ASK_ABOUT_DOB: {
- ["Non of your business!"]
- };
- case ASK_ABOUT_INTEL: {
- ["As if I will help you!"]
- };
- case ASK_ABOUT_ENEMY: {
- if !([_target] call cse_fnc_isArrested) then {
- ["I will not tell you anything!"]
- } else {
- _nearEntities = _target nearEntities ["CaManBase", 1000];
- _enemyResults = [];
- {
- if (side _x != side _caller && {random(1)>0.8} && {side _x != side _target}) then {
- _foundLocations = (nearestLocations [getPos _x, ALL_LOCATIONS, NEAREST_LOCATION_RADIUS]);
- if !(_foundLocations isEqualTo []) then {
- _enemyResults pushback format["Alright! Perhaps something can be found near %2", side _x, text(_foundLocations select 0)];
- };
- };
- }foreach _nearEntities;
- if (_enemyResults isEqualTo []) then {
- _enemyResults = ["I will never tell you anything!", "You won't get anything from me..", "I do not know anything!", "hmmph!"];
- };
- _enemyResults;
- };
- };
- case GIVE_MONEY: {
- ["I DONT NEED YOUR MONEY","So you are going to buy my favour?"]
- };
- case GIVE_AID_PACKAGE: {
- ["Go away!","I dont want this!"]
- };
- case OFFER_MEDICAL_AID: {
- ["I dont need your help"]
- };
- default {
- ["Go","Leave me!","Someone should do something about you.."]
- };
- };
- };
- case default {
- switch (_spokenLineType) do {
- case MEET_AND_GREET: { // meet & greet
- ["Hello...",format["Hello, I am %1",[_target] call cse_fnc_getName], "Hi", "How are you, sir?"]
- };
- case ASK_ABOUT_OCCUPATION: {
- [format["My occupation is %1",[_target, "Occupation"] call cse_fnc_getProfileInformation_AIM]]
- };
- case ASK_ABOUT_STANCE: {
- [format["I support %1",str ([_target, "SupportedSides"] call cse_fnc_getProfileInformation_AIM)]]
- };
- case ASK_ABOUT_HOME: {
- ["Sorry, I won't answer that"]
- };
- case ASK_ABOUT_CULTURE: {
- ["Sorry, I will not answer that"]
- };
- case ASK_ABOUT_DOB: {
- ["Sorry, I will not answer that"]
- };
- case ASK_ABOUT_INTEL: {
- _nearEntities = _target nearEntities ["CaManBase", 1000];
- _enemyResults = [];
- {
- if (side _x != side _caller && {random(1)>0.2} && {side _x != side _target}) then {
- _foundLocations = (nearestLocations [getPos _x, ALL_LOCATIONS, NEAREST_LOCATION_RADIUS]);
- if !(_foundLocations isEqualTo []) then {
- _enemyResults pushback format["There might be some from side %1 near %2", side _x, text(_foundLocations select 0)];
- };
- };
- }foreach _nearEntities;
- if (_enemyResults isEqualTo []) then {
- _enemyResults pushback "I'm afraid I cannot tell you anything";
- };
- _enemyResults;
- };
- case ASK_ABOUT_ENEMY: {
- ["I am afraid I can't tell you anything"]
- };
- case GIVE_MONEY: {
- ["Thank you"]
- };
- case GIVE_AID_PACKAGE: {
- ["Thank you"]
- };
- case OFFER_MEDICAL_AID: {
- ["Thank you"]
- };
- default {
- ["Hello"]
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getReactionTypeOfUnit_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getReactionTypeOfUnit_AIM.sqf
deleted file mode 100644
index 0bb558f173..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_getReactionTypeOfUnit_AIM.sqf
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * fn_getReactionTypeOfUnit_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_target","_caller","_stanceTowardsPlayerSide","_possibleReactionTypes","_selectedReactionType", "_selectNewReactionType", "_oldStance"];
-_target = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param;
-_caller = [_this, 1, ObjNull,[ObjNull]] call BIS_fnc_Param;
-
-_stanceTowardsPlayerSide = switch (side _caller) do {
- case WEST: {cse_stance_systemBlufor};
- case EAST: {cse_stance_systemOpfor};
- case independent: {cse_stance_systemRes};
- default {0};
-};
-if (side _caller == side _target) then {
- _stanceTowardsPlayerSide = 500;
-};
-
-_selectNewReactionType = false;
-_reactionType = _target getvariable "CSE_SYS_AIM_REACTION_TYPE";
-if (isnil "_reactionType") then {
- _selectNewReactionType = true;
-} else {
- _oldStance = _reactionType select 1;
- if (abs(_oldStance - _stanceTowardsPlayerSide) > 50) then {
- _selectNewReactionType = true;
- ["Need to refresh stance"] call cse_fnc_debug;
- } else {
- _selectedReactionType = _reactionType select 0;
- };
-};
-
-if (_selectNewReactionType) then {
- _possibleReactionTypes = switch (true) do {
- case (_stanceTowardsPlayerSide > 200): {
- ["friendly", "neutral", "careless"];
- };
- case (_stanceTowardsPlayerSide > 0 ): {
- ["agressive", "friendly", "neutral", "careless"];
- };
- case (_stanceTowardsPlayerSide < -500): {
- ["agressive", "hostile"];
- };
- default {
- ["agressive", "careless", "hostile", "neutral"];
- };
- };
-
- _selectedReactionType = (_possibleReactionTypes select round (random (count _possibleReactionTypes - 1)));
- _target setvariable ["CSE_SYS_AIM_REACTION_TYPE",[_selectedReactionType, _stanceTowardsPlayerSide]];
-};
-_selectedReactionType
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_isALIVECivlianSystemActive_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_isALIVECivlianSystemActive_AIM.sqf
deleted file mode 100644
index 6c798af500..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_isALIVECivlianSystemActive_AIM.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_isALiVECivilianSystemActive.sqf
- * Descr: Check if the ALiVE Civilian system is active
- * Author: Glowbal
- *
- * Arguments: []
- * Return: BOOL true if ALiVE civilian system is active
- * PublicAPI: true
- */
-
-if ([] call cse_fnc_isLoaded_ALiVE_Mod) then {
- (["server","Subject",[[1],{[] call ALIVE_fnc_isCivilianSystemActive}]] call ALiVE_fnc_BUS)
-} else {
- false;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_loadLocal_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_loadLocal_aim.sqf
deleted file mode 100644
index d002d0e91f..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_loadLocal_aim.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-fnc_loadLocal.sqf
-Usage:
-Author: Glowbal
-
-Arguments: array [unit (object), vehicle (object), unit (object)]
-Returns:
-
-Affects:
-Executes:
-*/
-
-private ["_unit","_vehicle","_caller","_handle","_loaded"];
-_unit = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param;
-_vehicle = [_this, 1, ObjNull,[ObjNull]] call BIS_fnc_Param;
-_caller = [_this, 2, ObjNull,[ObjNull]] call BIS_fnc_Param;
-
-_unit moveInCargo _vehicle;
-_loaded = _vehicle getvariable ["cse_loaded_detainees_AIM",[]];
-_loaded pushback _unit;
-_vehicle setvariable ["cse_loaded_detainees_AIM",_loaded,true];
-if (!([_unit] call cse_fnc_isAwake)) then {
- _handle = [_unit,_vehicle] spawn {
- private ["_unit","_vehicle"];
- _unit = _this select 0;
- _vehicle = _this select 1;
- waituntil {vehicle _unit == _vehicle};
- [_unit,([_unit] call cse_fnc_getDeathAnim)] call cse_fnc_broadcastAnim;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_load_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_load_aim.sqf
deleted file mode 100644
index dd01e1c1fe..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_load_aim.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- fnc_load.sqf
- Usage: loads specified unit into a vehicle
- Author: Glowbal
-
- Arguments: array [unit (object), unit (object)]
- Returns: none
-
- Affects:
- Executes:
-*/
-
-private ["_caller", "_unit","_vehicle", "_loaded"];
-_caller = _this select 0;
-_unit = _this select 1;
-
-if (!([_unit] call cse_fnc_isArrested)) exitwith {
- hintSilent "This player is awake and cannot be loaded";
-};
-
-_vehicle = [_caller, _unit] call cse_fnc_loadPerson_F;
-if (!isNull _vehicle) then {
- _loaded = _vehicle getvariable ["cse_loaded_detainees_AIM",[]];
- _loaded pushback _unit;
- _vehicle setvariable ["cse_loaded_detainees_AIM",_loaded,true];
-
- if (!isnil "CSE_DROP_ADDACTION_AIM") then {
- _caller removeAction CSE_DROP_ADDACTION_AIM;
- CSE_DROP_ADDACTION_AIM = nil;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_move_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_move_aim.sqf
deleted file mode 100644
index e28c9ecbf2..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_move_aim.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- NAME: fnc_release
- USAGE: switches state of unit to arrested
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
- private ["_caller","_cursor"];
- _caller = _this select 0;
- _cursor = _this select 1;
-
- if ([_caller,_cursor,[-0.25,0.5,0]] call cse_fnc_carryObj) then {
- //_cursor switchmove "UnaErcPoslechVelitele2";
- [_cursor,"UnaErcPoslechVelitele2",true] call cse_fnc_broadcastAnim;
- hint format["You move this person"];
- } else {
- //hint format["FAILED"];
- };
-
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_onCivilianKilled_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_onCivilianKilled_AIM.sqf
deleted file mode 100644
index e9f12b3081..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_onCivilianKilled_AIM.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * fn_onCivilianKilled_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_killer","_victem"];
-_killer = _this select 0;
-_victem = _this select 1;
-if (side _victem == civilian) then {
- if (CSE_ENABLED_DIALOG_INTERACTION_AIM && {isPlayer _killer} && {local _victem}) then {
- switch (side _killer) do {
- case WEST: {cse_stance_systemBlufor = cse_stance_systemBlufor - (random 300); publicVariable "cse_stance_systemBlufor";};
- case EAST: { cse_stance_systemOpfor = cse_stance_systemOpfor - (random 300); publicVariable "cse_stance_systemOpfor";};
- case independent: {cse_stance_systemRes = cse_stance_systemRes - (random 300); publicVariable "cse_stance_systemRes";};
- default {};
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_personReactionToLine_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_personReactionToLine_AIM.sqf
deleted file mode 100644
index 2c97f3016a..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_personReactionToLine_AIM.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * fn_personReactionToLine_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_target", "_caller", "_civilian", "_array","_position","_textFromCiv", "_conversation"];
-_target = _this select 0;
-_caller = _this select 1;
-_lineType = _this select 2;
-
-if ((_target getvariable ["cse_profile_information_aim",[]]) isEqualTo []) then {
- [[_target], "cse_fnc_generateProfileInformation_AIM", false, false] call BIS_fnc_MP;
- waituntil {!((_target getvariable ["cse_profile_information_aim",[]]) isEqualTo [])};
-};
-sleep 3;
-
-_array = [_target, _caller, _lineType, ([_target, _caller] call cse_fnc_getReactionTypeOfUnit_AIM)] call cse_fnc_getReactionLinesOfPerson_AIM;
-_position = round (random (count _array -1));
-_textFromCiv = _array select _position;
-titleText [_textFromCiv,"PLAIN DOWN"];
-
-[_target,[_target] call cse_fnc_getName, _textFromCiv ] call cse_fnc_addToConversationLog_AIM;
-
-CSE_PERFORMING_TALKING_ACTION_AIM = false;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_personSpeaksLine_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_personSpeaksLine_AIM.sqf
deleted file mode 100644
index e04e5b324a..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_personSpeaksLine_AIM.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_personSpeaksLine_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_target", "_caller", "_civilian", "_array","_position","_textFromCiv", "_conversation"];
-_target = _this select 0;
-_caller = _this select 1;
-
-_array = [ ([_target, _caller] call cse_fnc_getReactionTypeOfUnit_AIM) , 0] call cse_fnc_getDialogLines_AIM;
-_position = round (random (count _array -1));
-_textFromCiv = _array select _position;
-titleText [_textFromCiv,"PLAIN DOWN"];
-
-[_target,[_target] call cse_fnc_getName, _textFromCiv ] call cse_fnc_addToConversationLog_AIM;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_placedown_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_placedown_aim.sqf
deleted file mode 100644
index 3e19aee8ac..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_placedown_aim.sqf
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- NAME: fnc_release
- USAGE: switches state of unit to arrested
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
- private ["_caller","_cursor"];
- _caller = _this select 0;
- _cursor = _this select 1;
- [_caller,ObjNull] call cse_fnc_carryObj;
- //_cursor switchmove "aidlpsitmstpsnonwnondnon_ground00";
- if ([_cursor] call cse_fnc_isAwake) then {
- [_cursor,"aidlpsitmstpsnonwnondnon_ground00",true] call cse_fnc_broadcastAnim;
- };
- hint format["You place this person on the ground"];
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_playerSpeaksLine_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_playerSpeaksLine_AIM.sqf
deleted file mode 100644
index d79e0374c3..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_playerSpeaksLine_AIM.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_playerSpeaksLine_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_target", "_caller", "_civilian", "_array","_position","_textFromCiv", "_conversation", "_typeSelected"];
-_target = _this select 0;
-_caller = _this select 1;
-
-if (CSE_PERFORMING_TALKING_ACTION_AIM) exitwith {};
-
-waituntil {!CSE_PERFORMING_TALKING_ACTION_AIM};
-CSE_PERFORMING_TALKING_ACTION_AIM = true;
-
-_typeSelected = lbCurSel 400;
-_array = [_target, _caller, _typeSelected] call cse_fnc_getPlayerSpokenLineType_AIM;
-_position = round (random (count _array -1));
-_textFromCiv = _array select _position;
-titleText [_textFromCiv,"PLAIN DOWN"];
-
-
-[_target,[_caller] call cse_fnc_getName, _textFromCiv ] call cse_fnc_addToConversationLog_AIM;
-
-
-_handle = [_target, _caller, _typeSelected] spawn cse_fnc_personReactionToLine_AIM;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_playerStartConverationWith_AIM.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_playerStartConverationWith_AIM.sqf
deleted file mode 100644
index 5ee86247b6..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_playerStartConverationWith_AIM.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * fn_playerStartConverationWith_AIM.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_target", "_caller", "_civilian", "_array","_position","_textFromCiv"];
-_target = _this select 0;
-_caller = _this select 1;
-
-[_this] call cse_fnc_debug;
-disableSerialization;
-CSE_AIM_DIALOG_INTERACTION_TARGET_AIM = _target;
-createDialog "cse_dialog_menu_aim";
-[_target] spawn cse_fnc_fillDialogWithConversationLines_AIM;
-
-if (count (_target getvariable ["cse_profile_information_aim",[]]) == 0) then {
- //[_target] call cse_fnc_generateProfileInformation_AIM;
- [[_target], "cse_fnc_generateProfileInformation_AIM", false, false] call BIS_fnc_MP;
-};
-
-lbadd [400, localize "STR_CSE_DIALOG_MEET_AND_GREET" ];
-lbadd [400, localize "STR_CSE_DIALOG_ASK_ABOUT_OCCUPATION" ];
-lbadd [400, localize "STR_CSE_DIALOG_ASK_ABOUT_STANCE" ];
-lbadd [400, localize "STR_CSE_DIALOG_ASK_ABOUT_HOME" ];
-lbadd [400, localize "STR_CSE_DIALOG_ASK_ABOUT_CULTURE" ];
-lbadd [400, localize "STR_CSE_DIALOG_ASK_ABOUT_DOB" ];
-lbadd [400, localize "STR_CSE_DIALOG_ASK_ABOUT_INTEL" ];
-lbadd [400, localize "STR_CSE_DIALOG_ASK_ABOUT_ENEMY" ];
-// lbadd [400, localize "STR_CSE_DIALOG_GIVE_MONEY" ];
-// lbadd [400, localize "STR_CSE_DIALOG_GIVE_AID_PACKAGE" ];
-// lbadd [400, localize "STR_CSE_DIALOG_OFFER_MEDICAL_AID" ];
-lbSetCurSel [400, 0];
-
-ctrlSetText[12, "Name: "+ ([_target] call cse_fnc_getName)];
-
-[_target] spawn {
- _target = _this select 0;
- [[_target,"Stop"],"cse_fnc_dialogMovementOrder_AIM",_target, false] spawn BIS_fnc_MP;
- waituntil {!dialog};
- [[_target,"Move"],"cse_fnc_dialogMovementOrder_AIM",_target, false] spawn BIS_fnc_MP;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_release_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_release_aim.sqf
deleted file mode 100644
index 8069151ee9..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_release_aim.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- NAME: fnc_release
- USAGE: switches state of unit to arrested
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target , of type man
- RETURN: void
-*/
-
-
-private ["_caller","_cursor"];
-_caller = _this select 0;
-_target = _this select 1;
-[_caller,ObjNull] call cse_fnc_carryObj;
-[_target, false] call cse_fnc_setArrestState;
-hint format["You release this person"];
-
-if (CSE_USE_EQUIPMENT_AIM) then {
- // Disabled, as these are zipties. We would not be getting them back.
-// _caller addItem "cse_Keycuffs";
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_searchPersonCondition_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_searchPersonCondition_aim.sqf
deleted file mode 100644
index 7ae1a2d9ae..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_searchPersonCondition_aim.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- NAME: fnc_searchPersonCondition
- USAGE: Checks if caller can search target
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target
- RETURN: boolean
-*/
-
-
-
-private ["_caller","_cursor", "_return"];
-_caller = _this select 0;
-_cursor = _this select 1;
-_return = false;
-
-if (group _caller != group _cursor && {_cursor iskindof "CaManBase"} && {_cursor distance _caller < 5}) then {
- _return = true;
-};
-
-_return
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_searchPerson_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_searchPerson_aim.sqf
deleted file mode 100644
index 642f495094..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_searchPerson_aim.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- NAME: fnc_searchPerson
- USAGE: Opens gear menu of target object for caller
- AUTHOR: Glowbal
- ARGUMENTS: OBJECT unit, OBJECT target
- RETURN: void
-*/
-
-
-private ["_caller","_cursor"];
-_caller = _this select 0;
-_cursor = _this select 1;
-
-if ([_caller, _cursor] call cse_fnc_searchPersonCondition_AIM) then {
- _caller action ["GEAR", _cursor];
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_unload_aim.sqf b/TO_MERGE/cse/sys_advanced_interaction/functions/fn_unload_aim.sqf
deleted file mode 100644
index 8dc0909f3a..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/functions/fn_unload_aim.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-fnc_unload.sqf
-Usage:
-Author: Glowbal
-
-Arguments: array [unit (object), unit (object), vehicle (object)]
-Returns:
-
-Affects:
-Executes:
-*/
-
-private ["_caller", "_unit","_vehicle", "_drag", "_handle"];
-_caller = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param;
-_unit = [_this, 1, ObjNull,[ObjNull]] call BIS_fnc_Param;
-_drag = [_this, 2, false, [false]] call BIS_fnc_Param;
-
-_vehicle = vehicle _unit;
-if ([_caller, _unit] call cse_fnc_unloadPerson_F) then {
- _loaded = _vehicle getvariable ["cse_loaded_detainees_AIM",[]];
- _loaded = _loaded - [_unit];
- _vehicle setvariable ["cse_loaded_detainees_AIM",_loaded,true];
- if (_drag) then {
- if ((vehicle _caller) == _caller) then {
- _handle = [_caller, _unit] spawn {
- _caller = _this select 0;
- _unit = _this select 1;
- waituntil {(vehicle _unit == _unit)};
- [[_caller,_unit], "cse_fnc_move_AIM", _caller, false] spawn BIS_fnc_MP;
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/gui/define.h b/TO_MERGE/cse/sys_advanced_interaction/gui/define.h
deleted file mode 100644
index c521de470f..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/gui/define.h
+++ /dev/null
@@ -1,797 +0,0 @@
-
-#ifndef CSE_DEFINE_H
-#define CSE_DEFINE_H
-// define.hpp
-
-#define true 1
-#define false 0
-
-#define CT_STATIC 0
-#define CT_BUTTON 1
-#define CT_EDIT 2
-#define CT_SLIDER 3
-#define CT_COMBO 4
-#define CT_LISTBOX 5
-#define CT_TOOLBOX 6
-#define CT_CHECKBOXES 7
-#define CT_PROGRESS 8
-#define CT_HTML 9
-#define CT_STATIC_SKEW 10
-#define CT_ACTIVETEXT 11
-#define CT_TREE 12
-#define CT_STRUCTURED_TEXT 13
-#define CT_CONTEXT_MENU 14
-#define CT_CONTROLS_GROUP 15
-#define CT_SHORTCUTBUTTON 16
-#define CT_XKEYDESC 40
-#define CT_XBUTTON 41
-#define CT_XLISTBOX 42
-#define CT_XSLIDER 43
-#define CT_XCOMBO 44
-#define CT_ANIMATED_TEXTURE 45
-#define CT_OBJECT 80
-#define CT_OBJECT_ZOOM 81
-#define CT_OBJECT_CONTAINER 82
-#define CT_OBJECT_CONT_ANIM 83
-#define CT_LINEBREAK 98
-#define CT_ANIMATED_USER 99
-#define CT_MAP 100
-#define CT_MAP_MAIN 101
-#define CT_LISTNBOX 102
-
-// Static styles
-#define ST_POS 0x0F
-#define ST_HPOS 0x03
-#define ST_VPOS 0x0C
-#define ST_LEFT 0x00
-#define ST_RIGHT 0x01
-#define ST_CENTER 0x02
-#define ST_DOWN 0x04
-#define ST_UP 0x08
-#define ST_VCENTER 0x0c
-
-#define ST_TYPE 0xF0
-#define ST_SINGLE 0
-#define ST_MULTI 16
-#define ST_TITLE_BAR 32
-#define ST_PICTURE 48
-#define ST_FRAME 64
-#define ST_BACKGROUND 80
-#define ST_GROUP_BOX 96
-#define ST_GROUP_BOX2 112
-#define ST_HUD_BACKGROUND 128
-#define ST_TILE_PICTURE 144
-#define ST_WITH_RECT 160
-#define ST_LINE 176
-
-#define ST_SHADOW 0x100
-#define ST_NO_RECT 0x200 // this style works for CT_STATIC in conjunction with ST_MULTI
-#define ST_KEEP_ASPECT_RATIO 0x800
-
-#define ST_TITLE ST_TITLE_BAR + ST_CENTER
-
-// Slider styles
-#define SL_DIR 0x400
-#define SL_VERT 0
-#define SL_HORZ 0x400
-
-#define SL_TEXTURES 0x10
-
-// Listbox styles
-#define LB_TEXTURES 0x10
-#define LB_MULTI 0x20
-#define FontCSE "PuristaMedium"
-
-class cse_gui_backgroundBase {
- type = CT_STATIC;
- idc = -1;
- style = ST_PICTURE;
- colorBackground[] = {0,0,0,0};
- colorText[] = {1, 1, 1, 1};
- font = FontCSE;
- text = "";
- sizeEx = 0.032;
-};
-class cse_gui_editBase
-{
- access = 0;
- type = 2;
- x = 0;
- y = 0;
- h = 0.04;
- w = 0.2;
- colorBackground[] =
- {
- 0,
- 0,
- 0,
- 1
- };
- colorText[] =
- {
- 0.95,
- 0.95,
- 0.95,
- 1
- };
- colorSelection[] =
- {
- "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])",
- 1
- };
- autocomplete = "";
- text = "";
- size = 0.2;
- style = "0x00 + 0x40";
- font = "PuristaMedium";
- shadow = 2;
- sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorDisabled[] =
- {
- 1,
- 1,
- 1,
- 0.25
- };
-};
-
-
-
-class cse_gui_buttonBase {
- idc = -1;
- type = 16;
- style = ST_LEFT;
- text = "";
- action = "";
- x = 0.0;
- y = 0.0;
- w = 0.25;
- h = 0.04;
- size = 0.03921;
- sizeEx = 0.03921;
- color[] = {1.0, 1.0, 1.0, 1};
- color2[] = {1.0, 1.0, 1.0, 1};
- /*colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.5])"};
- colorbackground2[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.4};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- colorFocused[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])", 0.8};
- colorBackgroundFocused[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.8};
- */
-
- colorBackground[] = {1,1,1,0.95};
- colorbackground2[] = {1,1,1,0.95};
- colorDisabled[] = {1,1,1,0.6};
- colorFocused[] = {1,1,1,1};
- colorBackgroundFocused[] = {1,1,1,1};
- periodFocus = 1.2;
- periodOver = 0.8;
- default = false;
- class HitZone {
- left = 0.00;
- top = 0.00;
- right = 0.00;
- bottom = 0.00;
- };
-
- class ShortcutPos {
- left = 0.00;
- top = 0.00;
- w = 0.00;
- h = 0.00;
- };
-
- class TextPos {
- left = 0.002;
- top = 0.0004;
- right = 0.0;
- bottom = 0.00;
- };
- textureNoShortcut = "";
- animTextureNormal = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDisabled = "cse\cse_gui\data\buttonDisabled_gradient.paa";
- animTextureOver = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureFocused = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTexturePressed = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDefault = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- period = 0.5;
- font = FontCSE;
- soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
- soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0};
- soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1};
- soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
- class Attributes {
- font = FontCSE;
- color = "#E5E5E5";
- align = "center";
- shadow = "true";
- };
- class AttributesImage {
- font = FontCSE;
- color = "#E5E5E5";
- align = "left";
- shadow = "true";
- };
-};
-
-class cse_gui_RscProgress {
- type = 8;
- style = 0;
- colorFrame[] = {1,1,1,0.7};
- colorBar[] = {1,1,1,0.7};
- texture = "#(argb,8,8,3)color(1,1,1,0.7)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-};
-
-
-class cse_gui_staticBase {
- idc = -1;
- type = CT_STATIC;
- x = 0.0;
- y = 0.0;
- w = 0.183825;
- h = 0.104575;
- style = ST_LEFT;
- font = FontCSE;
- sizeEx = 0.03921;
- colorText[] = {0.95, 0.95, 0.95, 1.0};
- colorBackground[] = {0, 0, 0, 0};
- text = "";
-};
-
-class RscListBox;
-class cse_gui_listBoxBase : RscListBox{
- type = CT_LISTBOX;
- style = ST_MULTI;
- font = FontCSE;
- sizeEx = 0.03921;
- color[] = {1, 1, 1, 1};
- colorText[] = {0.543, 0.5742, 0.4102, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 1};
- colorSelectBackground2[] = {0.543, 0.5742, 0.4102, 1.0};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- period = 1.2;
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 1};
- maxHistoryDelay = 1.0;
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- soundSelect[] = {"",0.1,1};
- soundExpand[] = {"",0.1,1};
- soundCollapse[] = {"",0.1,1};
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
- class ScrollBar {
- color[] = {1, 1, 1, 0.6};
- colorActive[] = {1, 1, 1, 1};
- colorDisabled[] = {1, 1, 1, 0.3};
- thumb = "";
- arrowFull = "";
- arrowEmpty = "";
- border = "";
- };
-};
-
-
-class cse_gui_listNBox {
- access = 0;
- type = CT_LISTNBOX;// 102;
- style =ST_MULTI;
- w = 0.4;
- h = 0.4;
- font = FontCSE;
- sizeEx = 0.031;
-
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- columns[] = {0.0};
- color[] = {1, 1, 1, 1};
-
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.5};
- colorActive[] = {0,0,0,1};
- colorDisabled[] = {0,0,0,0.3};
- rows = 1;
-
- drawSideArrows = 0;
- idcLeft = -1;
- idcRight = -1;
- maxHistoryDelay = 1;
- soundSelect[] = {"", 0.1, 1};
- period = 1;
- shadow = 2;
- class ScrollBar {
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- border = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- thumb = "#(argb,8,8,3)color(1,1,1,1)";
- };
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-class RscCombo;
-class cse_gui_comboBoxBase: RscCombo {
- idc = -1;
- type = 4;
- style = "0x10 + 0x200";
- x = 0;
- y = 0;
- w = 0.3;
- h = 0.035;
- color[] = {0,0,0,0.6};
- colorActive[] = {1,0,0,1};
- colorBackground[] = {0,0,0,1};
- colorDisabled[] = {1,1,1,0.25};
- colorScrollbar[] = {1,0,0,1};
- colorSelect[] = {0,0,0,1};
- colorSelectBackground[] = {1,1,1,0.7};
- colorText[] = {1,1,1,1};
-
- arrowEmpty = "";
- arrowFull = "";
- wholeHeight = 0.45;
- font = FontCSE;
- sizeEx = 0.031;
- soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1};
- soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1};
- soundCollapse[] = {"\A3\ui_f\data\sound\RscCombo\soundCollapse",0.1,1};
- maxHistoryDelay = 1.0;
- class ScrollBar
- {
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- border = "";
- };
- class ComboScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-
-class cse_gui_mapBase {
- moveOnEdges = 1;
- x = "SafeZoneXAbs";
- y = "SafeZoneY + 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "SafeZoneWAbs";
- h = "SafeZoneH - 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- type = 100; // Use 100 to hide markers
- style = 48;
- shadow = 0;
-
- ptsPerSquareSea = 5;
- ptsPerSquareTxt = 3;
- ptsPerSquareCLn = 10;
- ptsPerSquareExp = 10;
- ptsPerSquareCost = 10;
- ptsPerSquareFor = 9;
- ptsPerSquareForEdge = 9;
- ptsPerSquareRoad = 6;
- ptsPerSquareObj = 9;
- showCountourInterval = 0;
- scaleMin = 0.001;
- scaleMax = 1.0;
- scaleDefault = 0.16;
- maxSatelliteAlpha = 0.85;
- alphaFadeStartScale = 0.35;
- alphaFadeEndScale = 0.4;
- colorBackground[] = {0.969,0.957,0.949,1.0};
- colorSea[] = {0.467,0.631,0.851,0.5};
- colorForest[] = {0.624,0.78,0.388,0.5};
- colorForestBorder[] = {0.0,0.0,0.0,0.0};
- colorRocks[] = {0.0,0.0,0.0,0.3};
- colorRocksBorder[] = {0.0,0.0,0.0,0.0};
- colorLevels[] = {0.286,0.177,0.094,0.5};
- colorMainCountlines[] = {0.572,0.354,0.188,0.5};
- colorCountlines[] = {0.572,0.354,0.188,0.25};
- colorMainCountlinesWater[] = {0.491,0.577,0.702,0.6};
- colorCountlinesWater[] = {0.491,0.577,0.702,0.3};
- colorPowerLines[] = {0.1,0.1,0.1,1.0};
- colorRailWay[] = {0.8,0.2,0.0,1.0};
- colorNames[] = {0.1,0.1,0.1,0.9};
- colorInactive[] = {1.0,1.0,1.0,0.5};
- colorOutside[] = {0.0,0.0,0.0,1.0};
- colorTracks[] = {0.84,0.76,0.65,0.15};
- colorTracksFill[] = {0.84,0.76,0.65,1.0};
- colorRoads[] = {0.7,0.7,0.7,1.0};
- colorRoadsFill[] = {1.0,1.0,1.0,1.0};
- colorMainRoads[] = {0.9,0.5,0.3,1.0};
- colorMainRoadsFill[] = {1.0,0.6,0.4,1.0};
- colorGrid[] = {0.1,0.1,0.1,0.6};
- colorGridMap[] = {0.1,0.1,0.1,0.6};
- colorText[] = {1, 1, 1, 0.85};
-font = "PuristaMedium";
-sizeEx = 0.0270000;
-stickX[] = {0.20, {"Gamma", 1.00, 1.50} };
-stickY[] = {0.20, {"Gamma", 1.00, 1.50} };
-onMouseButtonClick = "";
-onMouseButtonDblClick = "";
-
- fontLabel = "PuristaMedium";
- sizeExLabel = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontGrid = "TahomaB";
- sizeExGrid = 0.02;
- fontUnits = "TahomaB";
- sizeExUnits = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontNames = "PuristaMedium";
- sizeExNames = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2";
- fontInfo = "PuristaMedium";
- sizeExInfo = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontLevel = "TahomaB";
- sizeExLevel = 0.02;
- text = "#(argb,8,8,3)color(1,1,1,1)";
- class ActiveMarker {
- color[] = {0.30, 0.10, 0.90, 1.00};
- size = 50;
- };
- class Legend
- {
- x = "SafeZoneX + ( ((safezoneW / safezoneH) min 1.2) / 40)";
- y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
- h = "3.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- font = "PuristaMedium";
- sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- colorBackground[] = {1,1,1,0.5};
- color[] = {0,0,0,1};
- };
- class Task
- {
- icon = "\A3\ui_f\data\map\mapcontrol\taskIcon_CA.paa";
- iconCreated = "\A3\ui_f\data\map\mapcontrol\taskIconCreated_CA.paa";
- iconCanceled = "\A3\ui_f\data\map\mapcontrol\taskIconCanceled_CA.paa";
- iconDone = "\A3\ui_f\data\map\mapcontrol\taskIconDone_CA.paa";
- iconFailed = "\A3\ui_f\data\map\mapcontrol\taskIconFailed_CA.paa";
- color[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])"};
- colorCreated[] = {1,1,1,1};
- colorCanceled[] = {0.7,0.7,0.7,1};
- colorDone[] = {0.7,1,0.3,1};
- colorFailed[] = {1,0.3,0.2,1};
- size = 27;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- };
- class Waypoint
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class WaypointCompleted
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypointCompleted_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class CustomMark
- {
- icon = "\A3\ui_f\data\map\mapcontrol\custommark_ca.paa";
- size = 24;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {0,0,0,1};
- };
- class Command
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- size = 18;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {1,1,1,1};
- };
- class Bush
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = "14/2";
- importance = "0.2 * 14 * 0.05 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Rock
- {
- icon = "\A3\ui_f\data\map\mapcontrol\rock_ca.paa";
- color[] = {0.1,0.1,0.1,0.8};
- size = 12;
- importance = "0.5 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class SmallTree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.6 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Tree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.9 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class busstop
- {
- icon = "\A3\ui_f\data\map\mapcontrol\busstop_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class fuelstation
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fuelstation_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class hospital
- {
- icon = "\A3\ui_f\data\map\mapcontrol\hospital_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class church
- {
- icon = "\A3\ui_f\data\map\mapcontrol\church_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class lighthouse
- {
- icon = "\A3\ui_f\data\map\mapcontrol\lighthouse_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class power
- {
- icon = "\A3\ui_f\data\map\mapcontrol\power_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powersolar
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powersolar_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwave
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwave_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwind
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwind_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class quay
- {
- icon = "\A3\ui_f\data\map\mapcontrol\quay_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class shipwreck
- {
- icon = "\A3\ui_f\data\map\mapcontrol\shipwreck_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class transmitter
- {
- icon = "\A3\ui_f\data\map\mapcontrol\transmitter_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class watertower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\watertower_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class Cross
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Cross_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Chapel
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Chapel_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Bunker
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 14;
- importance = "1.5 * 14 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fortress
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 16;
- importance = "2 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fountain
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fountain_ca.paa";
- size = 11;
- importance = "1 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Ruin
- {
- icon = "\A3\ui_f\data\map\mapcontrol\ruin_ca.paa";
- size = 16;
- importance = "1.2 * 16 * 0.05";
- coefMin = 1;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Stack
- {
- icon = "\A3\ui_f\data\map\mapcontrol\stack_ca.paa";
- size = 20;
- importance = "2 * 16 * 0.05";
- coefMin = 0.9;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Tourism
- {
- icon = "\A3\ui_f\data\map\mapcontrol\tourism_ca.paa";
- size = 16;
- importance = "1 * 16 * 0.05";
- coefMin = 0.7;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class ViewTower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\viewtower_ca.paa";
- size = 16;
- importance = "2.5 * 16 * 0.05";
- coefMin = 0.5;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
-};
-
-#endif
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/gui/dialog_menu.h b/TO_MERGE/cse/sys_advanced_interaction/gui/dialog_menu.h
deleted file mode 100644
index beeff47d76..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/gui/dialog_menu.h
+++ /dev/null
@@ -1,172 +0,0 @@
-class cse_dialog_menu_aim {
- idd = 54327;
- movingEnable = false;
- onLoad = "uiNamespace setVariable ['cse_dialog_menu_aim', _this select 0];";
- onUnload = "uiNamespace setVariable ['cse_dialog_menu_aim', nil];";
- class controlsBackground {
- class HeaderBackground: cse_gui_backgroundBase{
- idc = -1;
- type = CT_STATIC;
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_LEFT + ST_SHADOW;
- font = "PuristaMedium";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.95, 0.95, 0.95, 0.75};
- colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- text = "";
- };
- class CenterBackground: HeaderBackground {
- y = "2.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- h = "2.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "";
- colorText[] = {0, 0, 0, "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- colorBackground[] = {0,0,0,"(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- };
- class LeftBackground: CenterBackground {
- y = "4.8 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- h = "12.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "25 * (((safezoneW / safezoneH) min 1.2) / 40)";
- };
- class RightBackground: LeftBackground {
- x = "26.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- w = "12.9 * (((safezoneW / safezoneH) min 1.2) / 40)";
- };
- };
-
- class controls {
- class HeaderName {
- idc = 1;
- type = CT_STATIC;
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_LEFT + ST_SHADOW;
- font = "PuristaMedium";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.95, 0.95, 0.95, 0.75};
- colorBackground[] = {0,0,0,0};
- text = "Dialog with Person";
- };
-
- class labelShow : cse_gui_staticBase {
- idc = 12;
- x = "2 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "2.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "30 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "Name:";
- };
- class labelShow2: cse_gui_staticBase {
- idc = 13;
- x = "2 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "30 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "State:";
- };
-
- class actionClose : cse_gui_buttonBase {
- idc = 10;
- text = "Close";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "17.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "6 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.8)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.5)";
- animTextureOver = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)";
- animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1, 1, 1, 1};
- color2[] = {0,0,0, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.5,0.5,0.5,0.8};
- colorFocused[] = {0,0,0,1};
- periodFocus = 1;
- periodOver = 1;
- action = "closedialog 0;";
- };
-
- class listboxConversationOverView: cse_gui_listNBox {
- idc = 200;
- x = "2 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "23 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
- colorBackground[] = {0, 0, 0, 0.9};
- colorSelectBackground[] = {0, 0, 0, 0.9};
- columns[] = {0.0, 0.25};
- };
-
- class labelTitle: cse_gui_staticBase {
- idc = 250;
- x = "27.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "Conversation Selection";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- };
-
-
- class actionListBox1: cse_gui_listBoxBase {
- idc = 400;
- x = "27.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "7.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "11 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "8 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- colorBackground[] = {0,0,0, 0.9};
- colorSelectBackground[] = {0,0,0, 0.9};
- colorSelectBackground2[] = { 0.9, 0.9, 0.9, 0.9};
- color[] = {1, 1, 1, 1};
- colorText[] = {1, 1, 1, 1};
- colorSelect[] = {1, 1, 1, 1};
- colorSelect2[] = {0,0,0, 1};
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.75)";
- rowHeight = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.75)";
- };
-
- class labelKey: cse_gui_staticBase {
- idc = 300;
- x = "27.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "6.2 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- };
-
-
- class actionPerformAction: actionClose {
- idc = 30;
- text = "Say selected line type";
- x = "27.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "17.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "11 * (((safezoneW / safezoneH) min 1.2) / 40)";
- action = "[CSE_AIM_DIALOG_INTERACTION_TARGET_AIM, player] call cse_fnc_playerSpeaksLine_AIM; ";
- animTextureNormal = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureDisabled = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureOver = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)";
- animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {0,0,0, 1};
- color2[] = {0,0,0, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.5,0.5,0.5,0.8};
- colorFocused[] = {0,0,0,1};
- };
-
-
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/gui/search_menu.h b/TO_MERGE/cse/sys_advanced_interaction/gui/search_menu.h
deleted file mode 100644
index f1c83f64b3..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/gui/search_menu.h
+++ /dev/null
@@ -1,26 +0,0 @@
-class cse_searchMenu_aim {
- idd = 54327;
- movingEnable = false;
- onLoad = "uiNamespace setVariable ['cse_searchMenu_aim', _this select 0];";
- onUnload = "uiNamespace setVariable ['cse_searchMenu_aim', nil];";
- class controlsBackground {
- class HeaderBackground: cse_gui_backgroundBase{
- idc = -1;
- type = CT_STATIC;
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_LEFT + ST_SHADOW;
- font = "PuristaMedium";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.95, 0.95, 0.95, 0.75};
- colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- text = "";
- };
- };
-
- class controls {
-
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_advanced_interaction/hiide.p3d b/TO_MERGE/cse/sys_advanced_interaction/hiide.p3d
deleted file mode 100644
index 818c9ed45c..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/hiide.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/9v_battery.paa b/TO_MERGE/cse/sys_advanced_interaction/img/9v_battery.paa
deleted file mode 100644
index c68a998b10..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/9v_battery.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/HIIDE.paa b/TO_MERGE/cse/sys_advanced_interaction/img/HIIDE.paa
deleted file mode 100644
index 33f080ebb8..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/HIIDE.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/hexiblocks.paa b/TO_MERGE/cse/sys_advanced_interaction/img/hexiblocks.paa
deleted file mode 100644
index 29f2f7b271..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/hexiblocks.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/keycuffs.paa b/TO_MERGE/cse/sys_advanced_interaction/img/keycuffs.paa
deleted file mode 100644
index fde5797f66..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/keycuffs.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/notebook.paa b/TO_MERGE/cse/sys_advanced_interaction/img/notebook.paa
deleted file mode 100644
index 7a603a5a95..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/notebook.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/oldphone.paa b/TO_MERGE/cse/sys_advanced_interaction/img/oldphone.paa
deleted file mode 100644
index 1b24958231..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/oldphone.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/scissor.paa b/TO_MERGE/cse/sys_advanced_interaction/img/scissor.paa
deleted file mode 100644
index d9ec6503e3..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/scissor.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/wallet.paa b/TO_MERGE/cse/sys_advanced_interaction/img/wallet.paa
deleted file mode 100644
index 8a5ccf235a..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/wallet.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/watch_expensive.paa b/TO_MERGE/cse/sys_advanced_interaction/img/watch_expensive.paa
deleted file mode 100644
index 7f7d5513b7..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/watch_expensive.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/img/wires.paa b/TO_MERGE/cse/sys_advanced_interaction/img/wires.paa
deleted file mode 100644
index 180c212898..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/img/wires.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/mobile.p3d b/TO_MERGE/cse/sys_advanced_interaction/mobile.p3d
deleted file mode 100644
index c4e10c9035..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/mobile.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/mobile_folded.p3d b/TO_MERGE/cse/sys_advanced_interaction/mobile_folded.p3d
deleted file mode 100644
index 1e141ae0c7..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/mobile_folded.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/sounds/cse_cable_tie_zipping.ogg b/TO_MERGE/cse/sys_advanced_interaction/sounds/cse_cable_tie_zipping.ogg
deleted file mode 100644
index 4f76037eb1..0000000000
Binary files a/TO_MERGE/cse/sys_advanced_interaction/sounds/cse_cable_tie_zipping.ogg and /dev/null differ
diff --git a/TO_MERGE/cse/sys_advanced_interaction/stringtable.xml b/TO_MERGE/cse/sys_advanced_interaction/stringtable.xml
deleted file mode 100644
index 49d8df22e8..0000000000
--- a/TO_MERGE/cse/sys_advanced_interaction/stringtable.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
-
-
- Meet and Greet
- Meet and Greet
- Przedstaw się i przywitaj
- Saludar
-
-
- Ask about Occupation
- Ask about Occupation
- Zapytaj o zawód
- Preguntar sobre su ocupación
-
-
- Ask about Their supported side
- Ask about Their supported side
- Zapytaj którą stronę wspierają
- Preguntar sobre su bando
-
-
- Ask about there home
- Ask about there home
- Zapytaj o dom
- Preguntar acerca de su hogar
-
-
- Find out their culture
- Find out their culture
- Zapytaj o kulturę
- Averigüe su cultura
-
-
- Ask about Date of Birth
- Ask about Date of Birth
- Zapytaj o datę urodzenia
- Preguntar fecha de nacimiento
-
-
- Ask information
- Ask information
- Zapytaj o informację
- Pedir información
-
-
- Ask about enemy
- Ask about enemy
- Zapytaj o przeciwnika
- Preguntar sobre el enemigo
-
-
- Give Money
- Give Money
- Podaruj pieniądze
- Dar Dinero
-
-
- Give Aid Package
- Give Aid Package
- Podaruj apteczkę
- Dar paquete de ayuda médica
-
-
- Offer medical Aid
- Offer medical Aid
- Zaoferuj pomoc medyczną
- Ofrecer ayuda médica
-
-
-
-
-
- Keycuffs
- Bridas
-
-
- Keycuffs, used for detaining a suspect
- Bridas, usadas para detener a un sospechoso
-
-
-
- Biometric Scanner (HIIDE)
- Escáner Biométrico (HIIDE)
-
-
- Biometric Scanner (HIIDE)
- Escáner Biométrico (HIIDE)
-
-
-
- Old Phone
- Teléfono Antiguo
-
-
- Old Phone
- Teléfono Antiguo
-
-
-
- Old Phone (Folded)
- Teléfono Antiguo (Cerrado)
-
-
- Old Phone (Folded)
- Teléfono Antiguo (Cerrado)
-
-
-
- Watch (Expensive)
- Reloj (Caro)
-
-
- Watch (Expensive)
- Reloj (Caro)
-
-
-
- Wallet
- Billetera
-
-
- Wallet
- Billetera
-
-
-
- 9 volt battery
- Pila de 9 voltios
-
-
- 9 volt battery
- Pila de 9 voltios
-
-
-
- Notebook
- Cuaderno
-
-
-
-
- Notebook
- Cuaderno
-
-
-
- Scissors
- Tijeras
-
-
- Scissors
- Tijeras
-
-
-
- Wires
- Alambre
-
-
- Wires
- Alambre
-
-
-
-
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgAmmo.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgAmmo.h
deleted file mode 100644
index 255aced8d7..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgAmmo.h
+++ /dev/null
@@ -1,1715 +0,0 @@
-class CfgAmmo
-{
- class BulletBase;
- class B_556x45_Ball_Tracer_Red;
- class B_762x51_Tracer_Red;
- class B_556x45_Ball
- {
- airFriction=-0.001265;
- hit=8;
- typicalSpeed=750;
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=62;
- AB_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75};
- AB_ballisticCoefficients[]={0.151};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900};
- AB_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0};
- };
- class AB_556x45_Ball_Mk262 : B_556x45_Ball
- {
- airFriction=-0.001125;
- caliber=0.6;
- deflecting=18;
- hit=11;
- typicalSpeed=836;
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=77;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.361};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={624, 816, 832, 838};
- AB_barrelLengths[]={7.5, 14.5, 18, 20};
- };
- class AB_556x45_Ball_Mk318 : B_556x45_Ball
- {
- airFriction=-0.001120;
- caliber=0.6;
- deflecting=18;
- hit=9;
- typicalSpeed=886;
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=62;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.307};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={780, 886, 950};
- AB_barrelLengths[]={10, 15.5, 20};
- };
- class AB_545x39_Ball_7N6M : B_556x45_Ball
- {
- airFriction=-0.001162;
- caliber=0.5;
- deflecting=18;
- hit=7;
- typicalSpeed=880;
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=52.9;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={780, 880, 920};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class AB_545x39_Ball_7T3M : B_556x45_Ball_Tracer_Red
- {
- airFriction=-0.001162;
- caliber=0.5;
- deflecting=18;
- hit=7;
- typicalSpeed=883;
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=49.8;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={785, 883, 925};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class B_65x39_Caseless
- {
- airFriction=-0.000772;
- typicalSpeed=800;
- AB_caliber=0.264;
- AB_bulletLength=1.295;
- AB_bulletMass=123;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.263};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={760, 788, 800, 805};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class B_762x51_Ball
- {
- airFriction=-0.001035;
- typicalSpeed=833;
- hit=14;
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class AB_762x51_Ball_M118LR : B_762x51_Ball
- {
- airFriction=-0.0008525;
- caliber=1.05;
- hit=16;
- typicalSpeed=790;
- AB_caliber=0.308;
- AB_bulletLength=1.24;
- AB_bulletMass=175;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.505, 0.496, 0.485, 0.485, 0.485};
- AB_velocityBoundaries[]={853, 549, 549, 549};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={750, 780, 790, 794};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class AB_762x51_Ball_Subsonic : B_762x51_Ball
- {
- airFriction=-0.000535;
- caliber=0.5;
- hit=16;
- typicalSpeed=790;
- AB_caliber=0.308;
- AB_bulletLength=1.340;
- AB_bulletMass=200;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.235};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={305, 325, 335, 340};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class AB_762x54_Ball_7N14 : B_762x51_Ball
- {
- airFriction=-0.001023;
- caliber=0.95;
- hit=15;
- typicalSpeed=820;
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=152;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.4};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={700, 800, 820, 833};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class AB_762x54_Ball_7T2 : B_762x51_Tracer_Red
- {
- airFriction=-0.001023;
- caliber=0.9;
- hit=15;
- typicalSpeed=800;
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=149;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.395};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 750, 798, 800};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class AB_762x35_Ball : B_762x51_Ball
- {
- airFriction=-0.000821;
- caliber=0.9;
- hit=11;
- typicalSpeed=790;
- AB_caliber=0.308;
- AB_bulletLength=1.153;
- AB_bulletMass=125;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.349, 0.338, 0.330, 0.310};
- AB_velocityBoundaries[]={792, 610, 488};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={620, 655, 675};
- AB_barrelLengths[]={9, 16, 20};
- };
- class AB_762x39_Ball : B_762x51_Ball
- {
- airFriction=-0.0015168;
- hit=12;
- typicalSpeed=716;
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=123;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class AB_762x39_Ball_57N231P : B_762x51_Tracer_Red
- {
- airFriction=-0.0015168;
- hit=12;
- typicalSpeed=716;
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=117;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class B_9x21_Ball
- {
- airFriction=-0.00125;
- typicalSpeed=390;
- hit=6;
- AB_caliber=0.356;
- AB_bulletLength=0.610;
- AB_bulletMass=115;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.17};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={350, 390, 420};
- AB_barrelLengths[]={4, 5, 9};
- };
- class AB_9x18_Ball_57N181S : B_9x21_Ball
- {
- hit=5;
- airFriction=-0.001234;
- typicalSpeed=298;
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 350};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class AB_9x19_Ball : B_9x21_Ball
- {
- airFriction=-0.001234;
- typicalSpeed=370;
- hit=6;
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={340, 370, 400};
- AB_barrelLengths[]={4, 5, 9};
- };
- class AB_10x25_Ball : B_9x21_Ball
- {
- airFriction=-0.00168;
- typicalSpeed=425;
- hit=7;
- AB_caliber=0.5;
- AB_bulletLength=0.764;
- AB_bulletMass=165;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.189};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={360, 400, 430};
- AB_barrelLengths[]={4, 4.61, 9};
- };
- class AB_765x17_Ball: B_9x21_Ball
- {
- airFriction=-0.001213;
- typicalSpeed=282;
- hit=7;
- AB_caliber=0.3125;
- AB_bulletLength=0.610;
- AB_bulletMass=65;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.118};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={282, 300, 320};
- AB_barrelLengths[]={4, 5, 9};
- };
- class AB_303_Ball : AB_762x51_Ball_M118LR
- {
- airFriction=-0.00083;
- typicalSpeed=761;
- AB_caliber=0.311;
- AB_bulletLength=1.227;
- AB_bulletMass=174;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.499, 0.493, 0.48};
- AB_velocityBoundaries[]={671, 549};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={748, 761, 765};
- AB_barrelLengths[]={20, 24, 26};
- };
- class B_408_Ball
- {
- airFriction=-0.000395;
- typicalSpeed=910;
- AB_caliber=0.408;
- AB_bulletLength=2.126;
- AB_bulletMass=410;
- AB_transonicStabilityCoef=1;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.97};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={910};
- AB_barrelLengths[]={29};
- };
- class AB_106x83mm_Ball : B_408_Ball
- {
- AB_caliber=0.416;
- AB_bulletLength=2.089;
- AB_bulletMass=398;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.72};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={960};
- AB_barrelLengths[]={29};
- };
- class AB_338_Ball : B_408_Ball
- {
- airFriction=-0.000526;
- caliber=1.55;
- deflecting=12;
- hit=20;
- typicalSpeed=826;
- AB_caliber=0.338;
- AB_bulletLength=1.70;
- AB_bulletMass=300;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.381};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={820, 826, 830};
- AB_barrelLengths[]={24, 26.5, 28};
- };
- class B_127x99_Ball
- {
- airFriction=-0.0006;
- typicalSpeed=853;
- AB_caliber=0.510;
- AB_bulletLength=2.310;
- AB_bulletMass=647;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.670};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={853};
- AB_barrelLengths[]={29};
- };
- class AB_127x99_Ball_AMAX : B_127x99_Ball
- {
- AB_caliber=0.510;
- AB_bulletLength=2.540;
- AB_bulletMass=750;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={1.050};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={860};
- AB_barrelLengths[]={29};
- };
- class B_127x108_Ball
- {
- typicalSpeed=820;
- AB_caliber=0.511;
- AB_bulletLength=2.520;
- AB_bulletMass=745;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.63};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={820};
- AB_barrelLengths[]={28.7};
- };
- class B_45ACP_Ball
- {
- airFriction=-0.0007182;
- typicalSpeed=250;
- AB_caliber=0.452;
- AB_bulletLength=0.68;
- AB_bulletMass=230;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.195};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={230, 250, 285};
- AB_barrelLengths[]={4, 5, 9};
- };
-
- class TMR_B_762x51_M118LR : B_762x51_Ball
- {
- AB_caliber=0.308;
- AB_bulletLength=1.24;
- AB_bulletMass=175;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.505, 0.496, 0.485, 0.485, 0.485};
- AB_velocityBoundaries[]={853, 549, 549, 549};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={750, 780, 790, 794};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
-
- class RH_50_AE_Ball: BulletBase
- {
- AB_caliber=0.5;
- AB_bulletLength=1.110;
- AB_bulletMass=325;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.228};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={360, 398, 420};
- AB_barrelLengths[]={4, 6, 9};
- };
- class RH_454_Casull: BulletBase
- {
- AB_caliber=0.452;
- AB_bulletLength=0.895;
- AB_bulletMass=325;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.171};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={450, 490, 500};
- AB_barrelLengths[]={4, 7.5, 9};
- };
- class RH_32ACP: BulletBase
- {
- AB_caliber=0.3125;
- AB_bulletLength=0.610;
- AB_bulletMass=65;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.118};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={282, 300, 320};
- AB_barrelLengths[]={4, 5, 9};
- };
- class RH_45ACP: BulletBase
- {
- AB_caliber=0.452;
- AB_bulletLength=0.68;
- AB_bulletMass=230;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.195};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={230, 250, 285};
- AB_barrelLengths[]={4, 5, 9};
- };
- class RH_B_40SW: BulletBase
- {
- AB_caliber=0.4;
- AB_bulletLength=0.447;
- AB_bulletMass=135;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.105, 0.115, 0.120, 0.105};
- AB_velocityBoundaries[]={365, 305, 259};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={360, 380, 400};
- AB_barrelLengths[]={4, 6, 9};
- };
- class RH_44mag_ball: BulletBase
- {
- AB_caliber=0.429;
- AB_bulletLength=0.804;
- AB_bulletMass=200;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.172};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={360, 390, 420};
- AB_barrelLengths[]={4, 7.5, 9};
- };
- class RH_357mag_ball: BulletBase
- {
- AB_caliber=0.357;
- AB_bulletLength=0.541;
- AB_bulletMass=125;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.148};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={490, 510, 535};
- AB_barrelLengths[]={4, 6, 9};
- };
- class RH_762x25: BulletBase
- {
- AB_caliber=0.310;
- AB_bulletLength=0.5455;
- AB_bulletMass=86;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.17};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={360, 380, 400};
- AB_barrelLengths[]={4, 6, 9};
- };
- class RH_9x18_Ball: BulletBase
- {
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 350};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class RH_B_9x19_Ball: BulletBase
- {
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={340, 370, 400};
- AB_barrelLengths[]={4, 5, 9};
- };
- class RH_B_22LR_SD: BulletBase
- {
- AB_caliber=0.223;
- AB_bulletLength=0.45;
- AB_bulletMass=38;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.111};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={330, 340, 360};
- AB_barrelLengths[]={4, 6, 9};
- };
- class RH_57x28mm: BulletBase
- {
- AB_caliber=0.224;
- AB_bulletLength=0.495;
- AB_bulletMass=28;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.144};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={550, 625, 720};
- AB_barrelLengths[]={4, 6, 10.35};
- };
-
- class RH_B_6x35: BulletBase
- {
- AB_caliber=0.224;
- AB_bulletLength=0.445;
- AB_bulletMass=65;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.26};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={730, 750, 760};
- AB_barrelLengths[]={8, 10, 12};
- };
-
- class RH_556x45_B_Mk262 : B_556x45_Ball
- {
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=77;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.361};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={624, 816, 832, 838};
- AB_barrelLengths[]={7.5, 14.5, 18, 20};
- };
-
- class HLC_556NATO_SOST: BulletBase
- {
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=62;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.307};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={780, 886, 950};
- AB_barrelLengths[]={10, 15.5, 20};
- };
- class HLC_556NATO_SPR: BulletBase
- {
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=77;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.361};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={624, 816, 832, 838};
- AB_barrelLengths[]={7.5, 14.5, 18, 20};
- };
- class HLC_300Blackout_Ball: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.118;
- AB_bulletMass=147;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.398};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={559, 609, 625};
- AB_barrelLengths[]={6, 16, 20};
- };
- class HLC_300Blackout_SMK: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.489;
- AB_bulletMass=220;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.608};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={300, 320, 340};
- AB_barrelLengths[]={9, 16, 20};
- };
- class HLC_762x51_BTSub: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.340;
- AB_bulletMass=200;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.235};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={305, 325, 335, 340};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class HLC_762x54_ball: BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=152;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.4};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={700, 800, 820, 833};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class HLC_762x54_tracer: BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=149;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.395};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 750, 798, 800};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class HLC_303Brit_B: BulletBase
- {
- AB_caliber=0.311;
- AB_bulletLength=1.227;
- AB_bulletMass=174;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.499, 0.493, 0.48};
- AB_velocityBoundaries[]={671, 549};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={748, 761, 765};
- AB_barrelLengths[]={20, 24, 26};
- };
- class HLC_792x57_Ball: BulletBase
- {
- AB_caliber=0.318;
- AB_bulletLength=1.128;
- AB_bulletMass=196;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.315};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={785, 800, 815};
- AB_barrelLengths[]={20, 23.62, 26};
- };
- class FH_545x39_Ball: BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=52.9;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={780, 880, 920};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class FH_545x39_7u1: FH_545x39_Ball
- {
- AB_bulletMass=80;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_muzzleVelocities[]={260, 303, 320};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class HLC_9x19_Ball: BulletBase
- {
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={340, 370, 400};
- AB_barrelLengths[]={4, 5, 9};
- };
- class HLC_9x19_GoldDot: HLC_9x19_Ball
- {
- AB_muzzleVelocities[]={350, 380, 420};
- };
- class HLC_9x19_Subsonic: HLC_9x19_Ball
- {
- AB_muzzleVelocities[]={300, 320, 340};
- };
- class HLC_10mm_FMJ: HLC_9x19_Ball
- {
- AB_caliber=0.5;
- AB_bulletLength=0.764;
- AB_bulletMass=165;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.189};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={360, 400, 430};
- AB_barrelLengths[]={4, 4.61, 9};
- };
- class HLC_9x19_M882_SMG: HLC_9x19_Ball
- {
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={340, 370, 400};
- AB_barrelLengths[]={4, 5, 9};
- };
-
- class M_mas_545x39_Ball_7N6M : BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=52.9;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={780, 880, 920};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class M_mas_545x39_Ball_7T3M : BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=49.8;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={785, 883, 925};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class B_mas_556x45_Ball_Mk262 : B_556x45_Ball
- {
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=77;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.361};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={624, 816, 832, 838};
- AB_barrelLengths[]={7.5, 14.5, 18, 20};
- };
- class B_mas_9x18_Ball_57N181S : BulletBase
- {
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 350};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class B_mas_9x21p_Ball: BulletBase
- {
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={340, 370, 400};
- AB_barrelLengths[]={4, 5, 9};
- };
- class B_mas_9x21_Ball: BulletBase
- {
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={340, 370, 400};
- AB_barrelLengths[]={4, 5, 9};
- };
- class B_mas_9x21d_Ball: BulletBase
- {
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={210, 250, 285};
- AB_barrelLengths[]={4, 5, 9};
- };
- class B_mas_765x17_Ball: BulletBase
- {
- AB_caliber=0.3125;
- AB_bulletLength=0.610;
- AB_bulletMass=65;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.118};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={282, 300, 320};
- AB_barrelLengths[]={4, 5, 9};
- };
- class B_mas_762x39_Ball: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=123;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class B_mas_762x39_Ball_T: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=117;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class B_mas_762x51_Ball_M118LR : B_762x51_Ball
- {
- AB_caliber=0.308;
- AB_bulletLength=1.24;
- AB_bulletMass=175;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.505, 0.496, 0.485, 0.485, 0.485};
- AB_velocityBoundaries[]={853, 549, 549, 549};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={750, 780, 790, 794};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class B_mas_762x54_Ball : BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=152;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.4};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={700, 800, 820, 833};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class B_mas_762x54_Ball_T : BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=149;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.395};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 750, 798, 800};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class BWA3_B_762x51_Ball_LR : BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.24;
- AB_bulletMass=175;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.505, 0.496, 0.485, 0.485, 0.485};
- AB_velocityBoundaries[]={853, 549, 549, 549};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={750, 780, 790, 794};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class BWA3_B_762x51_Ball_SD : BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.24;
- AB_bulletMass=175;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={300, 340};
- AB_barrelLengths[]={16, 24};
- };
-
- class BWA3_B_46x30_Ball : BulletBase
- {
- AB_caliber=0.193;
- AB_bulletLength=0.512;
- AB_bulletMass=31;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.1455};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 720, 730, 740};
- AB_barrelLengths[]={4, 7, 9, 12};
- };
-
- class Trixie_338_Ball : BulletBase
- {
- AB_caliber=0.338;
- AB_bulletLength=1.70;
- AB_bulletMass=300;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.381};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={820, 826, 830};
- AB_barrelLengths[]={24, 26.5, 28};
- };
- class Trixie_303_Ball : BulletBase
- {
- AB_caliber=0.311;
- AB_bulletLength=1.227;
- AB_bulletMass=174;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.499, 0.493, 0.48};
- AB_velocityBoundaries[]={671, 549};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={748, 761, 765};
- AB_barrelLengths[]={20, 24, 26};
- };
-
- class rhs_ammo_556x45_Mk318_Ball : BulletBase
- {
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=62;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.307};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={780, 886, 950};
- AB_barrelLengths[]={10, 15.5, 20};
- };
- class rhs_ammo_556x45_Mk262_Ball : BulletBase
- {
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=77;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.361};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={624, 816, 832, 838};
- AB_barrelLengths[]={7.5, 14.5, 18, 20};
- };
- class rhsammo_762x51_Ball : BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class rhs_B_545x39_Ball : BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=52.9;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={780, 880, 920};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class rhs_B_545x39_Ball_Tracer_Green : BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=49.8;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={785, 883, 925};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class rhs_B_762x54_Ball : BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=152;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.4};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={700, 800, 820, 833};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class rhs_B_762x54_Ball_Tracer_Green : BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=149;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.395};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 750, 798, 800};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class rhs_B_762x39_Ball : BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=123;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class rhs_B_762x39_Tracer : BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=117;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
-
- class R3F_9x19_Ball: BulletBase
- {
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={340, 370, 400};
- AB_barrelLengths[]={4, 5, 9};
- };
- class R3F_556x45_Ball: BulletBase
- {
- AB_caliber=0.224;
- AB_bulletLength=0.906;
- AB_bulletMass=62;
- AB_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75};
- AB_ballisticCoefficients[]={0.151};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900};
- AB_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0};
- };
- class R3F_762x51_Ball: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class R3F_762x51_Ball2: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.24;
- AB_bulletMass=175;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.505, 0.496, 0.485, 0.485, 0.485};
- AB_velocityBoundaries[]={853, 549, 549, 549};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={750, 780, 790, 794};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class R3F_127x99_Ball: BulletBase
- {
- AB_caliber=0.510;
- AB_bulletLength=2.310;
- AB_bulletMass=647;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.670};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={853};
- AB_barrelLengths[]={29};
- };
- class R3F_127x99_Ball2: BulletBase
- {
- AB_caliber=0.510;
- AB_bulletLength=2.310;
- AB_bulletMass=647;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.670};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={853};
- AB_barrelLengths[]={29};
- };
-
- class CUP_B_545x39_Ball: BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=52.9;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={780, 880, 920};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class CUP_B_545x39_Ball_Tracer_Green: BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=49.8;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={785, 883, 925};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class CUP_B_545x39_Ball_Tracer_Red: BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=49.8;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={785, 883, 925};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class CUP_B_545x39_Ball_Tracer_White: BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=49.8;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={785, 883, 925};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase
- {
- AB_caliber=0.220;
- AB_bulletLength=0.85;
- AB_bulletMass=49.8;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.168};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=7;
- AB_muzzleVelocities[]={785, 883, 925};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class CUP_B_762x39_Ball: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=123;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class CUP_B_762x39_Ball_Tracer_Green: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=117;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class B_762x39mm_KLT: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=123;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={650, 716, 750};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class CUP_B_9x18_Ball: BulletBase
- {
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 350};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class CUP_B_9x18_Ball_Tracer_Green: BulletBase
- {
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 350};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class CUP_B_9x18_Ball_Tracer_Red: BulletBase
- {
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 350};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase
- {
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 350};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class CUP_B_9x18_Ball_White_Tracer: BulletBase
- {
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 350};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class CUP_B_9x19_Ball: BulletBase
- {
- AB_caliber=0.355;
- AB_bulletLength=0.610;
- AB_bulletMass=124;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.165};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={340, 370, 400};
- AB_barrelLengths[]={4, 5, 9};
- };
- class CUP_B_762x51_noTracer: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class CUP_B_762x51_Red_Tracer_3RndBurst: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class CUP_B_762x51_White_Tracer_3RndBurst: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class CUP_B_303_Ball: BulletBase
- {
- AB_caliber=0.311;
- AB_bulletLength=1.227;
- AB_bulletMass=174;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.499, 0.493, 0.48};
- AB_velocityBoundaries[]={671, 549};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={748, 761, 765};
- AB_barrelLengths[]={20, 24, 26};
- };
- class CUP_B_127x107_Ball_Green_Tracer: BulletBase
- {
- AB_caliber=0.511;
- AB_bulletLength=2.520;
- AB_bulletMass=745;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.63};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={820};
- AB_barrelLengths[]={28.7};
- };
- class CUP_B_127x108_Ball_Green_Tracer: BulletBase
- {
- AB_caliber=0.511;
- AB_bulletLength=2.520;
- AB_bulletMass=745;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.63};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={820};
- AB_barrelLengths[]={28.7};
- };
- class CUP_B_762x54_Ball_White_Tracer: BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=149;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.395};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 750, 798, 800};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class CUP_B_762x54_Ball_Red_Tracer: BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=149;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.395};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 750, 798, 800};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class CUP_B_762x54_Ball_Green_Tracer: BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=149;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.395};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 750, 798, 800};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase
- {
- AB_caliber=0.312;
- AB_bulletLength=1.14;
- AB_bulletMass=149;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.395};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={680, 750, 798, 800};
- AB_barrelLengths[]={16, 20, 24, 26};
- };
- class CUP_B_9x39_SP5: BulletBase
- {
- AB_caliber=0.364;
- AB_bulletLength=1.24;
- AB_bulletMass=250;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.275};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=1;
- AB_muzzleVelocities[]={280, 300, 320};
- AB_barrelLengths[]={10, 16.3, 20};
- };
- class CUP_B_762x51_Tracer_Green: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class CUP_B_762x51_Tracer_Red: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class CUP_B_762x51_Tracer_Yellow: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class CUP_B_762x51_Tracer_White: BulletBase
- {
- AB_caliber=0.308;
- AB_bulletLength=1.14;
- AB_bulletMass=146;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.2};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={700, 800, 820, 833, 845};
- AB_barrelLengths[]={10, 16, 20, 24, 26};
- };
- class B_127x107_Ball: BulletBase
- {
- AB_caliber=0.511;
- AB_bulletLength=2.520;
- AB_bulletMass=745;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.63};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={820};
- AB_barrelLengths[]={28.7};
- };
- class CUP_B_9x18_SD: BulletBase
- {
- AB_caliber=0.365;
- AB_bulletLength=0.610;
- AB_bulletMass=92.6;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.125};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={298, 330, 340};
- AB_barrelLengths[]={3.8, 5, 9};
- };
- class CUP_B_765x17_Ball: BulletBase
- {
- AB_caliber=0.3125;
- AB_bulletLength=0.610;
- AB_bulletMass=65;
- AB_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
- AB_ballisticCoefficients[]={0.118};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={282, 300, 320};
- AB_barrelLengths[]={4, 5, 9};
- };
- class CUP_B_145x115_AP_Green_Tracer: BulletBase
- {
- AB_caliber=0.586;
- AB_bulletLength=2.00;
- AB_bulletMass=1010;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.620};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={1000};
- AB_barrelLengths[]={53};
- };
- class CUP_B_127x99_Ball_White_Tracer: BulletBase
- {
- AB_caliber=0.510;
- AB_bulletLength=2.310;
- AB_bulletMass=647;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.670};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ASM";
- AB_dragModel=1;
- AB_muzzleVelocities[]={853};
- AB_barrelLengths[]={29};
- };
- class CUP_B_86x70_Ball_noTracer: BulletBase
- {
- AB_caliber=0.338;
- AB_bulletLength=1.70;
- AB_bulletMass=300;
- AB_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
- AB_ballisticCoefficients[]={0.381};
- AB_velocityBoundaries[]={};
- AB_standardAtmosphere="ICAO";
- AB_dragModel=7;
- AB_muzzleVelocities[]={820, 826, 830};
- AB_barrelLengths[]={24, 26.5, 28};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgFunctions.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgFunctions.h
deleted file mode 100644
index c35241da53..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgFunctions.h
+++ /dev/null
@@ -1,30 +0,0 @@
-class cfgFunctions {
- class cse_AB_ballistics
- {
- class advancedBallistics {
- file = "cse\cse_sys_ballistics\advancedBallistics\functions";
- class adjust_parallax { recompile = 1; };
- class adjust_turret { recompile = 1; };
- class advanced_ballistics { recompile = 1; };
- class advanced_ballistics_extension { recompile = 1; };
- class ammo_temperature_muzzle_velocity { recompile = 1; };
- class apply_turret_adjustments { recompile = 1; };
- class barrel_length_muzzle_velocity { recompile = 1; };
- class calculate_air_density { recompile = 1; };
- class calculate_atmospheric_correction { recompile = 1; };
- class calculate_hellmann_exponent { recompile = 1; };
- class calculate_retardation { recompile = 1; };
- class calculate_roughness_length { recompile = 1; };
- class calculate_stability_factor { recompile = 1; };
- class calculate_wind_speed { recompile = 1; };
- class climate_simulation { recompile = 1; };
- class display_protractor { recompile = 1; };
- class display_wind_info { recompile = 1; };
- class get_humidity_at_height { recompile = 1; };
- class get_temperature_at_height { recompile = 1; };
- class initialize_terrain_extension { recompile = 1; };
- class mirage_simulation { recompile = 1; };
- class synchronize_scope_zero { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgMagazines.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgMagazines.h
deleted file mode 100644
index b1383e2d79..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgMagazines.h
+++ /dev/null
@@ -1,165 +0,0 @@
-class CfgMagazines
-{
- class 7Rnd_408_Mag;
- class 16Rnd_9x21_Mag;
- class 30Rnd_556x45_Stanag;
- class 30Rnd_556x45_Stanag_Tracer_Red;
- class 200Rnd_65x39_cased_Box;
- class 200Rnd_65x39_cased_Box_Tracer;
- class 10Rnd_762x51_Mag;
- class 20Rnd_762x51_Mag;
- class 100Rnd_127x99_mag;
- class 8Rnd_mas_9x18_Mag: 16Rnd_9x21_Mag
- {
- ammo="B_mas_9x18_Ball_57N181S";
- count=8;
- displayName="8rnd 9mm Mag";
- picture="\A3\weapons_f\data\ui\M_16Rnd_9x21_CA.paa";
- descriptionshort="Caliber: 9x18 mm Makarov Rounds: 8 Used in: Makarov";
- };
- class 64Rnd_mas_9x18_mag: 30Rnd_556x45_Stanag
- {
- ammo="B_mas_9x18_Ball_57N181S";
- count=64;
- displayName="64rnds 9x18 Bizon";
- picture="\mas_us_rifle\ui\m_bizon_ca.paa";
- descriptionshort="Caliber: 9x18 mm cal Rounds: 64 Used in: Bizon";
- };
- class 30Rnd_mas_545x39_mag: 30Rnd_556x45_Stanag
- {
- ammo="M_mas_545x39_Ball_7N6M";
- count=30;
- descriptionshort="Caliber: 5.45x39 mm Rounds: 30 Used in: AK74M,AKS74,AKSU";
- displayname="30rnd 5.45mm Mag";
- };
- class 30Rnd_mas_545x39_T_mag: 30Rnd_556x45_Stanag_Tracer_Red
- {
- ammo="M_mas_545x39_Ball_7T3M";
- count=30;
- descriptionshort="Caliber: 5.45x39 mm Tracer Rounds: 30 Used in: AK74M,AKS74,AKSU";
- displayname="30rnd 5.45mm Mag(Tracer)";
- };
- class 100Rnd_mas_545x39_mag: 200Rnd_65x39_cased_Box
- {
- ammo="M_mas_545x39_Ball_7N6M";
- count=100;
- descriptionshort="Caliber: 5.45x39 mm Rounds: 100 Used in: RPK74";
- displayname="100rnd 5.45mm Drum";
- mass=25;
- };
- class 100Rnd_mas_545x39_T_mag: 200Rnd_65x39_cased_Box_Tracer
- {
- ammo="M_mas_545x39_Ball_7T3M";
- count=100;
- descriptionshort="Caliber: 5.45x39 mm Tracer Rounds: 100 Used in: RPK74";
- displayname="100rnd 5.45mm Drum(Tracer)";
- mass=25;
- };
- class 30Rnd_mas_556x45_Mk262_Stanag: 30Rnd_556x45_Stanag
- {
- ammo="B_mas_556x45_Ball_Mk262";
- count=30;
- descriptionshort="Caliber: 5.56x45 mm STANAG Mk262 Rounds: 30 Used in: M4,HK416,M16,SCAR-L";
- displayname="30rnd 5.56mm STANAG(Mk262)";
- };
- class 20Rnd_mas_762x51_M118LR_Stanag: 30Rnd_556x45_Stanag
- {
- ammo="B_mas_762x51_Ball_M118LR";
- count=20;
- descriptionshort="Caliber: 7.62x51 mm STANAG M118LR Rounds: 20 Used in: HK417,SR25,SCAR-H,EBR";
- displayname="20rnd 7.62mm Mag(M118LR)";
- picture="\A3\weapons_f\data\UI\M_20Rnd_762x51_CA.paa";
- };
- class 5Rnd_mas_762x51_M118LR_Stanag: 30Rnd_556x45_Stanag
- {
- ammo="B_mas_762x51_Ball_M118LR";
- count=5;
- descriptionshort="Caliber: 7.62x51 mm STANAG M118LR Rounds: 5 Used in: M24";
- displayname="5rnd 7.62mm Mag(M118LR)";
- picture="\A3\weapons_f\data\UI\m_M24_CA.paa";
- };
-
- class Trixie_30x556_Mk262_Mag: 30Rnd_556x45_Stanag
- {
- scope=2;
- author="Trixie";
- count=30;
- descriptionshort="Caliber: 5.56x45mm Rounds: 30 Used in: Mk12 SPR";
- displayname="30Rnd Mk262 5.56x45mm";
- ammo="cse_AB_556x45_Ball_Mk262";
- lastroundstracer=0;
- tracersevery=0;
- };
- class Trixie_20x762_M118LR_Mag: 20Rnd_762x51_Mag
- {
- scope=2;
- author="Trixie";
- count=20;
- descriptionshort="Caliber: 7.62x51mm Rounds: 20 Used in: M110 SASS";
- displayname="20Rnd 7.62x51mm M118LR";
- ammo="cse_AB_762x51_Ball_M118LR";
- picture="\Trixie_recon\UI\20x762_mag.paa";
- lastroundstracer=0;
- tracersevery=0;
- };
- class Trixie_10x762_M118LR_Mag: 10Rnd_762x51_Mag
- {
- scope=2;
- author="Trixie";
- count=10;
- descriptionshort="Caliber: 7.62x51mm Rounds: 10 Used in: CZ750";
- displayname="10Rnd 7.62x51mm M118LR";
- ammo="cse_AB_762x51_Ball_M118LR";
- picture="\Trixie_recon\UI\5x762_mag.paa";
- lastroundstracer=0;
- tracersevery=0;
- };
- class Trixie_5x762_M118LR_Mag: 10Rnd_762x51_Mag
- {
- scope=2;
- author="Trixie";
- count=5;
- descriptionshort="Caliber: 7.62x51mm Rounds: 5 Used in: M40A3";
- displayname="5Rnd 7.62x51mm M118LR";
- ammo="cse_AB_762x51_Ball_M118LR";
- picture="\Trixie_recon\UI\5x762_mag.paa";
- lastroundstracer=0;
- tracersevery=0;
- };
- class Trixie_10x127_Mag: 100Rnd_127x99_mag
- {
- scope=2;
- author="Trixie";
- count=10;
- descriptionshort="Caliber: 12.7x99mm Rounds: 10 Used in: Barret M107";
- displayname="10Rnd 12.7x99mm";
- ammo="B_127x99_Ball";
- picture="\Trixie_recon\UI\50BMGx10_mag.paa";
- lastroundstracer=0;
- tracersevery=0;
- };
- class Trixie_10x105_Mag: 100Rnd_127x99_mag
- {
- scope=2;
- author="Trixie";
- count=10;
- descriptionshort="Caliber: .416 Barrett Rounds: 10 Used in: Barret M107";
- displayname="10Rnd 10.5x83mm";
- ammo="AB_106x83mm_Ball";
- picture="\Trixie_recon\UI\50BMGx10_mag.paa";
- lastroundstracer=0;
- tracersevery=0;
- };
- class Trixie_10x127_Amax_Mag: 100Rnd_127x99_mag
- {
- scope=2;
- author="Trixie";
- count=10;
- descriptionshort="Caliber: .50 BMG 750 gr A-MAX Rounds: 10 Used in: Barret M107";
- displayname="10Rnd 12.7x99mm A-MAX";
- ammo="AB_127x99_Ball_AMAX";
- picture="\Trixie_recon\UI\50BMGx10_mag.paa";
- lastroundstracer=0;
- tracersevery=0;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgSounds.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgSounds.h
deleted file mode 100644
index d6c62fc98c..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgSounds.h
+++ /dev/null
@@ -1,9 +0,0 @@
-class CfgSounds
-{
- class cse_AB_scope_click
- {
- name="cse_AB_scope_click";
- sound[]={"cse\cse_sys_ballistics\advancedballistics\sound\scope_click.wav",1,1};
- titles[]={};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgVehicles.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgVehicles.h
deleted file mode 100644
index 9118494399..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgVehicles.h
+++ /dev/null
@@ -1,167 +0,0 @@
-class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class cse_AB_moduleAdvancedBallistics: Module_F {
- scope = 2;
- displayName = "Advanced Ballistics [CSE]";
- icon = "\cse\cse_main\data\cse_backblast_module.paa";
- category = "cseModules";
- function = "cse_fnc_initalizeModule_F";
- author = "Ruthberg";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
-
- class FORCE_CLIENT_SETTINGS_OVERRIDE {
- displayName = "Force Client Settings override";
- description = "Force Client Settings override";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class WIND_ENABLED {
- displayName = "Wind drift";
- description = "Add wind drift";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class SPIN_DRIFT_ENABLED {
- displayName = "Spin drift";
- description = "add spin drift";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class CORIOLIS_ENABLED {
- displayName = "Horizontal Coriolis drift";
- description = "Horizontal Coriolis drift";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class EOETVOES_ENABLED {
- displayName = "Vertical Coriolis drift";
- description = "Vertical Coriolis drift";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class ADVANCED_AIR_DRAG_ENABLED {
- displayName = "Advanced air drag";
- description = "Enabled the advanced air drag model (only availible with compatible 3rd party ammunition)";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class ATMOSPHERIC_DENSITY_SIMULATION_ENABLED {
- displayName = "Ambient air density ";
- description = "The bullets ability to cut through air becomes affected by the ambient air density";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class TRANSONIC_REGION_ENABLED {
- displayName = "Dispersion beyond supersonic";
- description = "Adds dispersion beyond supersonic flight of rifle bullets";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class MIL_TURRETS_ENABLED {
- displayName = "Zero scope in 1/10 mil";
- description = "Adds the ability to zero your scope in 1/10 Mil steps";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class AMMO_TEMPERATURE_ENABLED {
- displayName = "Ammo temperature";
- description = "Muzzle velocity changes with ammo temperature";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class DISABLED_IN_FULL_AUTO_MODE {
- displayName = "Disabled during full auto";
- description = "Disables the advanced ballistics during full auto fire";
- typeName = "BOOL";
- defaultValue = 0;
- };
-
- class BULLET_TRACE_ENABLED {
- displayName = "Bullet trace effect";
- description = "Adds a bullet trace effect to high caliber bullets";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class MIRAGE_ENABLED {
- displayName = "Mirage and scope parallax";
- description = "Adds mirage and scope parallax adjustment";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class BARREL_LENGTH_INFLUENCE {
- displayName = "Barrel length dependent";
- description = "Enables barrel length dependent muzzle velocity";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class VEHICLE_GUNNER_ENABLED {
- displayName = "Vehicle Gunners";
- description = "Enables the advanced ballistics for rounds fired as vehicle gunner";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class EXTENSIONS_ENABLED {
- displayName = "Extension allowed";
- description = "Allows the use of the DLL extension";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class INIT_MESSAGE_ENABLED {
- displayName = "Initialization message";
- description = "Prints a system chat message once the terrain initialization is finished";
- typeName = "BOOL";
- defaultValue = 0;
- };
-
- class ONLY_ACTIVE_FOR_LOCAL_PLAYER {
- displayName = "Local only";
- description = "Disables the advanced ballistics for bullets coming from other players";
- typeName = "BOOL";
- defaultValue = 0;
- };
-
- class ONLY_ACTIVE_FOR_PLAYER_GROUP {
- displayName = "Group only";
- description = "Disables the advanced ballistics for bullets coming from players in other groups";
- typeName = "BOOL";
- defaultValue = 0;
- };
-
- class DISABLED_BY_DEFAULT {
- displayName = "Disabled by default";
- description = "Allows you to enable the advanced ballistics selectively in the unit initialization";
- typeName = "BOOL";
- defaultValue = 0;
- };
-
- class PRECISION {
- displayName = "Calculation precision";
- description = "Allows to reduces the calculation precision to avoid frame drops (1 - maximum precision, 2 - medium precision, 3 - minimal precision)";
- typeName = "NUMBER";
- defaultValue = 1;
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgWeapons.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgWeapons.h
deleted file mode 100644
index c7c976f3c4..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/CfgWeapons.h
+++ /dev/null
@@ -1,1598 +0,0 @@
-class CfgWeapons
-{
- class MGun;
- class MGunCore;
- class Pistol_Base_F;
- class Rifle_Base_F;
- class Rifle_Long_Base_F;
- class hgun_P07_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=4;
- };
- class hgun_Rook40_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=4.4;
- };
- class hgun_Pistol_heavy_01_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=4.5;
- };
- class hgun_Pistol_heavy_02_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=3;
- };
- class hgun_ACPC2_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=5;
- };
- class hgun_PDW2000_F
- {
- AB_barrelTwist=9;
- AB_barrelLength=7;
- };
- class arifle_Katiba_F
- {
- AB_barrelTwist=8;
- AB_barrelLength=228.7;
- };
- class arifle_Katiba_C_F
- {
- AB_barrelTwist=8;
- AB_barrelLength=26.8;
- };
- class arifle_Katiba_GL_F
- {
- AB_barrelTwist=8;
- AB_barrelLength=28.7;
- };
- class arifle_MX_F
- {
- AB_barrelTwist=9;
- AB_barrelLength=14.5;
- };
- class arifle_MX_GL_F
- {
- AB_barrelTwist=9;
- AB_barrelLength=14.5;
- };
- class arifle_MX_SW_F
- {
- AB_barrelTwist=9;
- AB_barrelLength=16.0;
- };
- class arifle_MXC_F
- {
- AB_barrelTwist=8;
- AB_barrelLength=10.5;
- };
- class arifle_MXM_F
- {
- AB_barrelTwist=9;
- AB_barrelLength=18;
- };
- class arifle_SDAR_F
- {
- AB_barrelTwist=11.25;
- AB_barrelLength=18;
- };
- class SMG_02_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=7.7;
- };
- class arifle_TRG20_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=15;
- };
- class arifle_TRG21_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18.1;
- };
- class LMG_Zafir_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=18.1;
- };
- class arifle_Mk20_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=17.4;
- };
- class arifle_Mk20C_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=16;
- };
- class arifle_Mk20_GL_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=16;
- };
- class SMG_01_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=5.5;
- };
- class srifle_DMR_01_F
- {
- AB_barrelTwist=9.5;
- AB_barrelLength=24;
- };
- class srifle_EBR_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=24;
- };
- class LMG_Mk200_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=12.5;
- };
- class srifle_LRR_F
- {
- AB_barrelTwist=13;
- AB_barrelLength=29;
- };
- class srifle_GM6_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=43.3;
- };
- class HMG_M2
- {
- AB_barrelTwist=12;
- AB_barrelLength=45;
- };
-
- class RH_deagle : Pistol_Base_F
- {
- AB_barrelTwist=19;
- AB_barrelLength=6;
- };
- class RH_sw659 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=7.44;
- };
- class RH_usp : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=4.41;
- };
- class RH_uspm : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=6;
- };
- class RH_mak : Pistol_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=3.68;
- };
- class RH_m1911 : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=5;
- };
- class RH_kimber : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=5;
- };
- class RH_m9 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.9;
- };
- class RH_vz61 : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=4.5;
- };
- class RH_tec9 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=5;
- };
- class RH_muzi : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=5;
- };
- class RH_g18 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.49;
- };
- class RH_g17 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.49;
- };
- class RH_tt33 : Pistol_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=4.6;
- };
- class RH_mk2 : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=4;
- };
- class RH_p226 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.4;
- };
- class RH_g19 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4;
- };
- class RH_gsh18 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.1;
- };
- class RH_mateba : Pistol_Base_F
- {
- AB_barrelTwist=14;
- AB_barrelLength=6;
- };
- class RH_python : Pistol_Base_F
- {
- AB_barrelTwist=14;
- AB_barrelLength=6;
- };
- class RH_bull : Pistol_Base_F
- {
- AB_barrelTwist=24;
- AB_barrelLength=6.5;
- };
- class RH_ttracker : Pistol_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=4;
- };
- class RH_mp412 : Pistol_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=6;
- };
- class RH_fnp45 : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=4.5;
- };
- class RH_fn57 : Pistol_Base_F
- {
- AB_barrelTwist=9.1;
- AB_barrelLength=4.8;
- };
- class RH_vp70 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.6;
- };
- class RH_cz75 : Pistol_Base_F
- {
- AB_barrelTwist=9.7;
- AB_barrelLength=4.7;
- };
-
- class RH_PDW : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=10;
- };
-
- class RH_ar10 : Rifle_Base_F
- {
- AB_barrelTwist=11.25;
- AB_barrelLength=20.8;
- };
- class RH_m4 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14.5;
- };
- class RH_M4sbr : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=9;
- };
- class RH_M16a1 : Rifle_Base_F
- {
- AB_barrelTwist=14;
- AB_barrelLength=20;
- };
- class RH_M16A2 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class RH_M16A3 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class RH_M16A4 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class RH_Mk12mod1 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18;
- };
- class RH_SAMR : Rifle_Base_F
- {
- AB_barrelTwist=7.7;
- AB_barrelLength=20;
- };
-
- class hlc_rifle_ak74 : Rifle_Base_F
- {
- AB_barrelTwist=7.87;
- AB_barrelLength=16.3;
- };
- class hlc_rifle_aks74u : Rifle_Base_F
- {
- AB_barrelTwist=6.3;
- AB_barrelLength=8.3;
- };
- class hlc_rifle_ak47 : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=16.3;
- };
- class hlc_rifle_akm : Rifle_Base_F
- {
- AB_barrelTwist=7.87;
- AB_barrelLength=16.3;
- };
- class hlc_rifle_rpk : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=23.2;
- };
- class hlc_rifle_aek971 : Rifle_Base_F
- {
- AB_barrelTwist=9.5;
- AB_barrelLength=17;
- };
- class hlc_rifle_saiga12k : Rifle_Base_F
- {
- AB_barrelTwist=0;
- cse_AB_twistDirection=0;
- AB_barrelLength=16.9;
- };
- class hlc_ar15_base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=11.5;
- };
- class hlc_rifle_bcmjack : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14.5;
- };
- class hlc_rifle_Bushmaster300 : Rifle_Base_F
- {
- AB_barrelTwist=8;
- AB_barrelLength=16;
- };
- class hlc_rifle_SAMR : Rifle_Base_F
- {
- AB_barrelTwist=9;
- AB_barrelLength=16;
- };
- class hlc_rifle_honeybase : Rifle_Base_F
- {
- AB_barrelTwist=8;
- AB_barrelLength=6;
- };
- class hlc_rifle_SLRchopmod : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21;
- };
- class hlc_rifle_LAR : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21;
- };
- class hlc_rifle_c1A1 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21.7;
- };
- class hlc_rifle_FAL5061 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=18;
- };
- class hlc_rifle_STG58F : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21;
- };
- class hlc_rifle_SLR : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21.7;
- };
- class hlc_rifle_falosw : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=13;
- };
- class hlc_rifle_psg1 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=25.6;
- };
- class hlc_rifle_g3sg1 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=17.7;
- };
- class hlc_rifle_hk51 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=8.31;
- };
- class hlc_rifle_hk53 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=8.31;
- };
- class hlc_rifle_g3a3 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=17.7;
- };
- class hlc_M14_base : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=22;
- };
- class hlc_rifle_m14sopmod : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=18;
- };
- class hlc_lmg_M60E4 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=17;
- };
- class hlc_lmg_m60 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=22;
- };
-
- class hlc_smg_mp5k_PDW : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=4.5;
- };
- class hlc_smg_mp5a2 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=8.9;
- };
- class hlc_smg_mp5a4 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=8.9;
- };
- class hlc_smg_mp5n : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=8.9;
- };
- class hlc_smg_mp5sd5 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=5.7;
- };
- class hlc_smg_mp5sd6 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=5.7;
- };
- class hlc_smg_9mmar : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=8.9;
- };
- class hlc_smg_mp510 : Rifle_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=8.9;
- };
- class hlc_smg_mp5a3 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=8.9;
- };
-
- class hgun_mas_usp_F: Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=4.41;
- };
- class hgun_mas_m23_F: Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=5.87;
- };
- class hgun_mas_acp_F: Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=5.03;
- };
- class hgun_mas_m9_F: Pistol_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=4.9;
- };
- class hgun_mas_bhp_F: Pistol_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=4.7;
- };
- class hgun_mas_glock_F: Pistol_Base_F
- {
- AB_barrelTwist=9.84;
- AB_barrelLength=4.48;
- };
- class hgun_mas_glocksf_F: Pistol_Base_F
- {
- AB_barrelTwist=15.75;
- AB_barrelLength=4.60;
- };
- class hgun_mas_grach_F: Pistol_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=4.4;
- };
- class hgun_mas_mak_F: Pistol_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=3.68;
- };
- class hgun_mas_sa61_F: Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=4.5;
- };
- class hgun_mas_uzi_F: Pistol_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=5.28;
- };
- class arifle_mas_mk16 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=13.8;
- };
- class arifle_mas_mk16_l : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18;
- };
- class arifle_mas_mk17 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=16;
- };
- class srifle_mas_m110 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=20;
- magazines[]=
- {
- "20Rnd_mas_762x51_M118LR_Stanag",
- "20Rnd_mas_762x51_Stanag",
- "20Rnd_mas_762x51_T_Stanag",
- "20Rnd_762x51_Mag"
- };
- };
- class arifle_mas_ak_74m : Rifle_Base_F
- {
- AB_barrelTwist=7.87;
- AB_barrelLength=16.34;
- };
- class arifle_mas_ak_74m_gl : Rifle_Base_F
- {
- AB_barrelTwist=7.87;
- AB_barrelLength=16.34;
- };
- class srifle_mas_svd : Rifle_Base_F
- {
- AB_barrelTwist=9.4;
- AB_barrelLength=24.4;
- };
- class srifle_mas_m91 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=29;
- };
- class srifle_mas_ksvk : Rifle_Base_F
- {
- AB_barrelTwist=18;
- AB_barrelLength=39.37;
- };
- class LMG_mas_rpk_F : Rifle_Base_F
- {
- AB_barrelTwist=7.68;
- AB_barrelLength=23.2;
- };
- class LMG_mas_pkm_F : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=25.4;
- };
- class arifle_mas_aks74u : Rifle_Base_F
- {
- AB_barrelTwist=6.3;
- AB_barrelLength=8.3;
- };
- class arifle_mas_bizon : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=9.1;
- };
- class arifle_mas_saiga : Rifle_Base_F
- {
- AB_barrelTwist=0;
- cse_AB_twistDirection=0;
- AB_barrelLength=16.93;
- };
- class arifle_mas_hk416 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14.5;
- };
- class arifle_mas_hk416_gl : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14.5;
- };
- class arifle_mas_hk416c : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=9.0;
- };
- class arifle_mas_hk416_m203c : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=9.0;
- };
- class arifle_mas_hk417c : Rifle_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=13;
- };
- class arifle_mas_m4 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14.5;
- };
- class arifle_mas_m4c : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=10.3;
- };
- class arifle_mas_l119 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=16;
- };
- class arifle_mas_l119_gl : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=16;
- };
- class arifle_mas_l119_m203 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=16;
- };
- class arifle_mas_m16 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class arifle_mas_m16_gl : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class srifle_mas_hk417 : Rifle_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=16.5;
- };
- class srifle_mas_sr25 : Rifle_Base_F
- {
- AB_barrelTwist=11.25;
- AB_barrelLength=24;
- magazines[]=
- {
- "20Rnd_mas_762x51_M118LR_Stanag",
- "20Rnd_mas_762x51_Stanag",
- "20Rnd_mas_762x51_T_Stanag",
- "20Rnd_762x51_Mag"
- };
- };
- class srifle_mas_ebr : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=18;
- magazines[]=
- {
- "20Rnd_mas_762x51_M118LR_Stanag",
- "20Rnd_mas_762x51_Stanag",
- "20Rnd_mas_762x51_T_Stanag",
- "20Rnd_762x51_Mag"
- };
- };
- class srifle_mas_m24 : Rifle_Base_F
- {
- AB_barrelTwist=11.25;
- AB_barrelLength=24;
- magazines[]=
- {
- "5Rnd_mas_762x51_M118LR_Stanag",
- "5Rnd_mas_762x51_Stanag",
- "5Rnd_mas_762x51_T_Stanag"
- };
- };
- class arifle_mas_mp5 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=8.9;
- };
- class arifle_mas_mp5sd : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=5.7;
- };
- class srifle_mas_m107 : Rifle_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=29;
- };
- class LMG_mas_M249_F : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=16.3;
- };
- class LMG_mas_M249a_F : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18;
- };
- class LMG_mas_mk48_F : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=19.75;
- };
- class LMG_mas_m240_F : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=24.8;
- };
- class LMG_mas_mg3_F : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=22.2;
- };
- class arifle_mas_g3 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=17.7;
- };
- class arifle_mas_g3_m203 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=17.7;
- };
- class arifle_mas_fal : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21;
- };
- class arifle_mas_fal_m203 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21;
- };
- class arifle_mas_m1014 : Rifle_Base_F
- {
- AB_barrelTwist=0;
- cse_AB_twistDirection=0;
- AB_barrelLength=18.5;
- };
-
- class BWA3_P8 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.25;
- };
- class BWA3_MP7 : Pistol_Base_F
- {
- AB_barrelTwist=6.3;
- AB_barrelLength=7.1;
- };
- class BWA3_G36 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18.9;
- };
- class BWA3_G36K : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=12.5;
- };
- class BWA3_G28_Standard : Rifle_Long_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=16.5;
- };
- class BWA3_G27 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=16;
- };
- class BWA3_MG4 : Rifle_Long_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18.9;
- };
- class BWA3_MG5 : Rifle_Long_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21.6;
- };
- class BWA3_G82 : Rifle_Long_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=29;
- };
-
- class Trixie_L131A1 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.5;
- };
- class Trixie_XM8_Carbine : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=12.5;
- };
- class Trixie_XM8_Compact : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=9;
- };
- class Trixie_XM8_SAW : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class Trixie_XM8_SAW_NB : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class Trixie_XM8_DMR : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class Trixie_XM8_DMR_NB : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class L129A1_base : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=16;
- };
- class Trixie_Enfield : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=25.2;
- };
- class Trixie_CZ550_Rail : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=23.622;
- };
- class Trixie_FNFAL_Rail : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21;
- };
-
- class Trixie_M110 : Rifle_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=20;
- magazines[]=
- {
- "Trixie_20x762_M118LR_Mag",
- "Trixie_20x762_Mag",
- "Trixie_10x762_M118LR_Mag",
- "Trixie_10x762_Mag"
- };
- };
- class Trixie_MK12 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18;
- magazines[]=
- {
- "Trixie_30x556_Mk262_Mag",
- "30Rnd_556x45_Stanag",
- "30Rnd_556x45_Stanag_Tracer_Red"
- };
- };
- class Trixie_LM308MWS : Rifle_Base_F
- {
- AB_barrelTwist=11.25;
- AB_barrelLength=16;
- magazines[]=
- {
- "Trixie_20x762_M118LR_Mag",
- "Trixie_20x762_Mag",
- "Trixie_10x762_M118LR_Mag",
- "Trixie_10x762_Mag"
- };
- };
- class Trixie_M14DMR : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=22;
- magazines[]=
- {
- "Trixie_20x762_M118LR_Mag",
- "Trixie_20x762_Mag"
- };
- };
- class Trixie_M14DMR_NG_Black_Short : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=18;
- };
- class Trixie_M14DMR_NG_Short : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=18;
- };
- class Trixie_M14 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=22;
- };
- class Trixie_M40A3 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=24;
- magazines[]=
- {
- "Trixie_5x762_M118LR_Mag",
- "Trixie_5x762_Mag"
- };
- };
- class Trixie_CZ750 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=26;
- magazines[]=
- {
- "Trixie_10x762_M118LR_Mag",
- "Trixie_10x762_Mag"
- };
- };
- class Trixie_M24 : Rifle_Base_F
- {
- AB_barrelTwist=11.25;
- AB_barrelLength=24;
- magazines[]=
- {
- "Trixie_5x762_M118LR_Mag",
- "Trixie_5x762_Mag"
- };
- };
- class Trixie_AWM338 : Rifle_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=27;
- };
- class Trixie_M107 : Rifle_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=29;
- };
- class Trixie_AS50 : Rifle_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=29;
- };
- class L110A1_base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=13.7;
- };
- class Trixie_L86A2_base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=25.4;
- };
- class Trixie_l85a2_base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20.4;
- };
- class L7A2_base : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=24.8;
- };
-
- class rhs_weap_pya : Pistol_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=4.4;
- };
- class rhs_weap_pkp : Rifle_Long_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=25.9;
- };
- class rhs_weap_pkm : Rifle_Long_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=25.4;
- };
- class rhs_weap_rpk74m : Rifle_Long_Base_F
- {
- AB_barrelTwist=7.68;
- AB_barrelLength=23.2;
- };
- class rhs_weap_rpk74 : Rifle_Long_Base_F
- {
- AB_barrelTwist=7.68;
- AB_barrelLength=23.2;
- };
- class rhs_weap_ak74m : Rifle_Base_F
- {
- AB_barrelTwist=7.87;
- AB_barrelLength=16.3;
- };
- class rhs_weap_aks74u : Rifle_Base_F
- {
- AB_barrelTwist=6.3;
- AB_barrelLength=8.3;
- };
- class rhs_weap_akm : Rifle_Base_F
- {
- AB_barrelTwist=7.87;
- AB_barrelLength=16.3;
- };
- class rhs_weap_svd : Rifle_Base_F
- {
- AB_barrelTwist=9.4;
- AB_barrelLength=24.4;
- };
- class rhs_weap_svds : Rifle_Base_F
- {
- AB_barrelTwist=9.4;
- AB_barrelLength=22.2;
- };
- class rhs_weap_m4_Base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14.5;
- };
- class rhs_weap_m16a4 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class rhs_weap_m16a4_carryhandle : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class rhs_weap_m16a4_grip : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class rhs_weap_m240B : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=24.8;
- };
- class rhs_weap_m249_pip : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=16.3;
- };
-
- class R3F_PAMAS : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.9;
- };
- class R3F_Famas_F1: Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=19.2;
- };
- class R3F_Famas_surb: Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=15.9;
- };
- class R3F_Minimi: Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=13.7;
- };
- class R3F_Minimi_762: Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=19.8;
- };
- class R3F_FRF2: Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=25.59;
- };
- class R3F_PGM_Hecate_II: Rifle_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=27.6;
- };
- class R3F_HK417S_HG : Rifle_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=12;
- };
- class R3F_HK417M : Rifle_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=16;
- };
- class R3F_HK417L : Rifle_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=20;
- };
- class R3F_M107 : Rifle_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=29;
- };
- class R3F_HK416M : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14;
- };
- class R3F_MP5SD : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=5.7;
- };
-
- class CUP_hgun_Colt1911 : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=5;
- };
- class CUP_sgun_AA12 : Rifle_Base_F
- {
- AB_barrelTwist=0;
- AB_twistDirection=0;
- AB_barrelLength=18;
- };
- class CUP_arifle_AK_Base : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=16.3;
- };
- class CUP_arifle_AK107_Base : Rifle_Base_F
- {
- AB_barrelTwist=7.87;
- AB_barrelLength=16.3;
- };
- class CUP_arifle_AKS_Base : Rifle_Base_F
- {
- AB_barrelTwist=7.87;
- AB_barrelLength=16.3;
- };
- class CUP_arifle_AKS74U : Rifle_Base_F
- {
- AB_barrelTwist=6.3;
- AB_barrelLength=8.3;
- };
- class CUP_arifle_RPK74 : Rifle_Long_Base_F
- {
- AB_barrelTwist=7.68;
- AB_barrelLength=23.2;
- };
- class CUP_srifle_AS50 : Rifle_Long_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=29;
- };
- class CUP_srifle_AWM_Base : Rifle_Long_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=27;
- };
- class CUP_smg_bizon : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=9.1;
- };
- class CUP_hgun_Compact : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=3.74;
- };
- class CUP_srifle_CZ750 : Rifle_Long_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=26;
- };
- class CUP_arifle_CZ805_Base : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=14;
- };
- class CUP_arifle_CZ805_A1 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=14;
- };
- class CUP_arifle_CZ805_A2 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=10.9;
- };
- class CUP_srifle_DMR : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=22;
- };
- class CUP_hgun_Duty : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=3.74;
- };
- class CUP_arifle_FNFAL : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=21;
- };
- class CUP_arifle_G36A : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18.9;
- };
- class CUP_arifle_G36K : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=12.5;
- };
- class CUP_arifle_G36C : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=9;
- };
- class CUP_arifle_MG36 : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18.9;
- };
- class CUP_hgun_Glock17 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.49;
- };
- class CUP_srifle_CZ550 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=23.622;
- };
- class CUP_srifle_ksvk : Rifle_Long_Base_F
- {
- AB_barrelTwist=18;
- AB_barrelLength=39.37;
- };
- class CUP_lmg_L7A2 : Rifle_Long_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=24.8;
- };
- class CUP_arifle_L85A2_Base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20.4;
- };
- class CUP_lmg_L110A1 : Rifle_Long_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=13.7;
- };
- class CUP_srifle_LeeEnfield : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=25.2;
- };
- class CUP_hgun_M9 : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=4.9;
- };
- class CUP_srifle_M14 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=22;
- };
- class CUP_arifle_M16_Base : Rifle_Base_F
- {
- AB_barrelTwist=14;
- AB_barrelLength=20;
- };
- class CUP_arifle_M4_Base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14.5;
- };
- class CUP_srifle_Mk12SPR : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18;
- };
- class CUP_srifle_M24_des : Rifle_Base_F
- {
- AB_barrelTwist=11.25;
- AB_barrelLength=24;
- };
- class CUP_lmg_M60A4 : Rifle_Long_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=17;
- };
- class CUP_srifle_M107_Base : Rifle_Long_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=29;
- };
- class CUP_srifle_M110 : Rifle_Base_F
- {
- AB_barrelTwist=11;
- AB_barrelLength=20;
- };
- class CUP_lmg_M240 : Rifle_Long_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=24.8;
- };
- class CUP_lmg_M249_para : Rifle_Long_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=16.3;
- };
- class CUP_lmg_M249 : Rifle_Long_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18;
- };
- class CUP_sgun_M1014 : Rifle_Base_F
- {
- AB_twistDirection=0;
- AB_barrelTwist=0;
- AB_barrelLength=18.5;
- };
- class CUP_hgun_Makarov : Pistol_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=3.68;
- };
- class CUP_hgun_MicroUzi : Pistol_Base_F
- {
- AB_barrelTwist=9.8;
- AB_barrelLength=5;
- };
- class CUP_lmg_Mk48_Base : Rifle_Long_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=19.75;
- };
- class CUP_smg_MP5SD6 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=5.7;
- };
- class CUP_smg_MP5A5 : Rifle_Base_F
- {
- AB_barrelTwist=10;
- AB_barrelLength=8.9;
- };
- class CUP_hgun_PB6P9 : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=4.1;
- };
- class CUP_hgun_Phantom : Rifle_Base_F
- {
- AB_barrelTwist=9.7;
- AB_barrelLength=4.7;
- };
- class CUP_lmg_PKM : Rifle_Long_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=25.4;
- };
- class CUP_lmg_Pecheneg : Rifle_Long_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=25.9;
- };
- class CUP_hgun_TaurusTracker455 : Pistol_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=4;
- };
- class CUP_arifle_Sa58P : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=15.4;
- };
- class CUP_arifle_Sa58V : Rifle_Base_F
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=15.4;
- };
- class CUP_hgun_SA61 : Pistol_Base_F
- {
- AB_barrelTwist=16;
- AB_barrelLength=4.5;
- };
- class CUP_sgun_Saiga12K: Rifle_Base_F
- {
- AB_barrelTwist=0;
- AB_twistDirection=0;
- AB_barrelLength=16.9;
- }
- class CUP_arifle_Mk16_CQC : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=10;
- };
- class CUP_arifle_Mk16_STD : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=14;
- };
- class CUP_arifle_Mk16_SV : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=18;
- };
- class CUP_arifle_Mk17_CQC : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=13;
- };
- class CUP_arifle_Mk17_STD : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=16;
- };
- class CUP_arifle_Mk20 : Rifle_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=20;
- };
- class CUP_srifle_SVD : Rifle_Base_F
- {
- AB_barrelTwist=9.4;
- AB_barrelLength=24.4;
- };
- class CUP_lmg_UK59 : Rifle_Long_Base_F
- {
- AB_barrelTwist=15;
- AB_barrelLength=21.7;
- };
- class CUP_DSHKM_W : MGun
- {
- AB_barrelTwist=15;
- AB_barrelLength=42.1;
- };
- class CUP_KPVT_W : MGun
- {
- AB_barrelTwist=17.91;
- AB_barrelLength=53;
- };
- class CUP_KPVB_W : MGun
- {
- AB_barrelTwist=17.91;
- AB_barrelLength=53;
- };
- class CUP_M134 : MGunCore
- {
- AB_barrelTwist=12;
- AB_barrelLength=22;
- };
- class CUP_M240_veh_W : Rifle_Long_Base_F
- {
- AB_barrelTwist=12;
- AB_barrelLength=24.8;
- };
- class CUP_PKT_W : MGun
- {
- AB_barrelTwist=9.45;
- AB_barrelLength=28.43;
- };
- class CUP_srifle_VSSVintorez : Rifle_Base_F
- {
- AB_barrelTwist=8.3;
- AB_barrelLength=7.9;
- };
- class CUP_arifle_XM8_Base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=12.5;
- };
- class CUP_arifle_XM8_Carbine : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=12.5;
- };
- class CUP_arifle_xm8_sharpshooter : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class CUP_arifle_xm8_SAW : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=20;
- };
- class CUP_arifle_XM8_Compact : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=9;
- };
- class CUP_arifle_XM8_Railed_Base : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=12.5;
- };
- class CUP_arifle_XM8_Carbine_FG : Rifle_Base_F
- {
- AB_barrelTwist=7;
- AB_barrelLength=12.5;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/Combat_Space_Enhancement.h
deleted file mode 100644
index aa5753b490..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,16 +0,0 @@
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_AB_moduleAdvancedBallistics {
- init = "call compile preprocessFile 'cse\cse_sys_ballistics\advancedballistics\init.sqf';";
- name = "Advanced Ballistics";
- class EventHandlers {
- class AllVehicles {
- fired = "call cse_ab_ballistics_fnc_advanced_ballistics; false";
- };
- class CAManBase {
- take = "call cse_ab_ballistics_fnc_synchronize_scope_zero; false";
- };
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/UI.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/UI.h
deleted file mode 100644
index 11255d108c..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/UI.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "ui\rscTitles.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/config.cpp b/TO_MERGE/cse/sys_ballistics/advancedballistics/config.cpp
deleted file mode 100644
index cdc4523906..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/config.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#define ST_LEFT 0
-#define ST_RIGHT 1
-#define ST_CENTER 2
-
-class CfgPatches
-{
- class cse_ab_advancedballistics
- {
- units[]={};
- weapons[]={};
- requiredVersion=1.26;
- requiredAddons[]=
- {
-
- };
- version="2.7";
- author[]=
- {
- "Ruthberg"
- };
- };
-};
-class CfgAddons
-{
- class PreloadAddons
- {
- class cse_ab_advancedballistics
- {
- list[]=
- {
- "cse_ab_advancedballistics"
- };
- };
- };
-};
-
-#include "CfgAmmo.h"
-#include "CfgMagazines.h"
-#include "CfgWeapons.h"
-#include "CfgSounds.h"
-#include "CfgVehicles.h"
-#include "CfgFunctions.h"
-#include "Combat_Space_Enhancement.h"
-#include "UI.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/protractor.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/protractor.paa
deleted file mode 100644
index 1114b41826..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/protractor.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/protractor_marker.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/protractor_marker.paa
deleted file mode 100644
index a97be42a73..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/protractor_marker.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind0.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind0.paa
deleted file mode 100644
index c049caf47e..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind0.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind1.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind1.paa
deleted file mode 100644
index 47d996fe67..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind1.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind10.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind10.paa
deleted file mode 100644
index a9bcd49c1b..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind10.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind11.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind11.paa
deleted file mode 100644
index 469cdedada..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind11.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind12.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind12.paa
deleted file mode 100644
index 11e19553ff..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind12.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind2.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind2.paa
deleted file mode 100644
index 585944af45..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind3.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind3.paa
deleted file mode 100644
index 16b823a9f3..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind3.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind4.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind4.paa
deleted file mode 100644
index a5bd119889..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind4.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind5.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind5.paa
deleted file mode 100644
index 43398e2960..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind5.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind6.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind6.paa
deleted file mode 100644
index 3bd9a9c676..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind6.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind7.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind7.paa
deleted file mode 100644
index a7bb1d5942..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind7.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind8.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind8.paa
deleted file mode 100644
index e51ad530c5..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind8.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind9.paa b/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind9.paa
deleted file mode 100644
index 016ca49f7c..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/data/wind9.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/defines.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/defines.h
deleted file mode 100644
index 1b472bcb3b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/defines.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#define GRAVITY 9.80665
-#define ABSOLUTE_ZERO_IN_CELSIUS -273.15
-#define KELVIN(t) (t - ABSOLUTE_ZERO_IN_CELSIUS)
-#define CELSIUS(t) (t + ABSOLUTE_ZERO_IN_CELSIUS)
-#define UNIVERSAL_GAS_CONSTANT 8.314
-#define WATER_VAPOR_MOLAR_MASS 0.018016
-#define DRY_AIR_MOLAR_MASS 0.028964
-#define SPECIFIC_GAS_CONSTANT_DRY_AIR 287.058
-#define STD_AIR_DENSITY_ICAO 1.22498
-#define STD_AIR_DENSITY_ASM 1.20885
-#define GET_TEMPERATURE_AT_HEIGHT(h) (cse_AB_Temperature - 0.0065 * (h))
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_adjust_parallax.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_adjust_parallax.sqf
deleted file mode 100644
index 6c6daca94b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_adjust_parallax.sqf
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * fn_adjust_parralax.sqf
- * @Descr: N/A
- * @Author: Ruthberg
- *
- * @Arguments: []
- * @Return: []
- * @PublicAPI: false
- */
-
-
-#include "defines.h"
-
-#define __dsp (uiNamespace getVariable "RscTurretDial")
-#define __ctrl (__dsp displayCtrl 132949)
-
-private ["_direction", "_opticsName", "_opticType", "_parallax"];
-_direction = _this;
-_opticsName = currentWeapon player;
-_opticType = 0;
-
-if (!cse_AB_MirageEnabled) exitWith { false };
-if (!(weaponLowered player) && currentWeapon player == primaryWeapon player && count primaryWeaponItems player > 2) then {
- _opticsName = (primaryWeaponItems player) select 2;
- _opticType = getNumber(configFile >> "cfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
-};
-if (_opticType != 2 && !(currentWeapon player in ["Binocular", "Rangefinder", "Laserdesignator"])) exitWith { false };
-
-_parallax = player getVariable [format["cse_AB_Parallax:%1", _opticsName], 0];
-
-switch (_direction) do
-{
- case 0:
- {
- if (_parallax > 0) then {
- _parallax = _parallax + 100;
- };
- if (_parallax > 1000) then {
- _parallax = 0;
- };
- };
- case 1:
- {
- if (_parallax > 100) then {
- _parallax = _parallax - 100;
- };
- if (_parallax == 0) then {
- _parallax = 1000;
- };
- };
-};
-
-cse_AB_WindInfo = false;
-0 cutText ["", "PLAIN"];
-cse_AB_Protractor = false;
-1 cutText ["", "PLAIN"];
-
-2 cutRsc ["RscTurretDial", "PLAIN"];
-
-if (_parallax > 0) then {
- __ctrl ctrlSetText format["%1 m", round(_parallax)];
-} else {
- __ctrl ctrlSetText "infinity";
-};
-__ctrl ctrlSetTextColor [0.8, 0.0, 0.0, 1.0];
-
-if (_parallax != player getVariable [format["cse_AB_Parallax:%1", _opticsName], 0]) then {
- player setVariable [format["cse_AB_Parallax:%1", _opticsName], _parallax, false];
- PlaySound "cse_AB_scope_click";
-};
-
-true
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_adjust_turret.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_adjust_turret.sqf
deleted file mode 100644
index 613a266f72..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_adjust_turret.sqf
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "defines.h"
-
-#define __dsp (uiNamespace getVariable "RscTurretDial")
-#define __ctrl (__dsp displayCtrl 132949)
-
-private ["_opticsName", "_opticType", "_scopeStep", "_turretAndDirection", "_majorStep", "_elevation", "_windage", "_zero"];
-_turretAndDirection = _this select 0;
-_majorStep = _this select 1;
-
-if (!cse_AB_MilTurretsEnabled) exitWith { false };
-if (weaponLowered player) exitWith { false };
-if (vehicle player != player) exitWith { false };
-if (currentWeapon player != primaryWeapon player) exitWith { false };
-if (count primaryWeaponItems player < 3) exitWith { false };
-
-_opticsName = (primaryWeaponItems player) select 2;
-_opticType = getNumber(configFile >> "cfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
-
-if (_opticType != 2) exitWith { false };
-
-_elevation = player getVariable [format["cse_AB_Elevation:%1", _opticsName], 0];
-_windage = player getVariable [format["cse_AB_Windage:%1", _opticsName], 0];
-_zero = player getVariable [format["cse_AB_Zero:%1", _opticsName], profileNamespace getVariable [format["cse_AB_Zero:%1", _opticsName], 0]];
-
-_scopeStep = 0.1;
-
-switch (_turretAndDirection) do
-{
- case 0: { _elevation = _elevation + _scopeStep };
- case 1: { _elevation = _elevation - _scopeStep };
- case 2: { _windage = _windage - _scopeStep };
- case 3: { _windage = _windage + _scopeStep };
- case 4: { _zero = _zero + _scopeStep };
- case 5: { _zero = _zero - _scopeStep };
-};
-
-if (_majorStep) then {
- switch (_turretAndDirection) do
- {
- case 0: { _elevation = ceil(_elevation) };
- case 1: { _elevation = floor(_elevation) };
- case 2: { _windage = floor(_windage) };
- case 3: { _windage = ceil(_windage) };
- };
-};
-
-_zero = -4 max _zero min 30;
-_elevation = (-4 - _zero) max _elevation min (30 - _zero);
-_windage = -20 max _windage min 20;
-
-cse_AB_WindInfo = false;
-0 cutText ["", "PLAIN"];
-cse_AB_Protractor = false;
-1 cutText ["", "PLAIN"];
-
-2 cutRsc ["RscTurretDial", "PLAIN"];
-
-switch (_turretAndDirection) do
-{
- case 0;
- case 1: {
- __ctrl ctrlSetText format["%1 Mil", round(_elevation * 10) / 10];
- __ctrl ctrlSetTextColor [1.0, 1.0, 0.5, 1.0];
- };
- case 2;
- case 3: {
- __ctrl ctrlSetText format["%1 Mil", round(_windage * 10) / 10];
- __ctrl ctrlSetTextColor [0.8, 0.8, 1.0, 1.0];
- };
- case 4;
- case 5: {
- __ctrl ctrlSetText format["%1 Mil", round(_zero * 10) / 10];
- __ctrl ctrlSetTextColor [0, 0.5, 0.0, 1.0];
- };
-};
-
-if (_elevation != player getVariable [format["cse_AB_Elevation:%1", _opticsName], 0]) then {
- player setVariable [format["cse_AB_Elevation:%1", _opticsName], _elevation, true];
- PlaySound "cse_AB_scope_click";
-};
-if (_windage != player getVariable [format["cse_AB_Windage:%1", _opticsName], 0]) then {
- player setVariable [format["cse_AB_Windage:%1", _opticsName], _windage, true];
- PlaySound "cse_AB_scope_click";
-};
-if (_zero != player getVariable [format["cse_AB_Zero:%1", _opticsName], 0]) then {
- profileNamespace setVariable [format["cse_AB_Zero:%1", _opticsName], _zero];
- player setVariable [format["cse_AB_Zero:%1", _opticsName], _zero, true];
- PlaySound "cse_AB_scope_click";
-};
-
-true
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_advanced_ballistics.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_advanced_ballistics.sqf
deleted file mode 100644
index 701e22eb5d..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_advanced_ballistics.sqf
+++ /dev/null
@@ -1,345 +0,0 @@
-#include "defines.h"
-
-private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_index", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_atmosphereModel", "_bulletMass", "_bulletLength", "_bulletTranslation", "_airFriction", "_dragModel", "_velocityBoundaryData", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_bulletWeight", "_barrelTwist", "_twistDirection", "_stabilityFactor", "_transonicStabilityCoef", "_cse_AB_Elevation", "_cse_AB_Windage", "_ID"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_mode = _this select 3;
-_ammo = _this select 4;
-_bullet = _this select 5;
-_magazine = _this select 6;
-
-if (!isClass (configFile >> 'CfgPatches' >> 'CBA_main')) then {
- _bullet = _this select 6;
- _magazine = _this select 5;
-};
-
-if (isDedicated) exitWith {};
-if (!alive _bullet) exitWith {};
-if (!(isPlayer _unit)) exitWith {};
-if (underwater _unit) exitWith {};
-if (!(_ammo isKindOf "BulletBase")) exitWith {};
-if (_unit distanceSqr player > 9000000) exitWith {};
-if (cse_AB_OnlyActiveForLocalPlayer && !(local _unit)) exitWith {};
-if (cse_AB_OnlyActiveForPlayerGroup && (group _unit != group player)) exitWith {};
-if (!cse_AB_VehicleGunnerEnabled && !(_unit isKindOf "Man")) exitWith {};
-if (cse_AB_DisabledInFullAutoMode && getNumber(configFile >> "cfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) exitWith {};
-if (!isServer && !((gunner _unit) getVariable ["cse_enabled_AdvancedBallistics", false])) exitWith {};
-
-_airFriction = getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction");
-_muzzleVelocity = getNumber(configFile >> "cfgMagazines" >> _magazine >> "initSpeed");
-
-_muzzleAccessory = (primaryWeaponItems _unit) select 0;
-if (_muzzleAccessory != "" && isNumber(configFile >> "cfgWeapons" >> _muzzleAccessory >> "ItemInfo" >> "MagazineCoef" >> "initSpeed")) then {
- _initSpeedCoef = getNumber(configFile >> "cfgWeapons" >> _muzzleAccessory >> "ItemInfo" >> "MagazineCoef" >> "initSpeed");
- _muzzleVelocity = _muzzleVelocity * _initSpeedCoef;
-};
-
-if (cse_AB_BarrelLengthInfluenceEnabled) then {
- _muzzleVelocityShift = [_ammo, _weapon, _muzzleVelocity] call cse_ab_ballistics_fnc_barrel_length_muzzle_velocity;
- if (_muzzleVelocityShift != 0) then {
- _bulletVelocity = velocity _bullet;
- _bulletSpeed = vectorMagnitude _bulletVelocity;
- _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift * (_bulletSpeed / _muzzleVelocity)));
- _bullet setVelocity _bulletVelocity;
- _muzzleVelocity = _muzzleVelocity + _muzzleVelocityShift;
- };
-};
-
-if (cse_AB_AmmoTemperatureEnabled) then {
- _temperature = GET_TEMPERATURE_AT_HEIGHT((getPosASL _unit) select 2);
- _muzzleVelocityShift = [_ammo, _temperature] call cse_ab_ballistics_fnc_ammo_temperature_muzzle_velocity;
- if (_muzzleVelocityShift != 0) then {
- _bulletVelocity = velocity _bullet;
- _bulletSpeed = vectorMagnitude _bulletVelocity;
- _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift * (_bulletSpeed / _muzzleVelocity)));
- _bullet setVelocity _bulletVelocity;
- _muzzleVelocity = _muzzleVelocity + _muzzleVelocityShift;
- };
-};
-
-_bulletTraceVisible = false;
-if (cse_AB_BulletTraceEnabled && currentWeapon player == primaryWeapon player && count primaryWeaponItems player > 2) then {
- _opticsName = (primaryWeaponItems player) select 2;
- _opticType = getNumber(configFile >> "cfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
- _bulletTraceVisible = (_opticType == 2 || currentWeapon player in ["Binocular", "Rangefinder", "Laserdesignator"]) && cameraView == "GUNNER";
-};
-
-if (cse_AB_MilTurretsEnabled) then {
- [_bullet, _unit] call cse_ab_ballistics_fnc_apply_turret_adjustments;
-};
-
-_caliber = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_caliber");
-_bulletLength = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_bulletLength");
-_bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_bulletMass");
-_barrelTwist = getNumber(configFile >> "cfgWeapons" >> _weapon >> "AB_barrelTwist");
-_stabilityFactor = 1.5;
-
-if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then {
- _temperature = GET_TEMPERATURE_AT_HEIGHT((getPosASL _unit) select 2);
- _barometricPressure = 1013.25 * exp(-(cse_AB_Altitude + ((getPosASL _bullet) select 2)) / 7990) - 10 * overcast;
- _stabilityFactor = [_caliber, _bulletLength, _bulletMass, _barrelTwist, _muzzleVelocity, _temperature, _barometricPressure] call cse_ab_ballistics_fnc_calculate_stability_factor;
-};
-
-_twistDirection = 1;
-if (isNumber(configFile >> "cfgWeapons" >> _weapon >> "AB_twistDirection")) then {
- _twistDirection = getNumber(configFile >> "cfgWeapons" >> _weapon >> "AB_twistDirection");
- if (_twistDirection != -1 && _twistDirection != 0 && _twistDirection != 1) then {
- _twistDirection = 1;
- };
-};
-
-_transonicStabilityCoef = 0.5;
-if (isNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_transonicStabilityCoef")) then {
- _transonicStabilityCoef = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_transonicStabilityCoef");
-};
-
-_dragModel = 1;
-_ballisticCoefficients = [];
-_velocityBoundaries = [];
-_atmosphereModel = "ICAO";
-if (cse_AB_AdvancedAirDragEnabled) then {
- if (isNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_dragModel")) then {
- _dragModel = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_dragModel");
- if (!(_dragModel in [1, 2, 5, 6, 7, 8])) then {
- _dragModel = 1;
- };
- };
- if (isArray(configFile >> "cfgAmmo" >> _ammo >> "AB_ballisticCoefficients")) then {
- _ballisticCoefficients = getArray(configFile >> "cfgAmmo" >> _ammo >> "AB_ballisticCoefficients");
- };
- if (isArray(configFile >> "cfgAmmo" >> _ammo >> "AB_velocityBoundaries")) then {
- _velocityBoundaries = getArray(configFile >> "cfgAmmo" >> _ammo >> "AB_velocityBoundaries");
- };
- if (isText(configFile >> "cfgAmmo" >> _ammo >> "AB_standardAtmosphere")) then {
- _atmosphereModel = getText(configFile >> "cfgAmmo" >> _ammo >> "AB_standardAtmosphere");
- };
-};
-
-_index = count cse_AB_bulletDatabase;
-if (count cse_AB_bulletDatabaseFreeIndices > 0) then {
- _index = cse_AB_bulletDatabaseFreeIndices select 0;
- cse_AB_bulletDatabaseFreeIndices = cse_AB_bulletDatabaseFreeIndices - [_index];
-};
-
-cse_AB_bulletDatabase set[_index, [_bullet, _caliber, _airFriction, _muzzleVelocity, _stabilityFactor, _transonicStabilityCoef, _twistDirection, _unit, _bulletTraceVisible, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _index]];
-cse_AB_bulletDatabaseStartTime set[_index, time];
-cse_AB_bulletDatabaseSpeed set[_index, 0];
-cse_AB_bulletDatabaseFrames set[_index, 1];
-cse_AB_bulletDatabaseLastFrame set[_index, time];
-cse_AB_bulletDatabaseHDeflect set[_index, 0];
-cse_AB_bulletDatabaseSpinDrift set[_index, 0];
-
-if ((cse_AB_bulletDatabaseOccupiedIndices pushBack _index) == 0) then {
- ["AdvancedBallistics", "onEachFrame", {
- private ["_bulletDatabaseEntry", "_bullet", "_caliber", "_muzzleVelocity", "_frames", "_speed", "_airFriction", "_airFrictionRef", "_dragModel", "_atmosphereModel", "_ballisticCoefficient", "_ballisticCoefficients", "_velocityBoundaries", "_airDensity", "_stabilityFactor", "_transonicStabilityCoef", "_twistDirection", "_unit", "_bulletTraceVisible", "_index", "_temperature", "_humidity", "_deltaT", "_TOF", "_bulletPosition", "_bulletVelocity", "_bulletSpeed", "_trueVelocity", "_trueSpeed", "_bulletSpeedAvg", "_wind", "_drag", "_dragRef", "_vect", "_accel", "_accelRef", "_centripetalAccel", "_pressure", "_pressureDeviation", "_windSourceObstacle", "_windSourceTerrain", "_height", "_roughnessLength"];
-
- {
- _bullet = (cse_AB_bulletDatabase select _x) select 0;
- _index = (cse_AB_bulletDatabase select _x) select 13;
- if (!alive _bullet) then {
- cse_AB_bulletDatabaseOccupiedIndices = cse_AB_bulletDatabaseOccupiedIndices - [_index];
- cse_AB_bulletDatabaseFreeIndices pushBack _index;
- };
- true
- } count cse_AB_bulletDatabaseOccupiedIndices;
-
- if (count cse_AB_bulletDatabaseOccupiedIndices == 0) exitWith {
- cse_AB_bulletDatabase = [];
- cse_AB_bulletDatabaseStartTime = [];
- cse_AB_bulletDatabaseSpeed = [];
- cse_AB_bulletDatabaseFrames = [];
- cse_AB_bulletDatabaseLastFrame = [];
- cse_AB_bulletDatabaseHDeflect = [];
- cse_AB_bulletDatabaseSpinDrift = [];
- cse_AB_bulletDatabaseOccupiedIndices = [];
- cse_AB_bulletDatabaseFreeIndices = [];
- ["AdvancedBallistics", "onEachFrame"] call BIS_fnc_removeStackedEventHandler;
- };
-
- {
- _bulletDatabaseEntry = (cse_AB_bulletDatabase select _x);
- _bullet = _bulletDatabaseEntry select 0;
- _caliber = _bulletDatabaseEntry select 1;
- _airFriction = _bulletDatabaseEntry select 2;
- _muzzleVelocity = _bulletDatabaseEntry select 3;
- _stabilityFactor = _bulletDatabaseEntry select 4;
- _transonicStabilityCoef = _bulletDatabaseEntry select 5;
- _twistDirection = _bulletDatabaseEntry select 6;
- _unit = _bulletDatabaseEntry select 7;
- _bulletTraceVisible = _bulletDatabaseEntry select 8;
- _ballisticCoefficients = _bulletDatabaseEntry select 9;
- _velocityBoundaries = _bulletDatabaseEntry select 10;
- _atmosphereModel = _bulletDatabaseEntry select 11;
- _dragModel = _bulletDatabaseEntry select 12;
- _index = _bulletDatabaseEntry select 13;
-
- _TOF = time - (cse_AB_bulletDatabaseStartTime select _index);
-
- _bulletVelocity = velocity _bullet;
- _bulletPosition = getPosASL _bullet;
-
- _bulletSpeed = vectorMagnitude _bulletVelocity;
- _bulletDir = (_bulletVelocity select 0) atan2 (_bulletVelocity select 1);
-
- _speed = (cse_AB_bulletDatabaseSpeed select _index);
- cse_AB_bulletDatabaseSpeed set[_index, _speed + _bulletSpeed];
-
- _frames = (cse_AB_bulletDatabaseFrames select _index);
- cse_AB_bulletDatabaseFrames set[_index, _frames + 1];
-
- _bulletSpeedAvg = (_speed / _frames);
-
- if ((cse_AB_Precision < 2) || {_frames % cse_AB_Precision == _index % cse_AB_Precision}) then {
- _deltaT = time - (cse_AB_bulletDatabaseLastFrame select _index);
- cse_AB_bulletDatabaseLastFrame set[_index, time];
-
- _trueVelocity = _bulletVelocity;
- _trueSpeed = _bulletSpeed;
- _wind = [0, 0, 0];
- if (cse_AB_WindEnabled && (vectorMagnitude wind) > 0) then {
- _windSourceObstacle = _bulletPosition vectorDiff ((vectorNormalized wind) vectorMultiply 10);
- _windSourceTerrain = _bulletPosition vectorDiff ((vectorNormalized wind) vectorMultiply 100);
-
- if (!(lineIntersects [_bulletPosition, _windSourceObstacle]) && !(terrainIntersectASL [_bulletPosition, _windSourceTerrain])) then {
- _wind = wind;
- _height = ASLToATL(_bulletPosition) select 2;
- _height = 0 max _height min 20;
- if (_height < 20) then {
- _roughnessLength = _bulletPosition call cse_ab_ballistics_fnc_calculate_roughness_length;
- _wind = _wind vectorMultiply (ln(_height / _roughnessLength) / ln(20 / _roughnessLength));
- };
-
- _trueVelocity = _bulletVelocity vectorDiff _wind;
- _trueSpeed = vectorMagnitude _trueVelocity;
- };
- };
-
- _airFrictionRef = _airFriction;
- if (cse_AB_AdvancedAirDragEnabled && (count _ballisticCoefficients) == (count _velocityBoundaries) + 1) then {
- _dragRef = _deltaT * _airFrictionRef * _bulletSpeed * _bulletSpeed;
- _accelRef = (vectorNormalized _bulletVelocity) vectorMultiply (_dragRef);
- _bulletVelocity = _bulletVelocity vectorDiff _accelRef;
-
- _ballisticCoefficient = (_ballisticCoefficients select 0);
- for "_i" from (count _velocityBoundaries) - 1 to 0 step -1 do {
- if (_bulletSpeed < (_velocityBoundaries select _i)) exitWith {
- _ballisticCoefficient = (_ballisticCoefficients select (_i + 1));
- };
- };
-
- if (cse_AB_AtmosphericDensitySimulationEnabled) then {
- _pressure = 1013.25 * exp(-(cse_AB_Altitude + (_bulletPosition select 2)) / 7990) - 10 * overcast;
- _temperature = GET_TEMPERATURE_AT_HEIGHT(_bulletPosition select 2);
- _humidity = cse_AB_Humidity;
- if (cse_AB_Humidity < 1 && fog > 0) then {
- private ["_fogValue", "_fogDecay", "_fogBase"];
- _fogValue = fogParams select 0;
- _fogDecay = fogParams select 1;
- _fogBase = fogParams select 2;
- _fogDensity = 1 - 0.05 * (_fogDecay / _fogValue * (_height - _fogBase))^2;
- if (_fogDensity > 0) then {
- _humidity = 1;
- } else {
- _humidity = cse_AB_Humidity + (1 - cse_AB_Humidity) * (0 max (1 + _fogDensity));
- };
- };
- _airDensity = STD_AIR_DENSITY_ICAO;
- if (_humidity > 0) then {
- private ["_pSat", "_vaporPressure", "_partialPressure"];
- // Saturation vapor pressure calculated according to: http://wahiduddin.net/calc/density_algorithms.htm
- _pSat = 6.1078 * 10 ^ ((7.5 * _temperature) / (_temperature + 237.3));
- _vaporPressure = _humidity * _pSat;
- _partialPressure = (_pressure * 100)- _vaporPressure;
-
- _airDensity = (_partialPressure * DRY_AIR_MOLAR_MASS + _vaporPressure * WATER_VAPOR_MOLAR_MASS) / (UNIVERSAL_GAS_CONSTANT * KELVIN(_temperature));
- } else {
- _airDensity = (_pressure * 100) / (SPECIFIC_GAS_CONSTANT_DRY_AIR * KELVIN(_temperature));
- };
-
- if (_atmosphereModel == "ICAO") then {
- _ballisticCoefficient = (STD_AIR_DENSITY_ICAO / _airDensity) * _ballisticCoefficient;
- } else {
- _ballisticCoefficient = (STD_AIR_DENSITY_ASM / _airDensity) * _ballisticCoefficient;
- };
- };
-
- _drag = _deltaT * ([_dragModel, _ballisticCoefficient, _trueSpeed] call cse_ab_ballistics_fnc_calculate_retardation);
- _accel = (vectorNormalized _trueVelocity) vectorMultiply (_drag);
- _bulletVelocity = _bulletVelocity vectorDiff _accel;
- } else {
- if (cse_AB_AtmosphericDensitySimulationEnabled) then {
- _pressureDeviation = 1013.25 * exp(-(cse_AB_Altitude + (_bulletPosition select 2)) / 7990) - 1013.25 - 10 * overcast;
- _temperature = GET_TEMPERATURE_AT_HEIGHT(_bulletPosition select 2);
- _humidity = cse_AB_Humidity;
- if (cse_AB_Humidity < 1 && fog > 0) then {
- private ["_fogValue", "_fogDecay", "_fogBase"];
-
- _fogValue = fogParams select 0;
- _fogDecay = fogParams select 1;
- _fogBase = fogParams select 2;
- _fogDensity = 1 - 0.05 * (_fogDecay / _fogValue * (_height - _fogBase))^2;
- if (_fogDensity > 0) then {
- _humidity = 1;
- } else {
- _humidity = cse_AB_Humidity + (1 - cse_AB_Humidity) * (0 max (1 + _fogDensity));
- };
- };
- _airFriction = _airFriction + ((_temperature - 15) * 0.0000015 + _humidity * 0.0000040 + _pressureDeviation * -0.0000009);
- };
-
- if (_airFriction != _airFrictionRef || vectorMagnitude _wind > 0) then {
- _dragRef = _deltaT * _airFrictionRef * _bulletSpeed * _bulletSpeed;
- _accelRef = (vectorNormalized _bulletVelocity) vectorMultiply (_dragRef);
- _bulletVelocity = _bulletVelocity vectorDiff _accelRef;
-
- _drag = _deltaT * _airFriction * _trueSpeed * _trueSpeed;
- _accel = (vectorNormalized _trueVelocity) vectorMultiply (_drag);
- _bulletVelocity = _bulletVelocity vectorAdd _accel;
- };
- };
-
- if (cse_AB_CoriolisEnabled && _bulletSpeedAvg > 0) then {
- _horizontalDeflection = 0.0000729 * (_unit distanceSqr _bullet) * sin(cse_AB_Latitude) / _bulletSpeedAvg;
- _horizontalDeflectionPartial = _horizontalDeflection - (cse_AB_bulletDatabaseHDeflect select _index);
- cse_AB_bulletDatabaseHDeflect set[_index, _horizontalDeflection];
- _vect = [sin(_bulletDir + 90) * _horizontalDeflectionPartial, cos(_bulletDir + 90) * _horizontalDeflectionPartial, 0];
-
- _bulletPosition = _bulletPosition vectorAdd _vect;
- };
-
- if (cse_AB_EoetvoesEnabled) then {
- _centripetalAccel = 2 * 0.0000729 * (_muzzleVelocity / -32.2) * cos(cse_AB_Latitude) * sin(_bulletDir);
- _accel = [0, 0, -(_centripetalAccel * _deltaT)];
-
- _bulletVelocity = _bulletVelocity vectorAdd _accel;
- };
-
- if (cse_AB_SpinDriftEnabled) then {
- _spinDrift = _twistDirection * 0.0254 * 1.25 * (_stabilityFactor + 1.2) * _TOF ^ 1.83;
- _spinDriftPartial = _spinDrift - (cse_AB_bulletDatabaseSpinDrift select _index);
- cse_AB_bulletDatabaseSpinDrift set[_index, _spinDrift];
- _vect = [sin(_bulletDir + 90) * _spinDriftPartial, cos(_bulletDir + 90) * _spinDriftPartial, 0];
-
- _bulletPosition = _bulletPosition vectorAdd _vect;
- };
- };
-
- if (cse_AB_TransonicRegionEnabled && _transonicStabilityCoef < 1) then {
- if (_bulletSpeed < 345 && _bulletSpeedAvg > 340 && _bulletSpeed > 335) then {
- _accel = [(random 0.8) - 0.4, (random 0.8) - 0.4, (random 0.8) - 0.4];
- _accel = _accel vectorMultiply (1 - _transonicStabilityCoef);
- _bulletVelocity = _bulletVelocity vectorAdd _accel;
- };
- };
-
- if (_bulletTraceVisible && _bulletSpeed > 600 && _bullet distanceSqr _unit > 400) then {
- drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.4*_caliber,0.2*_caliber],[[0,0,0,0.6],[0,0,0,0.4]],[1,0],0,0,"","",""];
- };
-
- _bullet setVelocity _bulletVelocity;
- _bullet setPosASL _bulletPosition;
- true
- } count cse_AB_bulletDatabaseOccupiedIndices;
-
- }] call BIS_fnc_addStackedEventHandler;
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_advanced_ballistics_extension.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_advanced_ballistics_extension.sqf
deleted file mode 100644
index 7d544d15e0..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_advanced_ballistics_extension.sqf
+++ /dev/null
@@ -1,171 +0,0 @@
-#include "defines.h"
-
-private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_index", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_atmosphereModel", "_bulletMass", "_bulletLength", "_bulletTranslation", "_airFriction", "_dragModel", "_velocityBoundaryData", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_bulletWeight", "_barrelTwist", "_twistDirection", "_stabilityFactor", "_transonicStabilityCoef", "_cse_AB_Elevation", "_cse_AB_Windage", "_ID"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_mode = _this select 3;
-_ammo = _this select 4;
-_bullet = _this select 5;
-_magazine = _this select 6;
-
-if (!isClass (configFile >> 'CfgPatches' >> 'CBA_main')) then {
- _bullet = _this select 6;
- _magazine = _this select 5;
-};
-
-if (isDedicated) exitWith {};
-if (!alive _bullet) exitWith {};
-if (!(isPlayer _unit)) exitWith {};
-if (underwater _unit) exitWith {};
-if (!(_ammo isKindOf "BulletBase")) exitWith {};
-if (_unit distanceSqr player > 9000000) exitWith {};
-if (cse_AB_OnlyActiveForLocalPlayer && !(local _unit)) exitWith {};
-if (cse_AB_OnlyActiveForPlayerGroup && (group _unit != group player)) exitWith {};
-if (!cse_AB_VehicleGunnerEnabled && !(_unit isKindOf "Man")) exitWith {};
-if (cse_AB_DisabledInFullAutoMode && getNumber(configFile >> "cfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) exitWith {};
-if (!isServer && !((gunner _unit) getVariable ["cse_enabled_AdvancedBallistics", false])) exitWith {};
-
-_airFriction = getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction");
-_muzzleVelocity = getNumber(configFile >> "cfgMagazines" >> _magazine >> "initSpeed");
-
-_muzzleAccessory = (primaryWeaponItems _unit) select 0;
-if (_muzzleAccessory != "" && isNumber(configFile >> "cfgWeapons" >> _muzzleAccessory >> "ItemInfo" >> "MagazineCoef" >> "initSpeed")) then {
- _initSpeedCoef = getNumber(configFile >> "cfgWeapons" >> _muzzleAccessory >> "ItemInfo" >> "MagazineCoef" >> "initSpeed");
- _muzzleVelocity = _muzzleVelocity * _initSpeedCoef;
-};
-
-if (cse_AB_BarrelLengthInfluenceEnabled) then {
- _muzzleVelocityShift = [_ammo, _weapon, _muzzleVelocity] call cse_ab_ballistics_fnc_barrel_length_muzzle_velocity;
- if (_muzzleVelocityShift != 0) then {
- _bulletVelocity = velocity _bullet;
- _bulletSpeed = vectorMagnitude _bulletVelocity;
- _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift * (_bulletSpeed / _muzzleVelocity)));
- _bullet setVelocity _bulletVelocity;
- _muzzleVelocity = _muzzleVelocity + _muzzleVelocityShift;
- };
-};
-
-if (cse_AB_AmmoTemperatureEnabled) then {
- _temperature = GET_TEMPERATURE_AT_HEIGHT((getPosASL _unit) select 2);
- _muzzleVelocityShift = [_ammo, _temperature] call cse_ab_ballistics_fnc_ammo_temperature_muzzle_velocity;
- if (_muzzleVelocityShift != 0) then {
- _bulletVelocity = velocity _bullet;
- _bulletSpeed = vectorMagnitude _bulletVelocity;
- _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift * (_bulletSpeed / _muzzleVelocity)));
- _bullet setVelocity _bulletVelocity;
- _muzzleVelocity = _muzzleVelocity + _muzzleVelocityShift;
- };
-};
-
-_opticsName = "";
-_opticType = 0;
-if (currentWeapon player == primaryWeapon player && count primaryWeaponItems player > 2) then {
- _opticsName = (primaryWeaponItems player) select 2;
- _opticType = getNumber(configFile >> "cfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
-};
-
-_bulletTraceVisible = (_opticType == 2 || currentWeapon player in ["Binocular", "Rangefinder", "Laserdesignator"]) && cameraView == "GUNNER";
-
-if (cse_AB_MilTurretsEnabled) then {
- [_bullet, _unit] call cse_ab_ballistics_fnc_apply_turret_adjustments;
-};
-
-_caliber = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_caliber");
-_bulletLength = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_bulletLength");
-_bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_bulletMass");
-_barrelTwist = getNumber(configFile >> "cfgWeapons" >> _weapon >> "AB_barrelTwist");
-_stabilityFactor = 1.5;
-
-if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then {
- _temperature = GET_TEMPERATURE_AT_HEIGHT((getPosASL _unit) select 2);
- _barometricPressure = 1013.25 * exp(-(cse_AB_Altitude + ((getPosASL _bullet) select 2)) / 7990) - 10 * overcast;
- _stabilityFactor = [_caliber, _bulletLength, _bulletMass, _barrelTwist, _muzzleVelocity, _temperature, _barometricPressure] call cse_ab_ballistics_fnc_calculate_stability_factor;
-};
-
-_twistDirection = 1;
-if (isNumber(configFile >> "cfgWeapons" >> _weapon >> "AB_twistDirection")) then {
- _twistDirection = getNumber(configFile >> "cfgWeapons" >> _weapon >> "AB_twistDirection");
- if (_twistDirection != -1 && _twistDirection != 0 && _twistDirection != 1) then {
- _twistDirection = 1;
- };
-};
-
-_transonicStabilityCoef = 0.5;
-if (isNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_transonicStabilityCoef")) then {
- _transonicStabilityCoef = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_transonicStabilityCoef");
-};
-
-_dragModel = 1;
-_ballisticCoefficients = [];
-_velocityBoundaries = [];
-_atmosphereModel = "ICAO";
-if (cse_AB_AdvancedAirDragEnabled) then {
- if (isNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_dragModel")) then {
- _dragModel = getNumber(configFile >> "cfgAmmo" >> _ammo >> "AB_dragModel");
- if (!(_dragModel in [1, 2, 5, 6, 7, 8])) then {
- _dragModel = 1;
- };
- };
- if (isArray(configFile >> "cfgAmmo" >> _ammo >> "AB_ballisticCoefficients")) then {
- _ballisticCoefficients = getArray(configFile >> "cfgAmmo" >> _ammo >> "AB_ballisticCoefficients");
- };
- if (isArray(configFile >> "cfgAmmo" >> _ammo >> "AB_velocityBoundaries")) then {
- _velocityBoundaries = getArray(configFile >> "cfgAmmo" >> _ammo >> "AB_velocityBoundaries");
- };
- if (isText(configFile >> "cfgAmmo" >> _ammo >> "AB_standardAtmosphere")) then {
- _atmosphereModel = getText(configFile >> "cfgAmmo" >> _ammo >> "AB_standardAtmosphere");
- };
-};
-
-_index = count cse_AB_bulletDatabase;
-if (count cse_AB_bulletDatabaseFreeIndices > 0) then {
- _index = cse_AB_bulletDatabaseFreeIndices select 0;
- cse_AB_bulletDatabaseFreeIndices = cse_AB_bulletDatabaseFreeIndices - [_index];
-};
-
-"AdvancedBallistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", _index, _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _bullet, cse_AB_Latitude, cse_AB_Temperature, cse_AB_Altitude, cse_AB_Humidity, overcast, floor(time), time - floor(time)];
-cse_AB_bulletDatabase set[_index, [_bullet, _caliber, _bulletTraceVisible, _index]];
-
-if ((cse_AB_bulletDatabaseOccupiedIndices pushBack _index) == 0) then {
- ["AdvancedBallistics", "onEachFrame", {
- private ["_bulletDatabaseEntry", "_index", "_bullet", "_caliber", "_bulletTraceVisible", "_bulletVelocity", "_bulletPosition", "_bulletVelocityShift", "_bulletPositionShift"];
-
- {
- _bulletDatabaseEntry = (cse_AB_bulletDatabase select _x);
- _bullet = _bulletDatabaseEntry select 0;
- _index = _bulletDatabaseEntry select 3;
- if (!alive _bullet) then {
- cse_AB_bulletDatabaseOccupiedIndices = cse_AB_bulletDatabaseOccupiedIndices - [_index];
- cse_AB_bulletDatabaseFreeIndices pushBack _index;
- };
- true
- } count cse_AB_bulletDatabaseOccupiedIndices;
-
- if (count cse_AB_bulletDatabaseOccupiedIndices == 0) exitWith {
- cse_AB_bulletDatabase = [];
- cse_AB_bulletDatabaseOccupiedIndices = [];
- cse_AB_bulletDatabaseFreeIndices = [];
- ["AdvancedBallistics", "onEachFrame"] call BIS_fnc_removeStackedEventHandler;
- };
-
- {
- _bulletDatabaseEntry = (cse_AB_bulletDatabase select _x);
- _bullet = _bulletDatabaseEntry select 0;
- _caliber = _bulletDatabaseEntry select 1;
- _bulletTraceVisible = _bulletDatabaseEntry select 2;
- _index = _bulletDatabaseEntry select 3;
-
- _bulletVelocity = velocity _bullet;
- _bulletPosition = getPosASL _bullet;
-
- if (_bulletTraceVisible && vectorMagnitude _bulletVelocity > 600) then {
- drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.4*_caliber,0.2*_caliber],[[0,0,0,0.6],[0,0,0,0.4]],[1,0],0,0,"","",""];
- };
-
- call compile ("AdvancedBallistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, wind, ASLToATL(_bulletPosition) select 2, floor(time), time - floor(time)]);
-
- true
- } count cse_AB_bulletDatabaseOccupiedIndices;
-
- }] call BIS_fnc_addStackedEventHandler;
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_ammo_temperature_muzzle_velocity.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_ammo_temperature_muzzle_velocity.sqf
deleted file mode 100644
index 3158c82526..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_ammo_temperature_muzzle_velocity.sqf
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * fn_ammo_temperature_muzzle_velocity.sqf
- * @Descr: ?
- * @Author: Ruthberg
- *
- * @Arguments: [Ammo Class Name, Temperature in C]
- * @Return: [Muzzle Velocity Shift in m/s]
- * @PublicAPI: true
- */
-
-
-#include "defines.h"
-
-private ["_ammo", "_temperature", "_muzzleVelocityTable", "_muzzleVelocityShift", "_temperatureIndexA", "_temperatureIndexB", "_temperatureRatio"];
-_ammo = _this select 0;
-_temperature = _this select 1;
-
-_muzzleVelocityTable = [];
-
-if (isArray(configFile >> "cfgAmmo" >> _ammo >> "AB_ammoTempMuzzleVelocityShifts")) then {
- _muzzleVelocityTable = getArray(configFile >> "cfgAmmo" >> _ammo >> "AB_ammoTempMuzzleVelocityShifts");
-};
-
-if (count _muzzleVelocityTable != 11) exitWith { 0 };
-
-_temperatureIndexA = floor((_temperature + 15) / 5);
-_temperatureIndexA = 0 max _temperatureIndexA;
-_temperatureIndexA = _temperatureIndexA min 10;
-
-_temperatureIndexB = ceil((_temperature + 15) / 5);
-_temperatureIndexB = 0 max _temperatureIndexB;
-_temperatureIndexB = _temperatureIndexB min 10;
-
-_temperatureRatio = ((_temperature + 15) / 5) - floor((_temperature + 15) / 5);
-
-_muzzleVelocityShift = (_muzzleVelocityTable select _temperatureIndexA) * (1 - _temperatureRatio) + (_muzzleVelocityTable select _temperatureIndexB) * _temperatureRatio;
-
-_muzzleVelocityShift
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_apply_turret_adjustments.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_apply_turret_adjustments.sqf
deleted file mode 100644
index 147e5668e7..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_apply_turret_adjustments.sqf
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "defines.h"
-
-private ["_bullet", "_unit", "_opticsName", "_opticType", "_windage", "_elevation", "_zero", "_bulletVelocity", "_dir", "_elev", "_mag3D", "_mag2D"];
-_bullet = _this select 0;
-_unit = _this select 1;
-
-_opticsName = "";
-_opticType = 0;
-if (currentWeapon _unit == primaryWeapon _unit && count primaryWeaponItems _unit > 2) then {
- _opticsName = (primaryWeaponItems _unit) select 2;
- _opticType = getNumber(configFile >> "cfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
-};
-
-if (_opticType == 2) then {
- _windage = _unit getVariable [format["cse_AB_Windage:%1", _opticsName], 0];
- _elevation = _unit getVariable [format["cse_AB_Elevation:%1", _opticsName], 0];
- _zero = _unit getVariable [format["cse_AB_Zero:%1", _opticsName], 0];
-
- _elevation = _elevation + _zero;
-
- if (_windage != 0 || _elevation != 0) then {
- _windage = _windage * 3.47 / 60;
- _elevation = _elevation * 3.47 / 60;
-
- _bulletVelocity = (velocity _bullet);
- _mag3D = vectorMagnitude _bulletVelocity;
- _dir = (_bulletVelocity select 0) atan2 (_bulletVelocity select 1);
- _elev = asin((_bulletVelocity select 2) / _mag3D);
-
- _dir = _dir + _windage;
- _elev = _elev + _elevation;
-
- _mag2D = _mag3D * cos(_elev);
-
- _bullet setVelocity [_mag2D * sin(_dir), _mag2D * cos(_dir), _mag3D * sin(_elev)];
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_barrel_length_muzzle_velocity.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_barrel_length_muzzle_velocity.sqf
deleted file mode 100644
index 54ad0b1e31..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_barrel_length_muzzle_velocity.sqf
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * fn_barrel_length_muzzle_velocity.sqf
- * @Descr: ?
- * @Author: Ruthberg
- *
- * @Arguments: [Ammo Class Name, Weapon Class Name, Muzzle Velocity in m/s]
- * @Return: [Muzzle Velocity in m/s]
- * @PublicAPI: true
- */
-
-
-#include "defines.h"
-
-private ["_ammo", "_weapon", "_barrelLength", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocity", "_lowerIndex", "_upperIndex", "_barrelLengthRatio", "_muzzleVelocityNew"];
-_ammo = _this select 0;
-_weapon = _this select 1;
-_muzzleVelocity = _this select 2;
-
-_barrelLength = getNumber(configFile >> "cfgWeapons" >> _weapon >> "AB_barrelLength");
-
-if (_barrelLength == 0) exitWith { 0 };
-
-_muzzleVelocityTable = [];
-_barrelLengthTable = [];
-
-if (isArray(configFile >> "cfgAmmo" >> _ammo >> "AB_muzzleVelocities")) then {
- _muzzleVelocityTable = getArray(configFile >> "cfgAmmo" >> _ammo >> "AB_muzzleVelocities");
-};
-if (isArray(configFile >> "cfgAmmo" >> _ammo >> "AB_barrelLengths")) then {
- _barrelLengthTable = getArray(configFile >> "cfgAmmo" >> _ammo >> "AB_barrelLengths");
-};
-
-if (count _muzzleVelocityTable != count _barrelLengthTable) exitWith { 0 };
-if (count _muzzleVelocityTable == 0 || count _barrelLengthTable == 0) exitWith { 0 };
-if (count _muzzleVelocityTable == 1) exitWith { (_muzzleVelocityTable select 0) - _muzzleVelocity };
-
-_lowerIndex = 0;
-_upperIndex = (count _barrelLengthTable) - 1;
-
-if (_barrelLength <= (_barrelLengthTable select _lowerIndex)) exitWith { (_muzzleVelocityTable select _lowerIndex) - _muzzleVelocity };
-if (_barrelLength >= (_barrelLengthTable select _upperIndex)) exitWith { (_muzzleVelocityTable select _upperIndex) - _muzzleVelocity };
-
-for "_i" from 0 to (count _barrelLengthTable) - 1 do {
- if (_barrelLength >= _barrelLengthTable select _i) then {
- _lowerIndex = _i;
- };
-};
-for "_i" from (count _barrelLengthTable) - 1 to 0 step -1 do {
- if (_barrelLength <= _barrelLengthTable select _i) then {
- _upperIndex = _i;
- };
-};
-
-_barrelLengthRatio = 0;
-if ((_barrelLengthTable select _upperIndex) - (_barrelLengthTable select _lowerIndex) > 0) then {
- _barrelLengthRatio = ((_barrelLengthTable select _upperIndex) - _barrelLength) / ((_barrelLengthTable select _upperIndex) - (_barrelLengthTable select _lowerIndex));
-};
-
-_muzzleVelocityNew = (_muzzleVelocityTable select _lowerIndex) + ((_muzzleVelocityTable select _upperIndex) - (_muzzleVelocityTable select _lowerIndex)) * (1 - _barrelLengthRatio);
-
-_muzzleVelocityNew - _muzzleVelocity
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_air_density.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_air_density.sqf
deleted file mode 100644
index 5cc23ad6ab..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_air_density.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_calculate_air_density.sqf
- * @Descr: Calculates air density based on atmospheric pressure, temperature and rel.humidity
- * @Author: Ruthberg
- *
- * @Arguments: [Temperature in C, Pressure in hPa, Relative Humidity as ratio 0.0-1.0]
- * @Return: [Air Density in kg/m^3]
- * @PublicAPI: true
- */
-
-
-#include "defines.h"
-
-private ["_temperature", "_pressure", "_relativeHumidity"];
-_temperature = _this select 0; // in C
-_pressure = _this select 1; // in hPa
-_relativeHumidity = _this select 2; // as ratio 0-1
-
-_pressure = _pressure * 100;
-
-if (_relativeHumidity > 0) then {
- private ["_pSat", "_vaporPressure", "_partialPressure"];
- // Saturation vapor pressure calculated according to: http://wahiduddin.net/calc/density_algorithms.htm
- _pSat = 6.1078 * 10 ^ ((7.5 * _temperature) / (_temperature + 237.3));
- _vaporPressure = _relativeHumidity * _pSat;
- _partialPressure = _pressure - _vaporPressure;
-
- (_partialPressure * DRY_AIR_MOLAR_MASS + _vaporPressure * WATER_VAPOR_MOLAR_MASS) / (UNIVERSAL_GAS_CONSTANT * KELVIN(_temperature))
-} else {
- _pressure / (SPECIFIC_GAS_CONSTANT_DRY_AIR * KELVIN(_temperature))
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_atmospheric_correction.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_atmospheric_correction.sqf
deleted file mode 100644
index bf47dec263..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_atmospheric_correction.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_calculate_atmospheric_correction.sqf
- * @Descr: ?
- * @Author: Ruthberg
- *
- * @Arguments: [Ballistic Coefficient, Temperature in C, Pressure in hPa, Relative Humidity as ratio in 0.0-1.0, Atm.Model = "ICAO" || "ASM"]
- * @Return: [Corrected Ballistic Coefficient]
- * @PublicAPI: true
- */
-
-
-#include "defines.h"
-
-private ["_ballisticCoefficient", "_temperature", "_pressure", "_relativeHumidity", "_atmosphereModel", "_airDensity"];
-_ballisticCoefficient = _this select 0;
-_temperature = _this select 1; // in C
-_pressure = _this select 2; // in hPa
-_relativeHumidity = _this select 3; // as ratio 0-1
-_atmosphereModel = _this select 4; // "ICAO" or "ASM"
-
-_airDensity = [_temperature, _pressure, _relativeHumidity] call cse_ab_ballistics_fnc_calculate_air_density;
-
-if (_atmosphereModel == "ICAO") then {
- (STD_AIR_DENSITY_ICAO / _airDensity) * _ballisticCoefficient
-} else {
- (STD_AIR_DENSITY_ASM / _airDensity) * _ballisticCoefficient
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_hellmann_exponent.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_hellmann_exponent.sqf
deleted file mode 100644
index 371718089c..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_hellmann_exponent.sqf
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * fn_calculate_hellmann_exponent.sqf
- * @Descr: Wikipedia: The Hellmann exponent depends upon the coastal location and the shape of the terrain on the ground, and the stability of the air.
- * @Author: Ruthberg
- *
- * @Arguments: [position in ASL format]
- * @Return: [Hellmann Exponent]
- * @PublicAPI: true
- */
-
-#include "defines.h"
-
-private ["_hellmann_exponents", "_hellmann_index", "_windSource", "_nearObjects", "_isWater"];
-
-// Source: https://en.wikipedia.org/wiki/Wind_gradient
-// Entries 0-2 -> open water surface; Entries 3-5 -> flat open coast; Entries 6-8 -> human inhabited areas
-// Sorting: open water surface/flat open coast/human inhabited areas & stable air/neutral air/unstable air
-_hellmann_exponents = [0.27, 0.10, 0.06, 0.40, 0.16, 0.11, 0.60, 0.34, 0.27];
-_hellmann_exponent = 0.14;
-
-_windSource = _this vectorDiff ((vectorNormalized wind) vectorMultiply 25);
-
-_nearObjects = count (_windSource nearObjects ["Building", 50]);
-_isWater = surfaceIsWater _this;
-
-_hellmann_index = 0 max floor(overcast * 3) min 2;
-
-if (_nearObjects >= 5) then {
- _hellmann_exponent = _hellmann_exponents select (_hellmann_index + 6);
-};
-if (_nearObjects < 5) then {
- _hellmann_exponent = _hellmann_exponents select (_hellmann_index + 3);
-};
-if (_nearObjects == 0 && _isWater) then {
- _hellmann_exponent = _hellmann_exponents select (_hellmann_index + 0);
-};
-
-_hellmann_exponent
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_retardation.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_retardation.sqf
deleted file mode 100644
index 3fcb3bc856..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_retardation.sqf
+++ /dev/null
@@ -1,129 +0,0 @@
-#include "defines.h"
-
-// Source: GNU Exterior Ballistics
-
-private ["_dragModel", "_dragCoefficient", "_velocity", "_A", "_M", "_result"];
-_dragModel = _this select 0;
-_dragCoefficient = _this select 1;
-_velocity = (_this select 2) * 3.2808399;
-
-_A = -1;
-_M = -1;
-_result = 0;
-
-switch _dragModel do {
- case 1:
- {
- switch true do {
- case (_velocity > 4230) : { _A = 0.0001477404177730177; _M = 1.9565; };
- case (_velocity > 3680) : { _A = 0.0001920339268755614; _M = 1.925 ; };
- case (_velocity > 3450) : { _A = 0.0002894751026819746; _M = 1.875 ; };
- case (_velocity > 3295) : { _A = 0.0004349905111115636; _M = 1.825 ; };
- case (_velocity > 3130) : { _A = 0.0006520421871892662; _M = 1.775 ; };
- case (_velocity > 2960) : { _A = 0.0009748073694078696; _M = 1.725 ; };
- case (_velocity > 2830) : { _A = 0.001453721560187286; _M = 1.675 ; };
- case (_velocity > 2680) : { _A = 0.002162887202930376; _M = 1.625 ; };
- case (_velocity > 2460) : { _A = 0.003209559783129881; _M = 1.575 ; };
- case (_velocity > 2225) : { _A = 0.003904368218691249; _M = 1.55 ; };
- case (_velocity > 2015) : { _A = 0.003222942271262336; _M = 1.575 ; };
- case (_velocity > 1890) : { _A = 0.002203329542297809; _M = 1.625 ; };
- case (_velocity > 1810) : { _A = 0.001511001028891904; _M = 1.675 ; };
- case (_velocity > 1730) : { _A = 0.0008609957592468259; _M = 1.75 ; };
- case (_velocity > 1595) : { _A = 0.0004086146797305117; _M = 1.85 ; };
- case (_velocity > 1520) : { _A = 0.0001954473210037398; _M = 1.95 ; };
- case (_velocity > 1420) : { _A = 0.00005431896266462351; _M = 2.125 ; };
- case (_velocity > 1360) : { _A = 0.000008847742581674416; _M = 2.375 ; };
- case (_velocity > 1315) : { _A = 0.000001456922328720298; _M = 2.625 ; };
- case (_velocity > 1280) : { _A = 0.0000002419485191895565; _M = 2.875 ; };
- case (_velocity > 1220) : { _A = 0.00000001657956321067612; _M = 3.25 ; };
- case (_velocity > 1185) : { _A = 0.0000000004745469537157371; _M = 3.75 ; };
- case (_velocity > 1150) : { _A = 0.00000000001379746590025088; _M = 4.25 ; };
- case (_velocity > 1100) : { _A = 0.0000000000004070157961147882; _M = 4.75 ; };
- case (_velocity > 1060) : { _A = 0.00000000000002938236954847331; _M = 5.125 ; };
- case (_velocity > 1025) : { _A = 0.00000000000001228597370774746; _M = 5.25 ; };
- case (_velocity > 980) : { _A = 0.00000000000002916938264100495; _M = 5.125 ; };
- case (_velocity > 945) : { _A = 0.0000000000003855099424807451; _M = 4.75 ; };
- case (_velocity > 905) : { _A = 0.00000000001185097045689854; _M = 4.25 ; };
- case (_velocity > 860) : { _A = 0.0000000003566129470974951; _M = 3.75 ; };
- case (_velocity > 810) : { _A = 0.00000001045513263966272; _M = 3.25 ; };
- case (_velocity > 780) : { _A = 0.0000001291159200846216; _M = 2.875 ; };
- case (_velocity > 750) : { _A = 0.0000006824429329105383; _M = 2.625 ; };
- case (_velocity > 700) : { _A = 0.000003569169672385163; _M = 2.375 ; };
- case (_velocity > 640) : { _A = 0.00001839015095899579; _M = 2.125 ; };
- case (_velocity > 600) : { _A = 0.00005711174688734240; _M = 1.950 ; };
- case (_velocity > 550) : { _A = 0.00009226557091973427; _M = 1.875 ; };
- case (_velocity > 250) : { _A = 0.00009337991957131389; _M = 1.875 ; };
- case (_velocity > 100) : { _A = 0.00007225247327590413; _M = 1.925 ; };
- case (_velocity > 65) : { _A = 0.00005792684957074546; _M = 1.975 ; };
- case (_velocity > 0) : { _A = 0.00005206214107320588; _M = 2.000 ; };
- };
- };
- case 2:
- {
- switch true do {
- case (_velocity > 1674) : { _A = 0.0079470052136733; _M = 1.36999902851493; };
- case (_velocity > 1172) : { _A = 0.00100419763721974; _M = 1.65392237010294; };
- case (_velocity > 1060) : { _A = 0.0000000000000000000000715571228255369; _M = 7.91913562392361; };
- case (_velocity > 949) : { _A = 0.000000000139589807205091; _M = 3.81439537623717; };
- case (_velocity > 670) : { _A = 0.000234364342818625; _M = 1.71869536324748; };
- case (_velocity > 335) : { _A = 0.000177962438921838; _M = 1.76877550388679; };
- case (_velocity > 0) : { _A = 0.0000518033561289704; _M = 1.98160270524632; };
- };
- };
- case 5:
- {
- switch true do {
- case (_velocity > 1730) : { _A = 0.00724854775171929; _M = 1.41538574492812; };
- case (_velocity > 1228) : { _A = 0.0000350563361516117; _M = 2.13077307854948; };
- case (_velocity > 1116) : { _A = 0.000000000000184029481181151; _M = 4.81927320350395; };
- case (_velocity > 1004) : { _A = 0.000000000000000000000134713064017409; _M = 7.8100555281422 ; };
- case (_velocity > 837) : { _A = 0.000000103965974081168; _M = 2.84204791809926; };
- case (_velocity > 335) : { _A = 0.0001093015938698234; _M = 1.81096361579504; };
- case (_velocity > 0) : { _A = 0.0000351963178524273; _M = 2.00477856801111; };
- };
- };
- case 6:
- {
- switch true do {
- case (_velocity > 3236) : { _A = 0.0455384883480781; _M = 1.15997674041274; };
- case (_velocity > 2065) : { _A = 0.07167261849653769; _M = 1.10704436538885; };
- case (_velocity > 1311) : { _A = 0.00166676386084348; _M = 1.60085100195952; };
- case (_velocity > 1144) : { _A = 0.000000101482730119215; _M = 2.9569674731838 ; };
- case (_velocity > 1004) : { _A = 0.00000000000000000431542773103552; _M = 6.34106317069757; };
- case (_velocity > 670) : { _A = 0.0000204835650496866; _M = 2.11688446325998; };
- case (_velocity > 0) : { _A = 0.0000750912466084823; _M = 1.92031057847052; };
- };
- };
- case 7:
- {
- switch true do {
- case (_velocity > 4200) : { _A = 0.00000000129081656775919; _M = 3.24121295355962; };
- case (_velocity > 3000) : { _A = 0.0171422231434847; _M = 1.27907168025204; };
- case (_velocity > 1470) : { _A = 0.00233355948302505; _M = 1.52693913274526; };
- case (_velocity > 1260) : { _A = 0.000797592111627665; _M = 1.67688974440324; };
- case (_velocity > 1110) : { _A = 0.00000000000571086414289273; _M = 4.3212826264889 ; };
- case (_velocity > 960) : { _A = 0.0000000000000000302865108244904; _M = 5.99074203776707; };
- case (_velocity > 670) : { _A = 0.00000752285155782535; _M = 2.1738019851075 ; };
- case (_velocity > 540) : { _A = 0.0000131766281225189; _M = 2.08774690257991; };
- case (_velocity > 0) : { _A = 0.0000134504843776525; _M = 2.08702306738884; };
- };
- };
- case 8:
- {
- switch true do {
- case (_velocity > 3571) : { _A = 0.0112263766252305; _M = 1.33207346655961; };
- case (_velocity > 1841) : { _A = 0.0167252613732636; _M = 1.28662041261785; };
- case (_velocity > 1120) : { _A = 0.00220172456619625; _M = 1.55636358091189; };
- case (_velocity > 1088) : { _A = 0.00000000000000020538037167098; _M = 5.80410776994789; };
- case (_velocity > 976) : { _A = 0.00000000000592182174254121; _M = 4.29275576134191; };
- case (_velocity > 0) : { _A = 0.000043917343795117; _M = 1.99978116283334; };
- };
- };
-};
-
-if (_A != -1 && _M != -1 && _velocity > 0 && _velocity < 10000) then {
- _result = _A * (_velocity ^ _M) / _dragCoefficient;
- _result = _result / 3.2808399;
-};
-
-_result
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_roughness_length.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_roughness_length.sqf
deleted file mode 100644
index 285f8e4dea..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_roughness_length.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "defines.h"
-
-private ["_roughness_lengths", "_windSource", "_nearBuildings", "_isWater"];
-
-// Source: http://es.ucsc.edu/~jnoble/wind/extrap/index.html
-_roughness_lengths = [0.0002, 0.0005, 0.0024, 0.03, 0.055, 0.1, 0.2, 0.4, 0.8, 1.6];
-
-_windSource = _this vectorDiff ((vectorNormalized wind) vectorMultiply 25);
-
-_nearBuildings = count (_windSource nearObjects ["Building", 50]);
-_isWater = surfaceIsWater _windSource;
-
-if (_nearBuildings == 0 && _isWater) exitWith {
- 0.0005
-};
-
-if (_nearBuildings >= 10) exitWith {
- 1.6
-};
-
-_roughness_lengths select (2 + (_nearBuildings min 6))
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_stability_factor.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_stability_factor.sqf
deleted file mode 100644
index c1a9f66bbd..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_stability_factor.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "defines.h"
-
-private ["_caliber", "_bulletLength", "_bulletMass", "_barrelTwist", "_muzzleVelocity", "_temperature", "_barometricPressure", "_l", "_t", "_stabilityFactor"];
-_caliber = _this select 0;
-_bulletLength = _this select 1;
-_bulletMass = _this select 2;
-_barrelTwist = _this select 3;
-_muzzleVelocity = _this select 4;
-_temperature = _this select 5;
-_barometricPressure = _this select 6;
-
-// Source: http://www.jbmballistics.com/ballistics/bibliography/articles/miller_stability_1.pdf
-_t = _barrelTwist / _caliber;
-_l = _bulletLength / _caliber;
-
-_stabilityFactor = 30 * _bulletMass / (_t^2 * _caliber^3 * _l * (1 + _l^2));
-
-_muzzleVelocity = _muzzleVelocity * 3.2808399;
-if (_muzzleVelocity > 1120) then {
- _stabilityFactor = _stabilityFactor * (_muzzleVelocity / 2800) ^ (1/3);
-} else {
- _stabilityFactor = _stabilityFactor * (_muzzleVelocity / 1120) ^ (1/3);
-};
-
-_stabilityFactor = _stabilityFactor * (_temperature + 273) / (15 + 273) * 1013.25 / _barometricPressure;
-
-_stabilityFactor
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_wind_speed.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_wind_speed.sqf
deleted file mode 100644
index 51221f9057..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_calculate_wind_speed.sqf
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "defines.h"
-
-private ["_windSpeed", "_windDir", "_height", "_newWindSpeed", "_windSource", "_roughnessLength"];
-
-fnc_polar2vect = {
- private ["_mag2D"];
- _mag2D = (_this select 0) * cos((_this select 2));
- [_mag2D * sin((_this select 1)), _mag2D * cos((_this select 1)), (_this select 0) * sin((_this select 2))];
-};
-
-_windSpeed = vectorMagnitude wind;
-_windDir = (wind select 0) atan2 (wind select 1);
-
-// Wind gradient
-if (_windSpeed > 0.05) then {
- _height = (ASLToATL _this) select 2;
- _height = 0 max _height min 20;
- if (_height < 20) then {
- _roughnessLength = _this call cse_ab_ballistics_fnc_calculate_roughness_length;
- _windSpeed = _windSpeed * ln(_height / _roughnessLength) / ln(20 / _roughnessLength);
- };
-};
-
-// Terrain effect on wind
-if (_windSpeed > 0.05) then {
- _newWindSpeed = 0;
- {
- _windSource = [100, _windDir + 180, _x] call fnc_polar2vect;
- if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith {
- _newWindSpeed = cos(_x * 9) * _windSpeed;
- };
- _windSource = [100, _windDir + 180 + _x, 0] call fnc_polar2vect;
- if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith {
- _newWindSpeed = cos(_x * 9) * _windSpeed;
- };
- _windSource = [100, _windDir + 180 - _x, 0] call fnc_polar2vect;
- if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith {
- _newWindSpeed = cos(_x * 9) * _windSpeed;
- };
- } forEach [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
- _windSpeed = _newWindSpeed;
-};
-
-// Obstacle effect on wind
-if (_windSpeed > 0.05) then {
- _newWindSpeed = 0;
- {
- _windSource = [20, _windDir + 180, _x] call fnc_polar2vect;
- if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith {
- _newWindSpeed = cos(_x * 2) * _windSpeed;
- };
- _windSource = [20, _windDir + 180 + _x, 0] call fnc_polar2vect;
- if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith {
- _newWindSpeed = cos(_x * 2) * _windSpeed;
- };
- _windSource = [20, _windDir + 180 - _x, 0] call fnc_polar2vect;
- if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith {
- _newWindSpeed = cos(_x * 2) * _windSpeed;
- };
- } forEach [0, 5, 10, 15, 20, 25, 30, 35, 40, 45];
- _windSpeed = _newWindSpeed;
-};
-_windSpeed = 0 max _windSpeed;
-
-_windSpeed
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_climate_simulation.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_climate_simulation.sqf
deleted file mode 100644
index 4e13f01706..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_climate_simulation.sqf
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "defines.h"
-
-private ["_time", "_timeRatio", "_month", "_avgTemperature", "_pS1", "_pS2", "_cse_AB_Day_Temperature", "_cse_AB_Night_Temperature", "_cse_AB_Humidity"];
-_cse_AB_Day_Temperature = [1, 3, 9, 14, 19, 23, 25, 24, 21, 13, 7, 2];
-_cse_AB_Night_Temperature = [-4, -3, 0, 4, 9, 12, 14, 14, 10, 6, 2, -2];
-_cse_AB_Humidity = [82, 80, 78, 70, 71, 72, 70, 73, 78, 80, 83, 82];
-
-// Climate graphs
-if (toLower worldName in ["chernarus", "bootcamp_acr", "woodland_acr", "utes"]) then {
- // Source: http://www.iten-online.ch/klima/europa/tschechien/prag.htm
- _cse_AB_Day_Temperature = [1, 3, 9, 14, 19, 23, 25, 24, 21, 13, 7, 2];
- _cse_AB_Night_Temperature = [-4, -3, 0, 4, 9, 12, 14, 14, 10, 6, 2, -2];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,Prague,Czech-Republic
- _cse_AB_Humidity = [82, 80, 78, 70, 71, 72, 70, 73, 78, 80, 83, 82];
-};
-
-if (toLower worldName in ["altis", "stratis"]) then {
- // Source: http://www.iten-online.ch/klima/europa/griechenland/limnos.htm
- _cse_AB_Day_Temperature = [10, 10, 12, 16, 21, 26, 29, 28, 25, 20, 15, 11];
- _cse_AB_Night_Temperature = [4, 4, 6, 8, 13, 17, 20, 20, 16, 12, 8, 6];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,Limnos,Greece
- _cse_AB_Humidity = [78, 77, 78, 74, 71, 60, 59, 61, 65, 72, 79, 80];
-};
-
-if (toLower worldName in ["takistan", "zargabad", "mountains_acr", "shapur_baf", "provinggrounds_pmc"]) then {
- // Source: http://www.iten-online.ch/klima/asien/afghanistan/kabul.htm
- _cse_AB_Day_Temperature = [4.5, 5.5, 12.5, 19.2, 24.4, 30.2, 32.1, 32, 28.5, 22.4, 15, 8.3];
- _cse_AB_Night_Temperature = [-7.1, -5.7, 0.7, 6, 8.8, 12.4, 15.3, 14.3, 9.4, 3.9, -1.2, -4.7];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,Kabul,Afghanistan
- _cse_AB_Humidity = [68, 69, 62, 60, 49, 37, 38, 39, 40, 41, 56, 61];
-};
-
-if (toLower worldName in ["fallujah"]) then {
- // Source: http://www.iten-online.ch/klima/asien/irak/bagdad.htm
- _cse_AB_Day_Temperature = [16, 19, 23, 29, 36, 41, 43, 43, 40, 33, 24, 17];
- _cse_AB_Night_Temperature = [4, 6, 10, 15, 20, 23, 25, 25, 21, 16, 10, 5];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,Bagdad,Iraq
- _cse_AB_Humidity = [69, 60, 55, 50, 36, 23, 21, 22, 29, 38, 58, 68];
-};
-
-if (toLower worldName in ["fata", "Abbottabad"]) then {
- // Source: http://www.iten-online.ch/klima/asien/pakistan/zhob.htm
- _cse_AB_Day_Temperature = [12.4, 15.8, 20.8, 26.9, 32.8, 37, 36.8, 35.9, 33.8, 28.2, 22.2, 16.2];
- _cse_AB_Night_Temperature = [-0.6, 2.4, 7.4, 13.1, 18.2, 22.8, 23.8, 22.9, 19.2, 12, 5.6, 1.2];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,Zhob,Pakistan
- _cse_AB_Humidity = [50, 40, 42, 40, 30, 30, 50, 49, 40, 32, 38, 41];
-};
-
-if (worldName in ["sfp_wamako"]) then {
- // Source: http://www.iten-online.ch/klima/afrika/niger/tahoua.htm
- _cse_AB_Day_Temperature = [33.4, 35, 38.4, 41.5, 41.4, 40, 35.6, 32.9, 35.8, 38.2, 36.4, 33.1];
- _cse_AB_Night_Temperature = [14.9, 16.3, 20.4, 23.7, 25.8, 24.8, 23.1, 22, 22.6, 21.6, 18.6, 15.3];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,Tahoua,Niger
- _cse_AB_Humidity = [68, 60, 57, 50, 32, 22, 20, 21, 25, 38, 58, 69];
-};
-
-if (worldName in ["sfp_sturko"]) then {
- // Source: http://www.iten-online.ch/klima/afrika/niger/tahoua.htm
- _cse_AB_Day_Temperature = [2.2, 2.4, 5.1, 10.2, 16.1, 20.1, 21.1, 20.9, 17.2, 12.7, 7.4, 3.9];
- _cse_AB_Night_Temperature = [-2, -2.3, -0.7, 2.6, 7.1, 11.4, 13.1, 12.7, 10, 6.9, 3.1, -0.1];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,karlskrona,Sweden
- _cse_AB_Humidity = [86, 85, 80, 72, 68, 69, 74, 77, 79, 81, 86, 88];
-};
-
-if (worldName in ["Bornholm"]) then {
- // Source: http://www.iten-online.ch/klima/afrika/niger/tahoua.htm
- _cse_AB_Day_Temperature = [1.9, 1.7, 3.8, 8.1, 14, 18.1, 19.6, 19.8, 16.2, 11.9, 7.3, 3.9];
- _cse_AB_Night_Temperature = [-1.6, -2.1, -0.7, 1.7, 6.2, 10.7, 13, 13.1, 10.6, 7.2, 3.5, 0.1];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,allinge,Denmark
- _cse_AB_Humidity = [85, 84, 80, 76, 69, 69, 76, 77, 79, 81, 86, 86];
-};
-if (worldName in ["Imrali"]) then {
- // Source: http://www.iten-online.ch/klima/europa/tuerkei/bursa.htm
- _cse_AB_Day_Temperature = [9.3, 10.7, 13.6, 18.8, 23.5, 28.2, 30.3, 30.2, 27, 21.4, 16.5, 11.8];
- _cse_AB_Night_Temperature = [1.4, 2.4, 3.7, 7.1, 10.9, 14.3, 16.5, 16.3, 13, 9.5, 6, 3.8];
-
- // Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,Bursa,Turkey
- _cse_AB_Humidity = [78, 75, 70, 70, 71, 61, 58, 59, 63, 69, 77, 76];
-};
-
-while {true} do
-{
- _time = daytime;
- _month = date select 1;
-
- // Temperature
- _timeRatio = abs(_time - 12) / 12;
-
- cse_AB_Temperature = (_cse_AB_Day_Temperature select (_month - 1)) * (1 - _timeRatio) + (_cse_AB_Night_Temperature select (_month - 1)) * _timeRatio;
- cse_AB_Temperature = cse_AB_Temperature + cse_AB_temperatureShift - cse_AB_badWeatherShift * overcast;
- cse_AB_Temperature = round(cse_AB_Temperature * 10) / 10;
-
- // Humidity
- cse_AB_Humidity = (_cse_AB_Humidity select _month) / 100;
- cse_AB_Humidity = cse_AB_Humidity + cse_AB_humidityShift;
-
- if (rain > 0 && overcast > 0.7) then {
- cse_AB_Humidity = 1;
- } else {
- _avgTemperature = ((_cse_AB_Day_Temperature select (_month - 1)) + (_cse_AB_Night_Temperature select (_month - 1))) / 2;
- _pS1 = 6.112 * exp((17.62 * _avgTemperature) / (243.12 + _avgTemperature));
- _PS2 = 6.112 * exp((17.62 * cse_AB_Temperature) / (243.12 + cse_AB_Temperature));
- cse_AB_Humidity = cse_AB_Humidity * _PS1 / _PS2;
- };
-
- cse_AB_Humidity = 0 max cse_AB_Humidity min 1;
-
- sleep 60;
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_display_protractor.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_display_protractor.sqf
deleted file mode 100644
index e8212cf6ba..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_display_protractor.sqf
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "defines.h"
-
-#define __dsp (uiNamespace getVariable "RscProtractor")
-#define __ctrl1 (__dsp displayCtrl 132950)
-#define __ctrl2 (__dsp displayCtrl 132951)
-
-private ["_inclinationAngle", "_refPosition"];
-
-if (cse_AB_Protractor) exitWith {
- cse_AB_Protractor = false;
- 1 cutText ["", "PLAIN"];
- true
-};
-if (weaponLowered player) exitWith { true };
-if (vehicle player != player) exitWith { true };
-if (currentWeapon player != primaryWeapon player) exitWith { true };
-
-[] spawn {
- 2 cutText ["", "PLAIN"];
- cse_AB_WindInfo = false;
- 0 cutText ["", "PLAIN"];
- cse_AB_Protractor = true;
-
- while {cse_AB_Protractor && !(weaponLowered player) && currentWeapon player == primaryWeapon player} do {
- _refPosition = [SafeZoneX + 0.001, SafeZoneY + 0.001, 0.2, 0.2 * 4/3];
-
- _inclinationAngle = asin((player weaponDirection currentWeapon player) select 2);
- _inclinationAngle = -58 max _inclinationAngle min 58;
-
- 1 cutRsc ["RscProtractor", "PLAIN", 1, false];
-
- __ctrl1 ctrlSetScale 0.75;
- __ctrl1 ctrlCommit 0;
- __ctrl1 ctrlSetText "cse\cse_sys_ballistics\advancedballistics\data\protractor.paa";
- __ctrl1 ctrlSetTextColor [1, 1, 1, 1];
-
- __ctrl2 ctrlSetScale 0.75;
- __ctrl2 ctrlSetPosition [(_refPosition select 0), (_refPosition select 1) - 0.0012 * _inclinationAngle, (_refPosition select 2), (_refPosition select 3)];
- __ctrl2 ctrlCommit 0;
- __ctrl2 ctrlSetText "cse\cse_sys_ballistics\advancedballistics\data\protractor_marker.paa";
- __ctrl2 ctrlSetTextColor [1, 1, 1, 1];
-
- sleep 0.1;
- };
-
- cse_AB_Protractor = false;
- 1 cutText ["", "PLAIN"];
-};
-
-true
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_display_wind_info.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_display_wind_info.sqf
deleted file mode 100644
index 373621fde7..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_display_wind_info.sqf
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "defines.h"
-
-#define __dsp (uiNamespace getVariable "RscWindIntuitive")
-#define __ctrl (__dsp displayCtrl 132948)
-
-private ["_windSpeed", "_windDir", "_playerDir", "_windIndex", "_windColor", "_newWindSpeed", "_windSource", "_height"];
-
-if (cse_AB_WindInfo) exitWith {
- cse_AB_WindInfo = false;
- 0 cutText ["", "PLAIN"];
- true
-};
-if (underwater player) exitWith { true };
-if (vehicle player != player) exitWith { true };
-
-[] spawn {
- 2 cutText ["", "PLAIN"];
- cse_AB_Protractor = false;
- 1 cutText ["", "PLAIN"];
- cse_AB_WindInfo = true;
-
- while {cse_AB_WindInfo && !(underwater player) && vehicle player == player} do {
- _windIndex = 12;
- _windColor = [1, 1, 1, 1];
-
- _windSpeed = (eyePos player) call cse_ab_ballistics_fnc_calculate_wind_speed;
-
- if (_windSpeed > 0.2) then {
- _playerDir = getDir player;
- _windDir = (wind select 0) atan2 (wind select 1);
- _windIndex = round(((_playerDir - _windDir + 360) % 360) / 30);
- _windIndex = _windIndex % 12;
- };
-
- // Color Codes from https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale
- if (_windSpeed > 0.3) then { _windColor = [0.796, 1, 1, 1]; };
- if (_windSpeed > 1.5) then { _windColor = [0.596, 0.996, 0.796, 1]; };
- if (_windSpeed > 3.3) then { _windColor = [0.596, 0.996, 0.596, 1]; };
- if (_windSpeed > 5.4) then { _windColor = [0.6, 0.996, 0.4, 1]; };
- if (_windSpeed > 7.9) then { _windColor = [0.6, 0.996, 0.047, 1]; };
- if (_windSpeed > 10.7) then { _windColor = [0.8, 0.996, 0.059, 1]; };
- if (_windSpeed > 13.8) then { _windColor = [1, 0.996, 0.067, 1]; };
- if (_windSpeed > 17.1) then { _windColor = [1, 0.796, 0.051, 1]; };
- if (_windSpeed > 20.7) then { _windColor = [1, 0.596, 0.039, 1]; };
- if (_windSpeed > 24.4) then { _windColor = [1, 0.404, 0.031, 1]; };
- if (_windSpeed > 28.4) then { _windColor = [1, 0.22, 0.027, 1]; };
- if (_windSpeed > 32.6) then { _windColor = [1, 0.078, 0.027, 1]; };
-
- 0 cutRsc ["RscWindIntuitive", "PLAIN", 1, false];
-
- __ctrl ctrlSetScale 0.75;
- __ctrl ctrlCommit 0;
-
- __ctrl ctrlSetText format["cse\cse_sys_ballistics\advancedballistics\data\wind%1.paa", _windIndex];
- __ctrl ctrlSetTextColor _windColor;
-
- sleep 0.5;
- };
-
- cse_AB_WindInfo = false;
- 0 cutText ["", "PLAIN"];
-};
-
-true
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_get_humidity_at_height.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_get_humidity_at_height.sqf
deleted file mode 100644
index 76d6903cdf..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_get_humidity_at_height.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "defines.h"
-
-private ["_fogValue", "_fogDecay", "_fogBase"];
-
-if (cse_AB_Humidity < 1 && fog > 0) then {
- _fogValue = fogParams select 0;
- _fogDecay = fogParams select 1;
- _fogBase = fogParams select 2;
- _fogDensity = 1 - 0.05 * (_fogDecay / _fogValue * (_this - _fogBase))^2;
- if (_fogDensity > 0) then {
- 1
- } else {
- cse_AB_Humidity + (1 - cse_AB_Humidity) * (0 max (1 + _fogDensity))
- };
-} else {
- cse_AB_Humidity
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_get_temperature_at_height.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_get_temperature_at_height.sqf
deleted file mode 100644
index b9c3207518..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_get_temperature_at_height.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "defines.h"
-
-GET_TEMPERATURE_AT_HEIGHT(_this)
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_initialize_terrain_extension.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_initialize_terrain_extension.sqf
deleted file mode 100644
index 014de5c4ac..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_initialize_terrain_extension.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-if (!cse_AB_UseDLL) exitWith {};
-
-[] spawn {
- private ["_initStartTime", "_mapSize", "_mapGrids", "_gridCenter", "_gridHeight", "_gridNumObjects", "_gridSurfaceIsWater"];
-
- _initStartTime = time;
- _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");
-
- if (("AdvancedBallistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
- if (cse_AB_InitMessageEnabled) then {
- systemChat "AdvancedBallistics: Terrain already initialized";
- };
- };
-
- _mapGrids = ceil(_mapSize / 50);
-
- for "_x" from 0 to _mapGrids * 50 step 50 do {
- for "_y" from 0 to _mapGrids * 50 step 50 do {
- _gridCenter = [_x + 25, _y + 25];
- _gridHeight = round(getTerrainHeightASL _gridCenter);
- _gridNumObjects = count (_gridCenter nearObjects ["Building", 50]);
- _gridSurfaceIsWater = if (surfaceIsWater _gridCenter) then {1} else {0};
- "AdvancedBallistics" callExtension format["set:%1:%2:%3", _gridHeight, _gridNumObjects, _gridSurfaceIsWater];
- };
- sleep 0.001;
- };
-
- if (cse_AB_InitMessageEnabled) then {
- systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(time - _initStartTime)];
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_mirage_simulation.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_mirage_simulation.sqf
deleted file mode 100644
index 3c7c01464d..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_mirage_simulation.sqf
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "defines.h"
-
-private ["_opticsName", "_parallax", "_playerDirection", "_vectorToFocalPoint", "_focusLength", "_focalPoint", "_roughnessLength", "_distCoef", "_focalPlaneAngle", "_windSpeedRef", "_windSpeed",
- "_particleSize", "_particleMoveVelocityRef", "_particleMoveVelocity", "_pASL", "_pATL", "_height"];
-
-while {cse_AB_MirageEnabled} do {
- _opticsName = currentWeapon player;
- if (currentWeapon player == primaryWeapon player && count primaryWeaponItems player > 2) then {
- _opticsName = (primaryWeaponItems player) select 2;
- };
- _parallax = player getVariable [format["cse_AB_Parallax:%1", _opticsName], 0];
-
- while {sunOrMoon == 1 && cameraView == "GUNNER" && _parallax > 0} do {
- _vectorToFocalPoint = (ATLToASL(screenToWorld [0.5,0.5])) vectorDiff (getPosASL player);
- _focusLength = vectorMagnitude _vectorToFocalPoint;
- if (_focusLength > 0) then {
- _vectorToFocalPoint = _vectorToFocalPoint vectorMultiply (_parallax / _focusLength);
- };
- _focusLength = vectorMagnitude _vectorToFocalPoint;
- _focalPoint = (getPosASL player) vectorAdd _vectorToFocalPoint;
-
- _roughnessLength = _focalPoint call cse_ab_ballistics_fnc_calculate_roughness_length;
- _distCoef = (1 max (_focusLength / 100)) ^ 0.5;
- _focalPlaneAngle = (getDir player) + 90;
- _windSpeedRef = vectorMagnitude wind;
- _particleSize = 0.5 * _distCoef;
- _particleMoveVelocityRef = [0, 0, 0.01] vectorAdd ((vectorNormalized wind) vectorMultiply (0.1));
- for "_j" from -10 to 10 do {
- for "_i" from -10 to 10 do {
- _pASL = [(_focalPoint select 0) + _j / 2 * _distCoef * sin(_focalPlaneAngle), (_focalPoint select 1) + _j / 2 * _distCoef * cos(_focalPlaneAngle), (_focalPoint select 2) + _i / 2 * _distCoef];
- _pATL = ASLToATL _pASL;
- _windSpeed = _windSpeedRef;
- _height = _pATL select 2;
- if (_height < 20) then {
- _windSpeed = _windSpeed * ln(_height / _roughnessLength) / ln(20 / _roughnessLength);
- };
- _particleMoveVelocity = _particleMoveVelocityRef vectorMultiply _windSpeed;
- drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,8,_pATL,_particleMoveVelocity,0,1.275,1,0,[_particleSize,_particleSize],[[0,0,0,0.3],[0,0,0,0.15]],[1,0],0,0,"","",""];
- };
- };
- _parallax = player getVariable [format["cse_AB_Parallax:%1", _opticsName], 0];
- sleep 1;
- };
- sleep 1;
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_synchronize_scope_zero.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_synchronize_scope_zero.sqf
deleted file mode 100644
index 13a8fb950a..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/functions/fn_synchronize_scope_zero.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "defines.h"
-
-private ["_opticsName", "_zeroPlayer", "_zeroProfileNamespace"];
-
-if (count primaryWeaponItems player > 2) then
-{
- _opticsName = (primaryWeaponItems player) select 2;
- _zeroPlayer = player getVariable [format["cse_AB_Zero:%1", _opticsName], 0];
- _zeroProfileNamespace = profileNamespace getVariable [format["cse_AB_Zero:%1", _opticsName], 0];
-
- if (_zeroProfileNamespace != 0 && _zeroPlayer != _zeroProfileNamespace) then {
- player setVariable [format["cse_AB_Zero:%1", _opticsName], _zeroProfileNamespace, true];
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/init.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/init.sqf
deleted file mode 100644
index 9fd1de801f..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/init.sqf
+++ /dev/null
@@ -1,36 +0,0 @@
-private ["_args"];
-_args = _this;
-{
- _varName = "cse_ab_"+(_x select 0);
- missionNamespace setvariable[_varName, _x select 1];
-}foreach _args;
-
-cse_ab_AdvancedBallistics = true;
-
-if (isNil "cse_AB_WindEnabled") then { cse_AB_WindEnabled = cse_AB_WIND_ENABLED };
-if (isNil "cse_AB_SpinDriftEnabled") then { cse_AB_SpinDriftEnabled = cse_AB_SPIN_DRIFT_ENABLED };
-if (isNil "cse_AB_CoriolisEnabled") then { cse_AB_CoriolisEnabled = cse_AB_CORIOLIS_ENABLED };
-if (isNil "cse_AB_EoetvoesEnabled") then { cse_AB_EoetvoesEnabled = cse_AB_EOETVOES_ENABLED };
-if (isNil "cse_AB_AdvancedAirDragEnabled") then { cse_AB_AdvancedAirDragEnabled = cse_AB_ADVANCED_AIR_DRAG_ENABLED };
-if (isNil "cse_AB_TransonicRegionEnabled") then { cse_AB_TransonicRegionEnabled = cse_AB_TRANSONIC_REGION_ENABLED };
-if (isNil "cse_AB_MilTurretsEnabled") then { cse_AB_MilTurretsEnabled = cse_AB_MIL_TURRETS_ENABLED };
-if (isNil "cse_AB_AmmoTemperatureEnabled") then { cse_AB_AmmoTemperatureEnabled = cse_AB_AMMO_TEMPERATURE_ENABLED };
-if (isNil "cse_AB_BulletTraceEnabled") then { cse_AB_BulletTraceEnabled = cse_AB_BULLET_TRACE_ENABLED };
-if (isNil "cse_AB_MirageEnabled") then { cse_AB_MirageEnabled = cse_AB_MIRAGE_ENABLED };
-if (isNil "cse_AB_AtmosphericDensitySimulationEnabled") then { cse_AB_AtmosphericDensitySimulationEnabled = cse_AB_ATMOSPHERIC_DENSITY_SIMULATION_ENABLED };
-if (isNil "cse_AB_BarrelLengthInfluenceEnabled") then { cse_AB_BarrelLengthInfluenceEnabled = cse_AB_BARREL_LENGTH_INFLUENCE };
-if (isNil "cse_AB_VehicleGunnerEnabled") then { cse_AB_VehicleGunnerEnabled = cse_AB_VEHICLE_GUNNER_ENABLED };
-if (isNil "cse_AB_ExtensionsEnabled") then { cse_AB_ExtensionsEnabled = cse_AB_EXTENSIONS_ENABLED };
-if (isNil "cse_AB_InitMessageEnabled") then { cse_AB_InitMessageEnabled = cse_AB_INIT_MESSAGE_ENABLED };
-if (isNil "cse_AB_OnlyActiveForLocalPlayer") then { cse_AB_OnlyActiveForLocalPlayer = cse_AB_ONLY_ACTIVE_FOR_LOCAL_PLAYER };
-if (isNil "cse_AB_OnlyActiveForPlayerGroup") then { cse_AB_OnlyActiveForPlayerGroup = cse_AB_ONLY_ACTIVE_FOR_PLAYER_GROUP };
-if (isNil "cse_AB_Precision") then { cse_AB_Precision = cse_AB_PRECISION };
-if (isNil "cse_AB_DisabledByDefault") then { cse_AB_DisabledByDefault = cse_AB_DISABLED_BY_DEFAULT in [true, 1] };
-
-if (isNil "cse_AB_temperatureShift") then { cse_AB_temperatureShift = (random 3) - (random 3); publicVariable "cse_AB_temperatureShift"; };
-if (isNil "cse_AB_badWeatherShift") then { cse_AB_badWeatherShift = (random 1)^2 * 10; publicVariable "cse_AB_badWeatherShift"; };
-if (isNil "cse_AB_humidityShift") then { cse_AB_humidityShift = ((random 5) - (random 5)) / 100; publicVariable "cse_AB_humidityShift"; };
-
-if (hasInterface) then {
- call compile preprocessFileLineNumbers "cse\cse_sys_ballistics\advancedballistics\initClient.sqf";
-};
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/initClient.sqf b/TO_MERGE/cse/sys_ballistics/advancedballistics/initClient.sqf
deleted file mode 100644
index b2f41b8a16..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/initClient.sqf
+++ /dev/null
@@ -1,169 +0,0 @@
-if (isNil "cse_AB_OnlyActiveForLocalPlayer") then { cse_AB_OnlyActiveForLocalPlayer = false; };
-if (isNil "cse_AB_DisabledInFullAutoMode") then { cse_AB_DisabledInFullAutoMode = false; };
-if (isNil "cse_AB_UseDLL") then { cse_AB_UseDLL = false; };
-
-if (cse_AB_ExtensionsEnabled && ("AdvancedBallistics" callExtension "version") == "1.0") then {
- cse_AB_UseDLL = true;
- cse_ab_ballistics_fnc_advanced_ballistics = cse_ab_ballistics_fnc_advanced_ballistics_extension;
-};
-
-cse_AB_bulletDatabase = [];
-cse_AB_bulletDatabaseStartTime = [];
-cse_AB_bulletDatabaseSpeed = [];
-cse_AB_bulletDatabaseFrames = [];
-cse_AB_bulletDatabaseLastFrame = [];
-cse_AB_bulletDatabaseHDeflect = [];
-cse_AB_bulletDatabaseSpinDrift = [];
-cse_AB_bulletDatabaseOccupiedIndices = [];
-cse_AB_bulletDatabaseFreeIndices = [];
-
-cse_AB_WindInfo = false;
-cse_AB_WindInfoStart = time;
-
-cse_AB_Protractor = false;
-cse_AB_ProtractorStart = time;
-
-cse_AB_Altitude = 0;
-cse_AB_Latitude = 50;
-
-cse_AB_Temperature = 15;
-cse_AB_Humidity = 50;
-
-if (worldName in ["Chernarus", "Bootcamp_ACR", "Woodland_ACR", "utes"]) then { cse_AB_Latitude = 50; cse_AB_Altitude = 0; };
-if (worldName in ["Altis", "Stratis"]) then { cse_AB_Latitude = 40; cse_AB_Altitude = 0; };
-if (worldName in ["Takistan", "Zargabad", "Mountains_ACR"]) then { cse_AB_Latitude = 35; cse_AB_Altitude = 2000; };
-if (worldName in ["Shapur_BAF", "ProvingGrounds_PMC"]) then { cse_AB_Latitude = 35; cse_AB_Altitude = 100; };
-if (worldName in ["fallujah"]) then { cse_AB_Latitude = 33; cse_AB_Altitude = 0; };
-if (worldName in ["fata", "Abbottabad"]) then { cse_AB_Latitude = 30; cse_AB_Altitude = 1000; };
-if (worldName in ["sfp_wamako"]) then { cse_AB_Latitude = 14; cse_AB_Altitude = 0; };
-if (worldName in ["sfp_sturko"]) then { cse_AB_Latitude = 56; cse_AB_Altitude = 0; };
-if (worldName in ["Bornholm"]) then { cse_AB_Latitude = 55; cse_AB_Altitude = 0; };
-if (worldName in ["Imrali"]) then { cse_AB_Latitude = 40; cse_AB_Altitude = 0; };
-if (worldName in ["Caribou"]) then { cse_AB_Latitude = 68; cse_AB_Altitude = 0; };
-if (worldName in ["Namalsk"]) then { cse_AB_Latitude = 65; cse_AB_Altitude = 0; };
-if (worldName in ["MCN_Aliabad"]) then { cse_AB_Latitude = 36; cse_AB_Altitude = 0; };
-if (worldName in ["Clafghan"]) then { cse_AB_Latitude = 34; cse_AB_Altitude = 640; };
-if (worldName in ["Sangin", "hellskitchen"]) then { cse_AB_Latitude = 32; cse_AB_Altitude = 0; };
-if (worldName in ["Sara"]) then { cse_AB_Latitude = 40; cse_AB_Altitude = 0; };
-if (worldName in ["reshmaan"]) then { cse_AB_Latitude = 35; cse_AB_Altitude = 2000; };
-if (worldName in ["Thirsk"]) then { cse_AB_Latitude = 65; cse_AB_Altitude = 0; };
-if (worldName in ["lingor"]) then { cse_AB_Latitude = -4; cse_AB_Altitude = 0; };
-
-waitUntil {!isNil "cse_gui"};
-waitUntil {!isNull player};
-
-if (isNil {player getVariable "cse_enabled_AdvancedBallistics"}) then {
- player setVariable ["cse_enabled_AdvancedBallistics", !cse_AB_DisabledByDefault, true];
-};
-
-if (cse_AB_MilTurretsEnabled) then {
- // Elevation minor step up
- ["cse_sys_ballistics_AB_Adjustment_Up", (["cse_sys_ballistics_AB_Adjustment_Up","action",[200, 0,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [0, false] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Up","action", "Minor adjustment up", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- // Elevation minor step down
- ["cse_sys_ballistics_AB_Adjustment_Down", (["cse_sys_ballistics_AB_Adjustment_Down","action",[208, 0,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [1, false] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Down","action", "Minor adjustment Down", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- // Windage minor step left
- ["cse_sys_ballistics_AB_Adjustment_Left", (["cse_sys_ballistics_AB_Adjustment_Left","action",[203, 0,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [2, false] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Left","action", "Minor adjustment Left", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- // Windage minor step right
- ["cse_sys_ballistics_AB_Adjustment_Right", (["cse_sys_ballistics_AB_Adjustment_Right","action",[205, 0,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [3, false] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Right","action", "Minor adjustment Right", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- // Elevation major step up
- ["cse_sys_ballistics_AB_Adjustment_Up_major", (["cse_sys_ballistics_AB_Adjustment_Up_major","action",[200, 1,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [0, true] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Up_major","action", "Major adjustment up", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- // Elevation major step down
- ["cse_sys_ballistics_AB_Adjustment_Down_major", (["cse_sys_ballistics_AB_Adjustment_Down_major","action",[208, 1,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [1, true] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Down_major","action", "Major adjustment Down", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- // Windage major step left
- ["cse_sys_ballistics_AB_Adjustment_Left_major", (["cse_sys_ballistics_AB_Adjustment_Left_major","action",[203, 1,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [2, true] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Left_major","action", "Major adjustment Left_major", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- // Windage major step right
- ["cse_sys_ballistics_AB_Adjustment_Right_major", (["cse_sys_ballistics_AB_Adjustment_Right_major","action",[205, 1,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [3, true] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Right_major","action", "Major adjustment Right", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- // Scope zero adjustment
- ["cse_sys_ballistics_AB_Adjustment_Zero_Up", (["cse_sys_ballistics_AB_Adjustment_Zero_Up","action",[200, 1,1,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [4, false] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
- ["cse_sys_ballistics_AB_Adjustment_Zero_Up","action", "Zero adjustment up", "Zero adjustment up"] call cse_fnc_settingsDefineDetails_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Zero_Down", (["cse_sys_ballistics_AB_Adjustment_Zero_Down","action",[208, 1,1,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [5, false] call cse_ab_ballistics_fnc_adjust_turret;
- }] call cse_fnc_addKeyBindingForAction_F;
- ["cse_sys_ballistics_AB_Adjustment_Zero_Down","action", "Zero adjustment down", "Zero adjustment down"] call cse_fnc_settingsDefineDetails_F;
-};
-
-// Parallax Adjustment
-if (cse_AB_MirageEnabled) then {
- ["cse_sys_ballistics_AB_Adjustment_Parallax_Up", (["cse_sys_ballistics_AB_Adjustment_Parallax_Up","action",[200, 0,1,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- 0 call cse_ab_ballistics_fnc_adjust_parallax;
- }] call cse_fnc_addKeyBindingForAction_F;
- ["cse_sys_ballistics_AB_Adjustment_Parallax_Up","action", "Parallax adjustment up", "Parallax adjustment up"] call cse_fnc_settingsDefineDetails_F;
-
- ["cse_sys_ballistics_AB_Adjustment_Parallax_Down", (["cse_sys_ballistics_AB_Adjustment_Parallax_Down","action",[208, 0,1,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- 1 call cse_ab_ballistics_fnc_adjust_parallax;
- }] call cse_fnc_addKeyBindingForAction_F;
- ["cse_sys_ballistics_AB_Adjustment_Parallax_Down","action", "Parallax adjustment down", "Parallax adjustment down"] call cse_fnc_settingsDefineDetails_F;
-};
-
-// Show wind Info
-["cse_sys_ballistics_AB_Display_Wind_Info", (["cse_sys_ballistics_AB_Display_Wind_Info","action",[37,1,0,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- _this call cse_ab_ballistics_fnc_display_wind_info;
- }] call cse_fnc_addKeyBindingForAction_F;
-["cse_sys_ballistics_AB_Display_Wind_Info","action", "Show wind info", "Show wind info"] call cse_fnc_settingsDefineDetails_F;
-
-// Show protractor
-["cse_sys_ballistics_AB_Display_Protractor", (["cse_sys_ballistics_AB_Display_Protractor","action",[37,1,1,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- _this call cse_ab_ballistics_fnc_display_protractor;
- }] call cse_fnc_addKeyBindingForAction_F;
-["cse_sys_ballistics_AB_Display_Protractor","action", "Show protractor", "Show protractor"] call cse_fnc_settingsDefineDetails_F;
-
-_handle = _this spawn cse_ab_ballistics_fnc_climate_simulation;
-_handle = _this spawn cse_ab_ballistics_fnc_mirage_simulation;
-_handle = _this spawn cse_ab_ballistics_fnc_initialize_terrain_extension;
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/license.txt b/TO_MERGE/cse/sys_ballistics/advancedballistics/license.txt
deleted file mode 100644
index eb925e129b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/license.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) <2014>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/sound/scope_click.wav b/TO_MERGE/cse/sys_ballistics/advancedballistics/sound/scope_click.wav
deleted file mode 100644
index fada577045..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/advancedballistics/sound/scope_click.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/advancedballistics/ui/rscTitles.h b/TO_MERGE/cse/sys_ballistics/advancedballistics/ui/rscTitles.h
deleted file mode 100644
index 4d6ab56696..0000000000
--- a/TO_MERGE/cse/sys_ballistics/advancedballistics/ui/rscTitles.h
+++ /dev/null
@@ -1,92 +0,0 @@
-class RscTitles
-{
- class RscWindIntuitive
- {
- idd=-1;
- onLoad="with uiNameSpace do { RscWindIntuitive = _this select 0 };";
- movingEnable=0;
- duration=60;
- fadeIn="false";
- fadeOut="false";
- class controls
- {
- class RscWindIntuitive
- {
- idc=132948;
- type=0;
- style=48;
- font="TahomaB";
- colorBackground[]={0,0,0,0};
- colorText[]={0,0,0,0};
- x="SafeZoneX + 0.001";
- y="SafeZoneY + 0.001";
- w=0.2;
- h=0.2*4/3;
- size=0.034;
- sizeEx=0.027;
- text="";
- };
- };
- };
-
- class RscTurretDial
- {
- idd=-1;
- onLoad="with uiNameSpace do { RscTurretDial = _this select 0 };";
- movingEnable=0;
- duration=5;
- fadeIn="false";
- fadeOut="false";
- class controls
- {
- class RscTurretDial
- {
- idc=132949;
- type=0;
- style=128;
- font="TahomaB";
- colorBackground[]={0,0,0,0.8};
- colorText[]={1,1,1,1};
- x="SafeZoneX + 0.0025";
- y="SafeZoneY + 0.0025";
- w=0.10;
- h=0.05;
- sizeEx=0.03;
- text="";
- };
- };
- };
-
- class RscProtractor
- {
- idd=-1;
- onLoad="with uiNameSpace do { RscProtractor = _this select 0 };";
- movingEnable=0;
- duration=60;
- fadeIn="false";
- fadeOut="false";
- class controls
- {
- class RscProtractorBase
- {
- idc=132950;
- type=0;
- style=48;
- font="TahomaB";
- colorBackground[]={0,0,0,0};
- colorText[]={1,1,1,1};
- x="SafeZoneX + 0.001";
- y="SafeZoneY + 0.001";
- w=0.2;
- h=0.2*4/3;
- size=0.034;
- sizeEx=0.027;
- text="";
- };
- class RscProtractorMarker : RscProtractorBase
- {
- idc=132951;
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/CfgFunctions.h b/TO_MERGE/cse/sys_ballistics/atragmx/CfgFunctions.h
deleted file mode 100644
index 965add7ff7..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/CfgFunctions.h
+++ /dev/null
@@ -1,48 +0,0 @@
-class cfgFunctions {
- class CSE_ab_atragmx
- {
- class Atragmx {
- file = "cse\cse_sys_ballistics\atragmx\functions";
- class add_new_gun { recompile = 1; };
- class calculate_range_card { recompile = 1; };
- class calculate_scope_base_angle { recompile = 1; };
- class calculate_solution { recompile = 1; };
- class calculate_target_range_assist { recompile = 1; };
- class calculate_target_solution { recompile = 1; };
- class calculate_target_speed_assist { recompile = 1; };
- class change_gun { recompile = 1; };
- class create_dialog { recompile = 1; };
- class cycle_range_card_columns { recompile = 1; };
- class cycle_scope_unit { recompile = 1; };
- class delete_gun { recompile = 1; };
- class parse_input { recompile = 1; };
- class reset_relative_click_memory { recompile = 1; };
- class save_gun { recompile = 1; };
- class show_add_new_gun { recompile = 1; };
- class show_gun_list { recompile = 1; };
- class show_main_page { recompile = 1; };
- class show_range_card { recompile = 1; };
- class show_range_card_setup { recompile = 1; };
- class show_target_range_assist { recompile = 1; };
- class show_target_speed_assist { recompile = 1; };
- class show_target_speed_assist_timer { recompile = 1; };
- class sord { recompile = 1; };
- class target_speed_assist_timer { recompile = 1; };
- class toggle_gun_list { recompile = 1; };
- class toggle_range_card { recompile = 1; };
- class toggle_range_card_setup { recompile = 1; };
- class toggle_target_range_assist { recompile = 1; };
- class toggle_target_speed_assist { recompile = 1; };
- class update_atmosphere { recompile = 1; };
- class update_gun { recompile = 1; };
- class update_range_card { recompile = 1; };
- class update_relative_click_memory { recompile = 1; };
- class update_result { recompile = 1; };
- class update_scope_unit { recompile = 1; };
- class update_target { recompile = 1; };
- class update_target_selection { recompile = 1; };
- class update_unit_selection { recompile = 1; };
- class update_zero_range { recompile = 1; };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/CfgVehicles.h b/TO_MERGE/cse/sys_ballistics/atragmx/CfgVehicles.h
deleted file mode 100644
index f7e32ea91b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/CfgVehicles.h
+++ /dev/null
@@ -1,38 +0,0 @@
-class CfgVehicles
-{
- class Item_Base_F;
- class cse_ab_Item_ATragMX: Item_Base_F
- {
- scope=2;
- scopeCurator=2;
- displayName="ATragMX";
- author="Ruthberg";
- vehicleClass="Items";
- class TransportItems
- {
- class cse_ab_ATragMX
- {
- name="cse_ab_ATragMX";
- count=1;
- };
- };
- };
-
-
- class NATO_Box_Base;
- class cse_ballisticsItemsCrate: NATO_Box_Base
- {
- scope = 2;
- displayName = "Ballistic Items [CSE]";
- author = "Combat Space Enhancement";
- model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
- class TransportWeapons
- {
- class _xx_cse_ab_ATragMX
- {
- weapon="cse_ab_ATragMX";
- count=5;
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/CfgWeapons.h b/TO_MERGE/cse/sys_ballistics/atragmx/CfgWeapons.h
deleted file mode 100644
index e0f74507cb..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/CfgWeapons.h
+++ /dev/null
@@ -1,20 +0,0 @@
-class CfgWeapons
-{
- class ItemCore;
- class InventoryItem_Base_F;
- class cse_ab_ATragMX: ItemCore
- {
- scope=2;
- value = 1;
- count = 1;
- type = 16;
- displayName="ATragMX";
- picture="\cse\cse_sys_ballistics\atragmx\data\ATrag_Icon.paa";
- descriptionShort="Rugged PDA with ATragMX";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=4;
- type=201;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_ballistics/atragmx/Combat_Space_Enhancement.h
deleted file mode 100644
index 3561558d2e..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,11 +0,0 @@
-class Combat_Space_Enhancement {
- class EventHandlers {
- class PostInit_EventHandlers {
- class cse_ab_atragmx {
- init = "call compile preprocessFile 'cse\cse_sys_ballistics\atragmx\XEH_postClientInit.sqf';";
- name = "ATragMX";
- author = "Ruthberg";
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/UI.h b/TO_MERGE/cse/sys_ballistics/atragmx/UI.h
deleted file mode 100644
index 3b76303baf..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/UI.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "ui\defines.h"
-#include "ui\display.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/XEH_postClientInit.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/XEH_postClientInit.sqf
deleted file mode 100644
index 0ed32ddbc4..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/XEH_postClientInit.sqf
+++ /dev/null
@@ -1,32 +0,0 @@
-if (!hasInterface) exitwith{};
-
-if (count (profileNamespace getVariable ["cse_ab_ATragMX_gunList", []]) > 0) then {
- cse_ab_ATragMX_gunList = profileNamespace getVariable "cse_ab_ATragMX_gunList";
-} else {
- // Profile Name, Muzzle Velocity, Zero Range, Scope Base Angle, AirFriction, Bore Height, Scope Unit, Elevation Scope Step, Windage Scope Step, Maximum Elevation, Dialed Elevation, Dialed Windage, Mass, Ammo Class Name, Magazine Class Name, BC, Drag Model, Atmosphere Model
- cse_ab_ATragMX_gunList = [["12.7x108mm" , 820, 500, 0.255, -0.0005600, 3.81, 0, 0.338, 0.338, 120, 0, 0, 48.28, "B_127x108_Ball" , "5Rnd_127x108_Mag" , 0.700, 1, "ASM" ],
- ["12.7x99mm" , 880, 500, 0.202, -0.0005600, 3.81, 0, 0.338, 0.338, 120, 0, 0, 41.92, "B_127x99_Ball" , "5Rnd_mas_127x99_Stanag" , 0.670, 1, "ASM" ],
- ["10.4x77mm" , 910, 500, 0.200, -0.0004800, 3.81, 0, 0.338, 0.338, 120, 0, 0, 27.15, "B_408_Ball" , "7Rnd_408_Mag" , 0.970, 1, "ASM" ],
- ["7.62x51mm" , 850, 500, 0.280, -0.0010000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 9.460, "B_762x51_Ball" , "20Rnd_762x51_Mag" , 0.393, 1, "ICAO"],
- ["6.5x39mm" , 800, 500, 0.304, -0.0009000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 7.776, "B_65x39_Caseless", "30Rnd_65x39_caseless_mag", 0.263, 1, "ICAO"],
- ["5.56x45mm" , 920, 500, 0.259, -0.0012000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 4.000, "B_556x45_Ball" , "30Rnd_556x45_Stanag" , 0.304, 1, "ASM" ],
- ["5.56x45mm Mk262" , 850, 500, 0.294, -0.0011250, 3.81, 0, 0.338, 0.338, 120, 0, 0, 4.990, "RH_556x45_Mk262" , "RH_30Rnd_556x45_Mk262" , 0.361, 1, "ASM" ]];
-
- profileNamespace setVariable ["cse_ab_ATragMX_gunList", cse_ab_ATragMX_gunList];
-};
-
-call compile preprocessFile ("cse\cse_sys_ballistics\atragmx\init.sqf");
-//call compile preprocessFile ("\atragmx\fnc_sord.sqf");
-
-
-[] spawn {
- waituntil {!isnil "cse_gui"};
- // TODO seperate config entry for this, outside module space.
- ["cse_sys_ballistics_ATragMX_open", (["cse_sys_ballistics_ATragMX_open","menu",[197, 0,0,0]] call cse_fnc_getKeyBindingFromProfile_F), { _this call cse_ab_ATragMX_fnc_create_dialog; }, 0] call cse_fnc_addKeyBindingForMenu_F;
- ["cse_sys_ballistics_ATragMX_open","menu", "Open ATragMX", "Opens the ATragMX dialog"] call cse_fnc_settingsDefineDetails_F;
-
- _entries = [
- ["ATragMX", {([player, 'cse_ab_ATragMX'] call cse_fnc_hasItem_CC)}, "cse\cse_sys_ballistics\atragmx\data\ATRAG_Icon.paa", { closeDialog 0; call cse_ab_ATragMX_fnc_create_dialog; }, "Use ATragMX"]
- ];
- ["ActionMenu", "equipment", _entries] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/config.cpp b/TO_MERGE/cse/sys_ballistics/atragmx/config.cpp
deleted file mode 100644
index e17c52e8db..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/config.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#define ST_LEFT 0
-#define ST_RIGHT 1
-#define ST_CENTER 2
-
-class CfgPatches
-{
- class cse_ab_atragmx
- {
- units[]={};
- weapons[]= {"cse_ab_ATragMX"};
- requiredVersion=1.26;
- requiredAddons[]= {"cse_f_modules", "cse_main", "cse_f_configuration"};
- version="1.0";
- author[]= {"Ruthberg"};
- };
-};
-class CfgAddons
-{
- class PreloadAddons
- {
- class cse_ab_atragmx
- {
- list[]=
- {
- "cse_ab_atragmx"
- };
- };
- };
-};
-
-#include "Combat_Space_Enhancement.h"
-#include "CfgFunctions.h"
-#include "CfgWeapons.h"
-#include "CfgVehicles.h"
-#include "UI.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/data/ATRAG.paa b/TO_MERGE/cse/sys_ballistics/atragmx/data/ATRAG.paa
deleted file mode 100644
index 5708a35786..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/atragmx/data/ATRAG.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/data/ATRAG_Icon.paa b/TO_MERGE/cse/sys_ballistics/atragmx/data/ATRAG_Icon.paa
deleted file mode 100644
index e233e510ef..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/atragmx/data/ATRAG_Icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_add_new_gun.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_add_new_gun.sqf
deleted file mode 100644
index 7c4d01c261..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_add_new_gun.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "script_component.hpp"
-
-private ["_gunName", "_gunProfileEntry"];
-
-_gunName = ctrlText 11001;
-if (_gunName != "") then {
- _gunProfileEntry = [_gunName, 850, 500, 0.280, -0.0010000, 3.81, 0, 0.338, 0.338, 120, 0, 0, 9.460, "", "", 0.393, 1, "ICAO"];
-
- cse_ab_ATragMX_gunList = cse_ab_ATragMX_gunList + [_gunProfileEntry];
-
- lbAdd [6000, _gunProfileEntry select 0];
-
- profileNamespace setVariable ["cse_ab_ATragMX_gunList", cse_ab_ATragMX_gunList];
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_range_card.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_range_card.sqf
deleted file mode 100644
index 2ad0cd836a..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_range_card.sqf
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "script_component.hpp"
-
-call cse_ab_ATragMX_fnc_parse_input;
-
-private ["_scopeBaseAngle"];
-_scopeBaseAngle = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 3);
-
-private ["_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_bc", "_dragModel", "_atmosphereModel"];
-_bulletMass = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 12;
-_boreHeight = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 5;
-_airFriction = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 4;
-_muzzleVelocity = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 1;
-_bc = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 15;
-_dragModel = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 16;
-_atmosphereModel = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 17;
-
-private ["_temperature", "_barometricPressure", "_relativeHumidity"];
-_temperature = (cse_ab_ATragMX_temperature select cse_ab_ATragMX_currentTarget);
-_barometricPressure = (cse_ab_ATragMX_barometricPressure select cse_ab_ATragMX_currentTarget);
-_relativeHumidity = (cse_ab_ATragMX_relativeHumidity select cse_ab_ATragMX_currentTarget);
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- _temperature = (_temperature - 32) / 1.8;
- _barometricPressure = _barometricPressure * 33.8638866667;
-};
-
-private ["_windSpeed", "_windDirection", "_inclinationAngle", "_targetSpeed", "_targetRange"];
-_windSpeed = (cse_ab_ATragMX_windSpeed select cse_ab_ATragMX_currentTarget);
-_windDirection = (cse_ab_ATragMX_windDirection select cse_ab_ATragMX_currentTarget);
-_inclinationAngle = (cse_ab_ATragMX_inclinationAngle select cse_ab_ATragMX_currentTarget);
-_targetSpeed = (cse_ab_ATragMX_targetSpeed select cse_ab_ATragMX_currentTarget);
-_targetRange = cse_ab_ATragMX_rangeCardEndRange;
-if (cse_ab_ATragMX_currentUnit != 2) then
-{
- _targetRange = _targetRange / 1.0936133;
-};
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- _windSpeed = _windSpeed / 2.23693629;
- _targetSpeed = _targetSpeed / 2.23693629;
-};
-
-cse_ab_ATragMX_rangeCardData = [];
-
-private ["_result"];
-_result = [_scopeBaseAngle, _bulletMass, _boreHeight, _airFriction, _muzzleVelocity, _temperature, _barometricPressure, _relativeHumidity, 1000,
- _windSpeed, _windDirection, _inclinationAngle, _targetSpeed, _targetRange, _bc, _dragModel, _atmosphereModel, true] call cse_ab_ATragMX_fnc_calculate_solution;
-
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_scope_base_angle.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_scope_base_angle.sqf
deleted file mode 100644
index 3e39d9a478..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_scope_base_angle.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "script_component.hpp"
-
-private ["_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_zeroRange"];
-_bulletMass = _this select 0;
-_boreHeight = _this select 1;
-_airFriction = _this select 2;
-_muzzleVelocity = _this select 3;
-_zeroRange = _this select 4;
-
-private ["_scopeBaseAngle"];
-_scopeBaseAngle = 0;
-
-private ["_temperature", "_barometricPressure", "_relativeHumidity"];
-_temperature = 15;
-_barometricPressure = 1013.25;
-_relativeHumidity = 0;
-
-_result = [_scopeBaseAngle, _bulletMass, _boreHeight, _airFriction, _muzzleVelocity, _temperature, _barometricPressure, _relativeHumidity, 1000, 0, 0, 0, 0, _zeroRange, _airFriction, 1, "ICAO", false] call cse_ab_ATragMX_fnc_calculate_solution;
-
-_scopeBaseAngle + (_result select 0) / 60
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_solution.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_solution.sqf
deleted file mode 100644
index 89b380cc17..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_solution.sqf
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "script_component.hpp"
-
-private ["_scopeBaseAngle", "_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_temperature", "_barometricPressure", "_relativeHumidity", "_simSteps", "_windSpeed", "_windDirection", "_inclinationAngle", "_targetSpeed", "_targetRange", "_bc", "_dragModel", "_atmosphereModel", "_storeRangeCardData"];
-_scopeBaseAngle = _this select 0;
-_bulletMass = _this select 1;
-_boreHeight = _this select 2;
-_airFriction = _this select 3;
-_muzzleVelocity = _this select 4;
-_temperature = _this select 5;
-_barometricPressure = _this select 6;
-_relativeHumidity = _this select 7;
-_simSteps = _this select 8;
-_windSpeed = _this select 9;
-_windDirection = _this select 10;
-_inclinationAngle = _this select 11;
-_targetSpeed = _this select 12;
-_targetRange = _this select 13;
-_bc = _this select 14;
-_dragModel = _this select 15;
-_atmosphereModel = _this select 16;
-_storeRangeCardData = _this select 17;
-
-private ["_bulletPos", "_bulletVelocity", "_bulletAccel", "_gravity", "_deltaT"];
-_bulletPos = [0, 0, 0];
-_bulletVelocity = [0, 0, 0];
-_bulletAccel = [0, 0, 0];
-_gravity = [0, sin(_scopeBaseAngle + _inclinationAngle) * -9.80665, cos(_scopeBaseAngle + _inclinationAngle) * -9.80665];
-_deltaT = 1 / _simSteps;
-
-private ["_elevation", "_windage", "_lead", "_TOF", "_bulletSpeed", "_kineticEnergy"];
-_elevation = 0;
-_windage = 0;
-_lead = 0;
-_TOF = 0;
-_bulletSpeed = 0;
-
-private ["_n", "_range", "_rangeFactor"];
-_n = 0;
-_range = 0;
-_rangeFactor = 1;
-if (_storeRangeCardData) then {
- if (cse_ab_ATragMX_currentUnit != 2) then {
- _rangeFactor = 1.0936133;
- };
- cse_ab_ATragMX_rangeCardData = [];
-};
-
-private ["_wind"];
-if (["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) then {
- _wind = [cos(270 - _windDirection * 30) * _windSpeed, sin(270 - _windDirection * 30) * _windSpeed, 0];
- if (cse_AB_AdvancedAirDragEnabled) then {
- _bc = [_bc, _temperature, _barometricPressure, _relativeHumidity, _atmosphereModel] call cse_ab_ballistics_fnc_calculate_Atmospheric_Correction;
- };
-};
-
-_TOF = 0;
-
-_bulletPos set [0, 0];
-_bulletPos set [1, 0];
-_bulletPos set [2, -(_boreHeight / 100)];
-
-_bulletVelocity set [0, 0];
-_bulletVelocity set [1, Cos(_scopeBaseAngle) * _muzzleVelocity];
-_bulletVelocity set [2, Sin(_scopeBaseAngle) * _muzzleVelocity];
-
-while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do
-{
- _bulletSpeed = vectorMagnitude _bulletVelocity;
-
- if (["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) then {
- private ["_trueVelocity", "_trueSpeed", "_drag"];
- _trueVelocity = _bulletVelocity vectorDiff _wind;
- _trueSpeed = vectorMagnitude _trueVelocity;
-
- if (cse_AB_AdvancedAirDragEnabled) then {
- _drag = -1 * ([_dragModel, _bc, _trueSpeed] call cse_ab_ballistics_fnc_calculate_Retardation);
- } else {
- _bulletAccel = _trueVelocity vectorMultiply (_trueSpeed * _airFriction);
- };
- _bulletAccel = (vectorNormalized _trueVelocity) vectorMultiply (_drag);
- } else {
- _bulletAccel = _bulletVelocity vectorMultiply (_bulletSpeed * _airFriction);
- };
-
- _bulletAccel = _bulletAccel vectorAdd _gravity;
-
- _bulletVelocity = _bulletVelocity vectorAdd (_bulletAccel vectorMultiply _deltaT);
- _bulletPos = _bulletPos vectorAdd (_bulletVelocity vectorMultiply _deltaT);
-
- _TOF = _TOF + _deltaT;
-
- if (_storeRangeCardData) then {
- _range = cse_ab_ATragMX_rangeCardStartRange + _n * cse_ab_ATragMX_rangeCardIncrement;
- if ((_bulletPos select 1) * _rangeFactor >= _range && _range <= cse_ab_ATragMX_rangeCardEndRange) then {
- if ((_bulletPos select 1) > 0) then {
- _elevation = - atan((_bulletPos select 2) / (_bulletPos select 1));
- _windage = - atan((_bulletPos select 0) / (_bulletPos select 1));
- };
- if (_range != 0) then {
- _lead = (_targetSpeed * _TOF) / (Tan(3.38 / 60) * _range);
- };
- _kineticEnergy = 0.5 * (_bulletMass / 1000 * (_bulletSpeed ^ 2));
- _kineticEnergy = _kineticEnergy * 0.737562149;
-
- cse_ab_ATragMX_rangeCardData set [_n, [_range, _elevation * 60, _windage * 60, _lead, _TOF, _bulletSpeed, _kineticEnergy]];
- _n = _n + 1;
- };
- };
-};
-
-if ((_bulletPos select 1) > 0) then {
- _elevation = - atan((_bulletPos select 2) / (_bulletPos select 1));
- _windage = - atan((_bulletPos select 0) / (_bulletPos select 1));
-};
-
-if (_targetRange != 0) then {
- _lead = (_targetSpeed * _TOF) / (Tan(3.38 / 60) * _targetRange);
-};
-
-_kineticEnergy = 0.5 * (_bulletMass / 1000 * (_bulletSpeed ^ 2));
-_kineticEnergy = _kineticEnergy * 0.737562149;
-
-[_elevation * 60, _windage * 60, _lead, _TOF, _bulletSpeed, _kineticEnergy]
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_range_assist.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_range_assist.sqf
deleted file mode 100644
index 76adcc77da..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_range_assist.sqf
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "script_component.hpp"
-
-private ["_targetSize", "_imageSize", "_angle", "_estRange"];
-
-_angle = parseNumber(ctrlText 7012);
-_targetSize = parseNumber(ctrlText 7010);
-if (cse_ab_ATragMX_rangeAssistUseTargetHeight) then
-{
- _targetSize = _targetSize * cos(_angle);
-};
-switch (cse_ab_ATragMX_rangeAssistTargetSizeUnit) do
-{
- case 0:
- {
- _targetSize = _targetSize * 0.0254;
- };
- case 1:
- {
- _targetSize = _targetSize * 0.3048;
- };
- case 2:
- {
- _targetSize = _targetSize * 0.01;
- };
-};
-_imageSize = parseNumber(ctrlText 7011);
-switch (cse_ab_ATragMX_rangeAssistImageSizeUnit) do
-{
- case 0:
- {
- _imageSize = _imageSize / 6400 * 360;
- };
- case 1:
- {
- _imageSize = _imageSize / 60;
- };
- case 2:
- {
- _imageSize = _imageSize / 60 / 1.047;
- };
-};
-_estRange = parseNumber(ctrlText 7013);
-if (cse_ab_ATragMX_currentUnit != 2) then
-{
- _estRange = _estRange / 1.0936133;
-};
-
-switch (_this) do
-{
- case 0:
- {
- _targetSize = tan(_imageSize) * _estRange;
-
- if (cse_ab_ATragMX_rangeAssistUseTargetHeight) then
- {
- _targetSize = _targetSize / cos(_angle);
- };
-
- switch (cse_ab_ATragMX_rangeAssistTargetSizeUnit) do
- {
- case 0:
- {
- _targetSize = _targetSize / 0.0254;
- };
- case 1:
- {
- _targetSize = _targetSize / 0.3048;
- };
- case 2:
- {
- _targetSize = _targetSize / 0.01;
- };
- };
-
- ctrlSetText [7010, Str(Round(_targetSize * 100) / 100)];
- };
- case 1:
- {
- _imageSize = atan(_targetSize / _estRange);
-
- switch (cse_ab_ATragMX_rangeAssistImageSizeUnit) do
- {
- case 0:
- {
- _imageSize = _imageSize * 6400 / 360;
- };
- case 1:
- {
- _imageSize = _imageSize * 60;
- };
- case 2:
- {
- _imageSize = _imageSize * 60 * 1.047;
- };
- };
-
- ctrlSetText [7011, Str(Round(_imageSize * 100) / 100)];
- };
- case 2:
- {
- _estRange = _targetSize / tan(_imageSize);
-
- ctrlSetText [7013, Str(Round(_estRange))];
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_solution.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_solution.sqf
deleted file mode 100644
index 2b30a882fd..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_solution.sqf
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "script_component.hpp"
-
-call cse_ab_ATragMX_fnc_parse_input;
-
-private ["_scopeBaseAngle"];
-_scopeBaseAngle = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 3);
-
-private ["_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_bc", "_dragModel", "_atmosphereModel"];
-_bulletMass = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 12;
-_boreHeight = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 5;
-_airFriction = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 4;
-_muzzleVelocity = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 1;
-_bc = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 15;
-_dragModel = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 16;
-_atmosphereModel = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 17;
-
-private ["_temperature", "_barometricPressure", "_relativeHumidity"];
-_temperature = (cse_ab_ATragMX_temperature select cse_ab_ATragMX_currentTarget);
-_barometricPressure = (cse_ab_ATragMX_barometricPressure select cse_ab_ATragMX_currentTarget);
-_relativeHumidity = (cse_ab_ATragMX_relativeHumidity select cse_ab_ATragMX_currentTarget);
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- _temperature = (_temperature - 32) / 1.8;
- _barometricPressure = _barometricPressure * 33.8638866667;
-};
-
-private ["_windSpeed", "_windDirection", "_inclinationAngle", "_targetSpeed", "_targetRange"];
-_windSpeed = (cse_ab_ATragMX_windSpeed select cse_ab_ATragMX_currentTarget);
-_windDirection = (cse_ab_ATragMX_windDirection select cse_ab_ATragMX_currentTarget);
-_inclinationAngle = (cse_ab_ATragMX_inclinationAngle select cse_ab_ATragMX_currentTarget);
-_targetSpeed = (cse_ab_ATragMX_targetSpeed select cse_ab_ATragMX_currentTarget);
-_targetRange = (cse_ab_ATragMX_targetRange select cse_ab_ATragMX_currentTarget);
-if (cse_ab_ATragMX_currentUnit != 2) then
-{
- _targetRange = _targetRange / 1.0936133;
-};
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- _windSpeed = _windSpeed / 2.23693629;
- _targetSpeed = _targetSpeed / 2.23693629;
-};
-
-_result = [_scopeBaseAngle, _bulletMass, _boreHeight, _airFriction, _muzzleVelocity, _temperature, _barometricPressure, _relativeHumidity, 1000,
- _windSpeed, _windDirection, _inclinationAngle, _targetSpeed, _targetRange, _bc, _dragModel, _atmosphereModel, false] call cse_ab_ATragMX_fnc_calculate_solution;
-
-cse_ab_ATragMX_elevationOutput set [cse_ab_ATragMX_currentTarget, _result select 0];
-cse_ab_ATragMX_windageOutput set [cse_ab_ATragMX_currentTarget, _result select 1];
-cse_ab_ATragMX_leadOutput set [cse_ab_ATragMX_currentTarget, _result select 2];
-cse_ab_ATragMX_tofOutput set [cse_ab_ATragMX_currentTarget, _result select 3];
-cse_ab_ATragMX_velocityOutput set [cse_ab_ATragMX_currentTarget, _result select 4];
-
-call cse_ab_ATragMX_fnc_update_result;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_speed_assist.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_speed_assist.sqf
deleted file mode 100644
index 1228db754a..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_calculate_target_speed_assist.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "script_component.hpp"
-
-private ["_targetRange", "_numTicks", "_timeSecs", "_estSpeed"];
-
-_targetRange = parseNumber(ctrlText 8004);
-_numTicks = parseNumber(ctrlText 8005);
-_timeSecs = parseNumber(ctrlText 8006);
-_estSpeed = 0;
-
-if (cse_ab_ATragMX_currentUnit != 2) then
-{
- _targetRange = _targetRange / 1.0936133;
-};
-
-switch (cse_ab_ATragMX_rangeAssistImageSizeUnit) do
-{
- case 0:
- {
- _numTicks = _numTicks / 6400 * 360;
- };
- case 1:
- {
- _numTicks = _numTicks / 60;
- };
- case 2:
- {
- _numTicks = _numTicks / 60 / 1.047;
- };
-};
-
-if (_timeSecs > 0) then
-{
- _estSpeed = tan(_numTicks) * _targetRange / _timeSecs;
-};
-
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- _estSpeed = _estSpeed * 2.23693629;
-};
-
-ctrlSetText [8007, Str(Round(_estSpeed * 10) / 10)];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_change_gun.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_change_gun.sqf
deleted file mode 100644
index 11c7403da9..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_change_gun.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "script_component.hpp"
-
-if (_this < 0 || _this > (count cse_ab_ATragMX_gunList) - 1) exitWith {};
-
-cse_ab_ATragMX_workingMemory set [cse_ab_ATragMX_currentTarget, +(cse_ab_ATragMX_gunList select _this)];
-cse_ab_ATragMX_currentGun set [cse_ab_ATragMX_currentTarget, _this];
-
-lbSetCurSel [6000, (cse_ab_ATragMX_currentGun select cse_ab_ATragMX_currentTarget)];
-
-if ((cse_ab_ATragMX_scopeUnits select (cse_ab_ATragMX_currentScopeUnit select cse_ab_ATragMX_currentTarget)) != "Clicks") then
-{
- cse_ab_ATragMX_currentScopeUnit set [cse_ab_ATragMX_currentTarget, (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 6];
-};
-
-call cse_ab_ATragMX_fnc_update_gun;
-
-cse_ab_ATragMX_elevationOutput set [cse_ab_ATragMX_currentTarget, 0];
-cse_ab_ATragMX_windageOutput set [cse_ab_ATragMX_currentTarget, 0];
-cse_ab_ATragMX_leadOutput set [cse_ab_ATragMX_currentTarget, 0];
-cse_ab_ATragMX_tofOutput set [cse_ab_ATragMX_currentTarget, 0];
-cse_ab_ATragMX_velocityOutput set [cse_ab_ATragMX_currentTarget, 0];
-
-call cse_ab_ATragMX_fnc_update_result;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_create_dialog.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_create_dialog.sqf
deleted file mode 100644
index 431c2d786f..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_create_dialog.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "script_component.hpp"
-
-if (underwater player) exitWith { false };
-if (!([player, "cse_ab_ATragMX"] call cse_fnc_hasItem_CC)) exitWith { false };
-
-execVM "cse\cse_sys_ballistics\atragmx\functions\fn_update_target_selection.sqf";
-
-createDialog 'cse_ab_ATragMX_Display';
-
-true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
-
-false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_add_new_gun.sqf";
-false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_gun_list.sqf";
-false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_range_card.sqf";
-false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_range_card_setup.sqf";
-false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_range_assist.sqf";
-false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_speed_assist.sqf";
-false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_speed_assist_timer.sqf";
-
-{
- lbAdd [6000, _x select 0];
-} forEach cse_ab_ATragMX_gunList;
-
-true
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_cycle_range_card_columns.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_cycle_range_card_columns.sqf
deleted file mode 100644
index 88208ceeb0..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_cycle_range_card_columns.sqf
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "script_component.hpp"
-
-cse_ab_ATragMX_rangeCardCurrentColumn = (cse_ab_ATragMX_rangeCardCurrentColumn + 1) % (count cse_ab_ATragMX_rangeCardLastColumns);
-
-ctrlSetText [5006, (cse_ab_ATragMX_rangeCardLastColumns select cse_ab_ATragMX_rangeCardCurrentColumn)];
-
-call cse_ab_ATragMX_fnc_update_range_card;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_cycle_scope_unit.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_cycle_scope_unit.sqf
deleted file mode 100644
index ce1030e417..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_cycle_scope_unit.sqf
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "script_component.hpp"
-
-call cse_ab_ATragMX_fnc_parse_input;
-
-cse_ab_ATragMX_currentScopeUnit set [cse_ab_ATragMX_currentTarget, ((cse_ab_ATragMX_currentScopeUnit select cse_ab_ATragMX_currentTarget) + 1) % (count cse_ab_ATragMX_scopeUnits)];
-
-call cse_ab_ATragMX_fnc_update_scope_unit;
-call cse_ab_ATragMX_fnc_update_result;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_delete_gun.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_delete_gun.sqf
deleted file mode 100644
index ba3c10a121..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_delete_gun.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "script_component.hpp"
-
-private ["_index"];
-_index = lbCurSel 6000;
-
-if (_index == -1) exitWith {};
-
-for "_i" from 0 to (count cse_ab_ATragMX_currentGun) - 1 do {
- if ((cse_ab_ATragMX_currentGun select _i) > _index) then {
- cse_ab_ATragMX_currentGun set [_i, (cse_ab_ATragMX_currentGun select _i) - 1];
- };
-};
-
-cse_ab_ATragMX_gunList set [_index, 0];
-cse_ab_ATragMX_gunList = cse_ab_ATragMX_gunList - [0];
-
-lbDelete [6000, _index];
-
-profileNamespace setVariable ["cse_ab_ATragMX_gunList", cse_ab_ATragMX_gunList];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_parse_input.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_parse_input.sqf
deleted file mode 100644
index eb8230f844..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_parse_input.sqf
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "script_component.hpp"
-
-cse_ab_ATragMX_temperature set [cse_ab_ATragMX_currentTarget, parseNumber(ctrlText 200)];
-cse_ab_ATragMX_barometricPressure set [cse_ab_ATragMX_currentTarget, 0 max parseNumber(ctrlText 210)];
-cse_ab_ATragMX_relativeHumidity set [cse_ab_ATragMX_currentTarget, (0 max parseNumber(ctrlText 220) min 100) / 100];
-
-cse_ab_ATragMX_windSpeed set [cse_ab_ATragMX_currentTarget, 0 max abs(parseNumber(ctrlText 300)) min 50];
-cse_ab_ATragMX_windDirection set [cse_ab_ATragMX_currentTarget, 1 max Round(parseNumber(ctrlText 310)) min 12];
-cse_ab_ATragMX_inclinationAngle set [cse_ab_ATragMX_currentTarget, -60 max parseNumber(ctrlText 320) min 60];
-cse_ab_ATragMX_targetSpeed set [cse_ab_ATragMX_currentTarget, 0 max abs(parseNumber(ctrlText 330)) min 50];
-cse_ab_ATragMX_targetRange set [cse_ab_ATragMX_currentTarget, 0 max abs(parseNumber(ctrlText 340)) min 4000];
-
-private ["_boreHeight", "_bulletMass", "_airFriction", "_muzzleVelocity"];
-_boreHeight = parseNumber(ctrlText 100);
-_bulletMass = parseNumber(ctrlText 110);
-if ((["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) && cse_AB_AdvancedAirDragEnabled) then {
- _airFriction = 0.1 max parseNumber(ctrlText 120) min 2;
-} else {
- _airFriction = parseNumber(ctrlText 120) / -1000;
-};
-_muzzleVelocity = parseNumber(ctrlText 130);
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- _boreHeight = _boreHeight * 2.54;
- _bulletMass = _bulletMass * 0.06479891;
- _muzzleVelocity = _muzzleVelocity / 3.2808399;
-};
-_boreHeight = 0.1 max _boreHeight min 10;
-_bulletMass = 1 max _bulletMass min 100;
-_muzzleVelocity = 100 max _muzzleVelocity min 1400;
-
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [5, _boreHeight];
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [12, _bulletMass];
-if ((["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) && cse_AB_AdvancedAirDragEnabled) then {
- (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [15, _airFriction];
-} else {
- (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [4, _airFriction];
-};
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [1, _muzzleVelocity];
-
-private ["_elevationCur", "_elevationCur", "_elevationScopeStep", "_windageScopeStep"];
-_elevationCur = parseNumber(ctrlText 402);
-_windageCur = parseNumber(ctrlText 412);
-
-switch ((cse_ab_ATragMX_currentScopeUnit select cse_ab_ATragMX_currentTarget)) do
-{
- case 0:
- {
- _elevationCur = _elevationCur * 3.38;
- _windageCur = _windageCur * 3.38;
- };
-
- case 2:
- {
- _elevationCur = _elevationCur / 1.047;
- _windageCur = _windageCur / 1.047;
- };
-
- case 3:
- {
- _elevationScopeStep = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 7);
- _windageScopeStep = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 8);
-
- _elevationCur = _elevationCur * _elevationScopeStep;
- _windageCur = _windageCur * _windageScopeStep;
- };
-};
-
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [10, _elevationCur];
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [11, _windageCur];
-
-call cse_ab_ATragMX_fnc_update_gun;
-call cse_ab_ATragMX_fnc_update_atmosphere;
-call cse_ab_ATragMX_fnc_update_target;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_reset_relative_click_memory.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_reset_relative_click_memory.sqf
deleted file mode 100644
index ac2f5d8120..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_reset_relative_click_memory.sqf
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "script_component.hpp"
-
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [10, 0];
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [11, 0];
-
-call cse_ab_ATragMX_fnc_update_result;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_save_gun.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_save_gun.sqf
deleted file mode 100644
index 7db8f0dc1e..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_save_gun.sqf
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "script_component.hpp"
-
-private ["_index"];
-_index = 0 max (lbCurSel 6000);
-
-cse_ab_ATragMX_gunList set [_index, +(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget)];
-
-lbClear 6000;
-{
- lbAdd [6000, _x select 0];
-} forEach cse_ab_ATragMX_gunList;
-
-profileNamespace setVariable ["cse_ab_ATragMX_gunList", cse_ab_ATragMX_gunList];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_add_new_gun.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_add_new_gun.sqf
deleted file mode 100644
index a3172e3b30..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_add_new_gun.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "script_component.hpp"
-
-{ctrlShow [_x, _this]} forEach [11000, 11001, 11002, 11003];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_gun_list.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_gun_list.sqf
deleted file mode 100644
index c44cbe03fe..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_gun_list.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "script_component.hpp"
-
-{ctrlShow [_x, _this]} forEach [6000, 6001, 6002, 6003, 6004, 6005, 6006, 6007];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_main_page.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_main_page.sqf
deleted file mode 100644
index d1f15db484..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_main_page.sqf
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "script_component.hpp"
-
-{ctrlShow [_x, _this]} forEach [10, 100, 11, 110, 12, 120, 13, 130, 14, 140, 20, 200, 21, 210, 22, 220, 30, 300, 31, 310, 32, 320, 33, 330, 34, 340, 40, 400, 401, 402, 403, 41, 410, 411, 412, 42, 420,
- 500, 501, 502, 503, 600, 601, 602, 603, 1000, 2000, 3000, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_range_card.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_range_card.sqf
deleted file mode 100644
index a49d9a04c1..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_range_card.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "script_component.hpp"
-
-{ctrlShow [_x, _this]} forEach [5000, 5001, 5002, 5003, 5004, 5005, 5006, 5007];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_range_card_setup.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_range_card_setup.sqf
deleted file mode 100644
index 8325418451..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_range_card_setup.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "script_component.hpp"
-
-{ctrlShow [_x, _this]} forEach [10000, 10001, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 10009];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_range_assist.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_range_assist.sqf
deleted file mode 100644
index 72a88b953a..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_range_assist.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "script_component.hpp"
-
-{ctrlShow [_x, _this]} forEach [7000, 7001, 7002, 7003, 7004, 7005, 7006, 7007, 7008, 7009, 7010, 7011, 7012, 7013, 7014, 7015, 7016, 7017, 7018, 7019, 7020];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_speed_assist.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_speed_assist.sqf
deleted file mode 100644
index 37911e8a7f..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_speed_assist.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "script_component.hpp"
-
-{ctrlShow [_x, _this]} forEach [8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007, 8008, 8009, 8010, 8011, 8012, 8013, 8014, 8015];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_speed_assist_timer.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_speed_assist_timer.sqf
deleted file mode 100644
index bddaf3ddb6..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_show_target_speed_assist_timer.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "script_component.hpp"
-
-{ctrlShow [_x, _this]} forEach [9000, 9001, 9002];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_sord.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_sord.sqf
deleted file mode 100644
index d888076798..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_sord.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "script_component.hpp"
-
-cse_ab_ATragMX_COMPAT_LRF = ["Rangefinder", "Laserdesignator"];
-
-private ["_fnc_atragmx"];
-
-_fnc_atragmx = {
- private ["_target", "_position", "_range", "_inclinationAngle"];
-
- if ((local player) && (currentWeapon player) in cse_ab_ATragMX_COMPAT_LRF && (!isNull (_this select 0))) then {
- _target = getPosATL (_this select 0);
- _position = getPosATL player;
-
- _inclinationAngle = asin((player weaponDirection currentWeapon player) select 2);
- _range = _position distance _target;
-
- cse_ab_ATragMX_inclinationAngle set [cse_ab_ATragMX_currentTarget, _inclinationAngle];
- cse_ab_ATragMX_targetRange set [cse_ab_ATragMX_currentTarget, _range];
- };
-};
-
-//["ace_sys_rangefinder_Lazing", _fnc_atragmx] call CBA_fnc_addEventHandler;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_target_speed_assist_timer.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_target_speed_assist_timer.sqf
deleted file mode 100644
index 2e1311161b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_target_speed_assist_timer.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "script_component.hpp"
-
-#define _dsp (uiNamespace getVariable "cse_ab_ATragMX_Display")
-
-if !(ctrlVisible 9000) then
-{
- private ["_startTime"];
-
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_speed_assist.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_speed_assist_timer.sqf";
-
- ctrlSetFocus (_dsp displayCtrl 9002);
-
- _startTime = time;
-
- while {cse_ab_ATragMX_speedAssistTimer} do
- {
- sleep 0.1;
- ctrlSetText [9001, Str(Round((time - _startTime) * 10) / 10)];
- };
-
- cse_ab_ATragMX_speedAssistTimer = true;
-
- ctrlSetText [8006, Str(Round((time - _startTime) * 10) / 10)];
-
- call cse_ab_ATragMX_fnc_calculate_target_speed_assist;
-
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_speed_assist_timer.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_speed_assist.sqf";
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_gun_list.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_gun_list.sqf
deleted file mode 100644
index dcd777e978..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_gun_list.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "script_component.hpp"
-
-#define _dsp (uiNamespace getVariable "cse_ab_ATragMX_Display")
-
-if (ctrlVisible 6000) then
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_gun_list.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
-
- if (_this) then {
- (lbCurSel 6000) call cse_ab_ATragMX_fnc_change_gun;
- };
-} else
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_gun_list.sqf";
-
- ctrlSetFocus (_dsp displayCtrl 6002);
-
- lbSetCurSel [6000, (cse_ab_ATragMX_currentGun select cse_ab_ATragMX_currentTarget)];
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_range_card.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_range_card.sqf
deleted file mode 100644
index 8d66b43f4a..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_range_card.sqf
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "script_component.hpp"
-
-#define _dsp (uiNamespace getVariable "cse_ab_ATragMX_Display")
-
-if (ctrlVisible 5006) then
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_range_card.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
-} else
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_range_card.sqf";
-
- ctrlSetFocus (_dsp displayCtrl 5001);
-
- call cse_ab_ATragMX_fnc_calculate_range_card;
- call cse_ab_ATragMX_fnc_update_range_card;
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_range_card_setup.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_range_card_setup.sqf
deleted file mode 100644
index 72787248a4..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_range_card_setup.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "script_component.hpp"
-
-#define _dsp (uiNamespace getVariable "cse_ab_ATragMX_Display")
-
-if (ctrlVisible 10000) then
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_range_card_setup.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_range_card.sqf";
-
- if (_this == 1) then
- {
- cse_ab_ATragMX_rangeCardStartRange = 0 max Round(parseNumber(ctrlText 10003)) min 3000;
- cse_ab_ATragMX_rangeCardEndRange = 0 max Round(parseNumber(ctrlText 10004)) min 3000;
- cse_ab_ATragMX_rangeCardIncrement = 1 max Round(parseNumber(ctrlText 10005)) min 3000;
-
- call cse_ab_ATragMX_fnc_calculate_range_card;
- call cse_ab_ATragMX_fnc_update_range_card;
- };
-} else
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_range_card.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_range_card_setup.sqf";
-
- ctrlSetFocus (_dsp displayCtrl 10006);
-
- ctrlSetText [10003, Str(Round(cse_ab_ATragMX_rangeCardStartRange))];
- ctrlSetText [10004, Str(Round(cse_ab_ATragMX_rangeCardEndRange))];
- ctrlSetText [10005, Str(Round(cse_ab_ATragMX_rangeCardIncrement))];
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_target_range_assist.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_target_range_assist.sqf
deleted file mode 100644
index fdaaadea2c..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_target_range_assist.sqf
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "script_component.hpp"
-
-#define _dsp (uiNamespace getVariable "cse_ab_ATragMX_Display")
-
-if (ctrlVisible 7000) then
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_range_assist.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
-
- if (_this == 1) then
- {
- ctrlSetText [320, Str(parseNumber(ctrlText 7012))];
- ctrlSetText [340, Str(parseNumber(ctrlText 7013))];
- };
-} else
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_range_assist.sqf";
-
- ctrlSetFocus (_dsp displayCtrl 7018);
-
- ctrlSetText [7012, Str(parseNumber(ctrlText 320))];
- ctrlSetText [7013, Str(parseNumber(ctrlText 340))];
-
- if (cse_ab_ATragMX_currentUnit != 2) then
- {
- ctrlSetText [7016, "Yards"];
- } else
- {
- ctrlSetText [7016, "Meters"];
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_target_speed_assist.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_target_speed_assist.sqf
deleted file mode 100644
index f9efe70e40..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_toggle_target_speed_assist.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "script_component.hpp"
-
-#define _dsp (uiNamespace getVariable "cse_ab_ATragMX_Display")
-
-if (ctrlVisible 8000) then
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_speed_assist.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
-
- if (_this == 1) then
- {
- call cse_ab_ATragMX_fnc_calculate_target_speed_assist;
- ctrlSetText [330, Str(parseNumber(ctrlText 8007))];
- };
-} else
-{
- false execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_main_page.sqf";
- true execVM "cse\cse_sys_ballistics\atragmx\functions\fn_show_target_speed_assist.sqf";
-
- ctrlSetFocus (_dsp displayCtrl 8012);
-
- ctrlSetText [8004, Str(Round((cse_ab_ATragMX_targetRange select cse_ab_ATragMX_currentTarget)))];
-
- if (cse_ab_ATragMX_currentUnit != 2) then
- {
- ctrlSetText [8008, "Yards"];
- } else
- {
- ctrlSetText [8008, "Meters"];
- };
-
- if (cse_ab_ATragMX_currentUnit != 1) then
- {
- ctrlSetText [8011, "m/s"];
- } else
- {
- ctrlSetText [8011, "mph"];
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_atmosphere.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_atmosphere.sqf
deleted file mode 100644
index 32672abc7b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_atmosphere.sqf
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "script_component.hpp"
-
-ctrlSetText [200, Str(Round((cse_ab_ATragMX_temperature select cse_ab_ATragMX_currentTarget) * 10) / 10)];
-if (cse_ab_ATragMX_currentUnit == 1) then {
- ctrlSetText [210, Str(Round((cse_ab_ATragMX_barometricPressure select cse_ab_ATragMX_currentTarget) * 100) / 100)];
-} else {
- ctrlSetText [210, Str(Round(cse_ab_ATragMX_barometricPressure select cse_ab_ATragMX_currentTarget))];
-};
-ctrlSetText [220, Str(Round((cse_ab_ATragMX_relativeHumidity select cse_ab_ATragMX_currentTarget) * 100 * 10) / 10)];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_gun.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_gun.sqf
deleted file mode 100644
index 8d8dc295b9..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_gun.sqf
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "script_component.hpp"
-
-ctrlSetText [1000, (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 0];
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- ctrlSetText [ 100, Str(Round(((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 5) / 2.54 * 100) / 100)];
-} else
-{
- ctrlSetText [ 100, Str(Round(((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 5) * 100) / 100)];
-};
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- ctrlSetText [ 110, Str(Round(((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 12) * 15.4323584))];
-} else
-{
- ctrlSetText [ 110, Str(Round((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 12))];
-};
-if ((["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) && cse_AB_AdvancedAirDragEnabled) then {
- ctrlSetText [ 120, Str(Round(((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 15) * 1000) / 1000)];
-} else {
- ctrlSetText [ 120, Str(Round(((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 4) * -1000 * 1000) / 1000)];
-};
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- ctrlSetText [130, Str(Round(((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 1) * 3.2808399))];
-} else
-{
- ctrlSetText [130, Str(Round((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 1))];
-};
-if (cse_ab_ATragMX_currentUnit == 2) then
-{
- ctrlSetText [140, Str(Round((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 2))];
-} else
-{
- ctrlSetText [140, Str(Round(((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 2) * 1.0936133))];
-};
-
-call cse_ab_ATragMX_fnc_update_scope_unit;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_range_card.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_range_card.sqf
deleted file mode 100644
index 13a0ddb1bf..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_range_card.sqf
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "script_component.hpp"
-
-private ["_range", "_elevation", "_windage", "_lead", "_TOF", "_velocity", "_kineticEnergy", "_rangeOutput", "_elevationOutput", "_windageOutput", "_lastColumnOutput"];
-_lastColumnOutput = "";
-
-ctrlSetText [5006, (cse_ab_ATragMX_rangeCardLastColumns select cse_ab_ATragMX_rangeCardCurrentColumn)];
-
-if (cse_ab_ATragMX_currentUnit != 2) then
-{
- ctrlSetText [5003, "Yards"];
-} else
-{
- ctrlSetText [5003, "Meters"];
-};
-
-lnbClear 5007;
-
-{
- _range = _x select 0;
- _elevation = _x select 1;
- _windage = _x select 2;
- _lead = _x select 3;
- _TOF = _x select 4;
- _velocity = _x select 5;
- _kineticEnergy = _x select 6;
-
- switch ((cse_ab_ATragMX_currentScopeUnit select cse_ab_ATragMX_currentTarget)) do
- {
- case 0:
- {
- _elevation = _elevation / 3.38;
- _windage = _windage / 3.38;
- };
-
- case 2:
- {
- _elevation = _elevation * 1.047;
- _windage = _windage * 1.047;
- };
-
- case 3:
- {
- _elevationScopeStep = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 7);
- _windageScopeStep = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 8);
-
- _elevation = Round(_elevation / _elevationScopeStep);
- _windage = Round(_windage / _windageScopeStep);
- };
- };
-
- _elevationOutput = Str(Round(_elevation * 100) / 100);
- _windageOutput = Str(Round(_windage * 100) / 100);
-
- _rangeOutput = Str(_range);
- if (_velocity < 340.29) then
- {
- _rangeOutput = _rangeOutput + "*";
- };
-
- if (cse_ab_ATragMX_currentUnit == 1) then
- {
- _velocity = _velocity * 3.2808399;
- };
-
- switch (cse_ab_ATragMX_rangeCardCurrentColumn) do
- {
- case 0:
- {
- _lastColumnOutput = Str(Round(_lead * 100) / 100);
- };
-
- case 1:
- {
- _lastColumnOutput = Str(Round(_velocity));
- };
-
- case 2:
- {
- _lastColumnOutput = Str(Round(_kineticEnergy));
- };
-
- case 3:
- {
- _lastColumnOutput = Str(Round(_TOF * 100) / 100);
- }
- };
-
- lnbAddRow [5007, [_rangeOutput, _elevationOutput, _windageOutput, _lastColumnOutput]];
-} forEach cse_ab_ATragMX_rangeCardData;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_relative_click_memory.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_relative_click_memory.sqf
deleted file mode 100644
index ece99704d5..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_relative_click_memory.sqf
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "script_component.hpp"
-
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [10, (cse_ab_ATragMX_elevationOutput select cse_ab_ATragMX_currentTarget)];
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [11, (cse_ab_ATragMX_windageOutput select cse_ab_ATragMX_currentTarget)];
-
-call cse_ab_ATragMX_fnc_update_result;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_result.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_result.sqf
deleted file mode 100644
index df130e90ad..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_result.sqf
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "script_component.hpp"
-
-private ["_elevationAbs", "_elevationRel", "_elevationCur", "_windageAbs", "_windageRel", "_windageCur", "_lead", "_elevationScopeStep", "_windageScopeStep"];
-_elevationAbs = (cse_ab_ATragMX_elevationOutput select cse_ab_ATragMX_currentTarget);
-_windageAbs = (cse_ab_ATragMX_windageOutput select cse_ab_ATragMX_currentTarget);
-
-_elevationCur = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 10;
-_windageCur = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 11;
-
-_elevationRel = _elevationAbs - _elevationCur;
-_windageRel = _windageAbs - _windageCur;
-
-_lead = (cse_ab_ATragMX_leadOutput select cse_ab_ATragMX_currentTarget);
-
-switch ((cse_ab_ATragMX_currentScopeUnit select cse_ab_ATragMX_currentTarget)) do
-{
- case 0:
- {
- _elevationAbs = _elevationAbs / 3.38;
- _windageAbs = _windageAbs / 3.38;
-
- _elevationRel = _elevationRel / 3.38;
- _windageRel = _windageRel / 3.38;
-
- _elevationCur = _elevationCur / 3.38;
- _windageCur = _windageCur / 3.38;
- };
-
- case 2:
- {
- _elevationAbs = _elevationAbs * 1.047;
- _windageAbs = _windageAbs * 1.047;
-
- _elevationRel = _elevationRel * 1.047;
- _windageRel = _windageRel * 1.047;
-
- _elevationCur = _elevationCur * 1.047;
- _windageCur = _windageCur * 1.047;
- };
-
- case 3:
- {
- _elevationScopeStep = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 7);
- _windageScopeStep = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 8);
-
- _elevationAbs = Round(_elevationAbs / _elevationScopeStep);
- _windageAbs = Round(_windageAbs / _windageScopeStep);
-
- _elevationRel = Round(_elevationRel / _elevationScopeStep);
- _windageRel = Round(_windageRel / _windageScopeStep);
-
- _elevationCur = Round(_elevationCur / _elevationScopeStep);
- _windageCur = Round(_windageCur / _windageScopeStep);
- };
-};
-
-ctrlSetText [400, Str(Round(_elevationAbs * 100) / 100)];
-ctrlSetText [401, Str(Round(_elevationRel * 100) / 100)];
-ctrlSetText [402, Str(Round(_elevationCur * 100) / 100)];
-
-ctrlSetText [410, Str(Round(_windageAbs * 100) / 100)];
-ctrlSetText [411, Str(Round(_windageRel * 100) / 100)];
-ctrlSetText [412, Str(Round(_windageCur * 100) / 100)];
-
-ctrlSetText [420, Str(Round(_lead * 100) / 100)];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_scope_unit.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_scope_unit.sqf
deleted file mode 100644
index 563d646a21..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_scope_unit.sqf
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "script_component.hpp"
-
-ctrlSetText [2000, cse_ab_ATragMX_scopeUnits select (cse_ab_ATragMX_currentScopeUnit select cse_ab_ATragMX_currentTarget)];
-ctrlSetText [5000, cse_ab_ATragMX_scopeUnits select (cse_ab_ATragMX_currentScopeUnit select cse_ab_ATragMX_currentTarget)];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_target.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_target.sqf
deleted file mode 100644
index 945599bcb8..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_target.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "script_component.hpp"
-
-if (!isNil ("cse_ab_ATragMX_windSpeed")) then
-{
- ctrlSetText [300, Str(Round((cse_ab_ATragMX_windSpeed select cse_ab_ATragMX_currentTarget) * 100) / 100)];
-};
-if (!isNil ("cse_ab_ATragMX_windDirection")) then
-{
- ctrlSetText [310, Str(Round((cse_ab_ATragMX_windDirection select cse_ab_ATragMX_currentTarget)))];
-};
-if (!isNil ("cse_ab_ATragMX_inclinationAngle")) then
-{
- ctrlSetText [320, Str(Round((cse_ab_ATragMX_inclinationAngle select cse_ab_ATragMX_currentTarget)))];
-};
-if (!isNil ("cse_ab_ATragMX_targetSpeed")) then
-{
- ctrlSetText [330, Str(Round((cse_ab_ATragMX_targetSpeed select cse_ab_ATragMX_currentTarget) * 100) / 100)];
-};
-if (!isNil ("cse_ab_ATragMX_targetRange")) then
-{
- ctrlSetText [340, Str(Round((cse_ab_ATragMX_targetRange select cse_ab_ATragMX_currentTarget)))];
-};
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_target_selection.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_target_selection.sqf
deleted file mode 100644
index 7f477f6281..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_target_selection.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "script_component.hpp"
-
-#define _dsp (uiNamespace getVariable "cse_ab_ATragMX_Display")
-
-(_dsp displayCtrl 500) ctrlEnable true;
-(_dsp displayCtrl 501) ctrlEnable true;
-(_dsp displayCtrl 502) ctrlEnable true;
-(_dsp displayCtrl 503) ctrlEnable true;
-
-(_dsp displayCtrl 500 + cse_ab_ATragMX_currentTarget) ctrlEnable false;
-
-ctrlSetFocus (_dsp displayCtrl 3000);
-
-call cse_ab_ATragMX_fnc_update_unit_selection;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_unit_selection.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_unit_selection.sqf
deleted file mode 100644
index cfb2ed6758..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_unit_selection.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "script_component.hpp"
-
-#define _dsp (uiNamespace getVariable "cse_ab_ATragMX_Display")
-
-(_dsp displayCtrl 600) ctrlEnable true;
-(_dsp displayCtrl 601) ctrlEnable true;
-(_dsp displayCtrl 602) ctrlEnable true;
-
-(_dsp displayCtrl 600 + cse_ab_ATragMX_currentUnit) ctrlEnable false;
-
-call cse_ab_ATragMX_fnc_update_gun;
-call cse_ab_ATragMX_fnc_update_atmosphere;
-call cse_ab_ATragMX_fnc_update_target;
-call cse_ab_ATragMX_fnc_update_result;
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_zero_range.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_zero_range.sqf
deleted file mode 100644
index bdeffbc3f2..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/functions/fn_update_zero_range.sqf
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "script_component.hpp"
-
-private ["_scopeBaseAngle"];
-_scopeBaseAngle = ((cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 3);
-
-private ["_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_bc", "_dragModel", "_atmosphereModel"];
-_bulletMass = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 12;
-_boreHeight = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 5;
-_airFriction = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 4;
-_muzzleVelocity = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 1;
-_bc = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 15;
-_dragModel = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 16;
-_atmosphereModel = (cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) select 17;
-
-private ["_zeroRange"];
-_zeroRange = Round(parseNumber(ctrlText 140));
-if (cse_ab_ATragMX_currentUnit != 2) then
-{
- _zeroRange = _zeroRange / 1.0936133;
-};
-
-private ["_temperature", "_barometricPressure", "_relativeHumidity"];
-_temperature = (cse_ab_ATragMX_temperature select cse_ab_ATragMX_currentTarget);
-_barometricPressure = (cse_ab_ATragMX_barometricPressure select cse_ab_ATragMX_currentTarget);
-_relativeHumidity = (cse_ab_ATragMX_relativeHumidity select cse_ab_ATragMX_currentTarget);
-if (cse_ab_ATragMX_currentUnit == 1) then
-{
- _temperature = (_temperature - 32) / 1.8;
- _barometricPressure = _barometricPressure * 33.8638866667;
-};
-
-private ["_result"];
-_result = [_scopeBaseAngle, _bulletMass, _boreHeight, _airFriction, _muzzleVelocity, _temperature, _barometricPressure, _relativeHumidity, 1000, 0, 0, 0, 0, _zeroRange, _bc, _dragModel, _atmosphereModel, false] call cse_ab_ATragMX_fnc_calculate_solution;
-
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [2, _zeroRange];
-(cse_ab_ATragMX_workingMemory select cse_ab_ATragMX_currentTarget) set [3, _scopeBaseAngle + (_result select 0) / 60];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/functions/script_component.hpp b/TO_MERGE/cse/sys_ballistics/atragmx/functions/script_component.hpp
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/init.sqf b/TO_MERGE/cse/sys_ballistics/atragmx/init.sqf
deleted file mode 100644
index 0e5b2060e8..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/init.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-cse_ab_ATragMX_workingMemory = [+(cse_ab_ATragMX_gunList select 0), +(cse_ab_ATragMX_gunList select 0), +(cse_ab_ATragMX_gunList select 0), +(cse_ab_ATragMX_gunList select 0)];
-
-cse_ab_ATragMX_scopeUnits = ["MILs", "TMOA", "SMOA", "Clicks"];
-
-cse_ab_ATragMX_rangeCardStartRange = 200;
-cse_ab_ATragMX_rangeCardEndRange = 2000;
-cse_ab_ATragMX_rangeCardIncrement = 50;
-cse_ab_ATragMX_rangeCardLastColumns = ["Lead", "RemV", "RemE", "TmFlt"];
-cse_ab_ATragMX_rangeCardCurrentColumn = 3;
-cse_ab_ATragMX_rangeCardData = [];
-
-cse_ab_ATragMX_rangeAssistTargetSizeUnits = ["in", "ft", "cm", "m"];
-cse_ab_ATragMX_rangeAssistTargetSizeUnit = 2;
-cse_ab_ATragMX_rangeAssistImageSizeUnits = ["MIL", "TMOA", "IOA"];
-cse_ab_ATragMX_rangeAssistImageSizeUnit = 0;
-cse_ab_ATragMX_rangeAssistUseTargetHeight = true;
-
-cse_ab_ATragMX_speedAssistNumTicksUnits = ["MIL", "TMOA", "IOA"];
-cse_ab_ATragMX_speedAssistNumTicksUnit = 0;
-cse_ab_ATragMX_speedAssistTimer = true;
-
-cse_ab_ATragMX_currentUnit = 2;
-cse_ab_ATragMX_currentGun = [0, 0, 0, 0];
-cse_ab_ATragMX_currentTarget = 0;
-cse_ab_ATragMX_currentScopeUnit = [0, 0, 0, 0];
-
-cse_ab_ATragMX_temperature = [15, 15, 15, 15];
-cse_ab_ATragMX_barometricPressure = [1013.25, 1013.25, 1013.25, 1013.25];
-cse_ab_ATragMX_relativeHumidity = [0.5, 0.5, 0.5, 0.5];
-
-cse_ab_ATragMX_windSpeed = [0, 0, 0, 0];
-cse_ab_ATragMX_windDirection = [12, 12, 12, 12];
-cse_ab_ATragMX_inclinationAngle = [0, 0, 0, 0];
-cse_ab_ATragMX_targetSpeed = [0, 0, 0, 0];
-cse_ab_ATragMX_targetRange = [0, 0, 0, 0];
-
-cse_ab_ATragMX_elevationOutput = [0, 0, 0, 0];
-cse_ab_ATragMX_windageOutput = [0, 0, 0, 0];
-cse_ab_ATragMX_leadOutput = [0, 0, 0, 0];
-cse_ab_ATragMX_tofOutput = [0, 0, 0, 0];
-cse_ab_ATragMX_velocityOutput = [0, 0, 0, 0];
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/license.txt b/TO_MERGE/cse/sys_ballistics/atragmx/license.txt
deleted file mode 100644
index eb925e129b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/license.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) <2014>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/ui/defines.h b/TO_MERGE/cse/sys_ballistics/atragmx/ui/defines.h
deleted file mode 100644
index 6a457f68bf..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/ui/defines.h
+++ /dev/null
@@ -1,182 +0,0 @@
-class cse_ab_ATragMX_RscText
-{
- idc=-1;
- type=0;
- style=256;
- colorDisabled[]={0,0,0,0.0};
- colorBackground[]={0,0,0,0};
- colorText[]={0,0,0,1};
- text="";
- x=0;
- y=0;
- h=0.037;
- w=0.30;
- font="TahomaB";
- SizeEx=0.03;
- shadow=0;
-};
-class cse_ab_ATragMX_RscButton
-{
- text="";
- colorText[]={0,0,0,1};
- colorDisabled[]={0,0,0,0.0};
- colorBackground[]={0,0,0,0};
- colorBackgroundDisabled[]={0,0,0,0};
- colorBackgroundActive[]={0,0,0,0};
- colorFocused[]={0,0,0,0};
- colorShadow[]={0,0,0,0};
- colorBorder[]={0,0,0,1};
- soundEnter[]={"",0,1};
- soundPush[]={"",0,1};
- soundClick[]={"",0,1};
- soundEscape[]={"",0,1};
- type=1;
- style="0x02+0x100";
- x=0;
- y=0;
- w=0.03;
- h=0.03;
- font="TahomaB";
- SizeEx=0.025;
- offsetX=0.003;
- offsetY=0.003;
- offsetPressedX=0.0020;
- offsetPressedY=0.0020;
- borderSize=0;
- shadow=0;
-};
-class cse_ab_ATragMX_RscEdit
-{
- access=0;
- type=2;
- style=ST_RIGHT;
- x=0;
- y=0;
- w=0.05;
- h=0.03;
- colorDisabled[]={0,0,0,0.0};
- colorBackground[]={0,0,0,0};
- colorText[]={0,0,0,1};
- colorSelection[]={0,0,0,0.25};
- font="TahomaB";
- sizeEx=0.025;
- text="";
- size=0.2;
- autocomplete="";
- shadow=0;
-};
-class cse_ab_ATragMX_RscToolbox
-{
- type=6;
- style=ST_LEFT;
- x=0;
- y=0;
- w=0.2;
- h=0.03;
- colorDisabled[]={0,0,0,0.0};
- colorBackground[]={1,1,1,1};
- colorText[]={0,0,0,1};
- color[]={0,0,0,0};
- colorTextSelect[]={0.8,0.8,0.8,1};
- colorSelect[]={0,0,0,1};
- colorSelectedBg[]={0,0,0,1};
- colorTextDisable[]={0.4,0.4,0.4,1};
- colorDisable[]={0.4,0.4,0.4,1};
- font="TahomaB";
- sizeEx=0.027;
- rows=1;
- columns=2;
- strings[]={"Entry 1","Entry 2"};
- values[]={1,0};
- onToolBoxSelChanged="";
-};
-class cse_ab_ATragMX_RscListBox
-{
- idc=-1;
- type=5;
- style=0;
- font="TahomaB";
- sizeEx=0.028;
- rowHeight=0.03;
- colorDisabled[]={0,0,0,0.0};
- colorBackground[]={1,1,1,1};
- colorText[]={0,0,0,1};
- colorScrollbar[]={0.95,0.95,0.95,1};
- colorSelect[]={0,0,0,1};
- colorSelect2[]={0,0,0,1};
- colorSelectBackground[]={0.925,0.925,0.925,1};
- colorSelectBackground2[]={0.925,0.925,0.925,1};
- period=0;
- maxHistoryDelay=1.0;
- autoScrollSpeed=-1;
- autoScrollDelay=5;
- autoScrollRewind=0;
- soundSelect[]={"",0.09,1};
-
- class ScrollBar {
- color[]={1,1,1,0.6};
- colorActive[]={1,1,1,1};
- colorDisabled[]={1,1,1,0.3};
- thumb="\ca\ui\data\igui_scrollbar_thumb_ca.paa";
- arrowFull="\ca\ui\data\igui_arrow_top_active_ca.paa";
- arrowEmpty="\ca\ui\data\igui_arrow_top_ca.paa";
- border="\ca\ui\data\igui_border_scroll_ca.paa";
- };
-
- class ListScrollBar : ScrollBar {
- };
-};
-class cse_ab_ATragMX_RscListNBox: cse_ab_ATragMX_RscListBox
-{
- idc=-1;
- type=102;
- columns[]={0.0, 0.225, 0.475, 0.725};
- drawSideArrows=0;
- idcLeft=-1;
- idcRight=-1;
-};
-class cse_ab_ATragMX_RscControlsGroup
-{
- type=15;
- idc=-1;
- style=16;
- x=0;
- y=0;
- w=1;
- h=1;
- shadow=0;
- class VScrollbar
- {
- color[]={1,1,1,0.6};
- width=0.021;
- autoScrollSpeed=-1;
- autoScrollDelay=5;
- autoScrollRewind=0;
- shadow=0;
- };
- class HScrollbar
- {
- color[]={1,1,1,0.6};
- height=0.028;
- shadow=0;
- };
- class ScrollBar
- {
- color[]={1,1,1,0.6};
- colorActive[]={1,1,1,1};
- colorDisabled[]={1,1,1,0.3};
- thumb="#(argb,8,8,3)color(1,1,1,1)";
- arrowEmpty="#(argb,8,8,3)color(1,1,1,1)";
- arrowFull="#(argb,8,8,3)color(1,1,1,1)";
- border="#(argb,8,8,3)color(1,1,1,1)";
- };
- class Controls
- {
- };
-};
-class cse_ab_ATragMX_RscLineBreak
-{
- idc=-1;
- type=98;
- shadow=0;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/atragmx/ui/display.h b/TO_MERGE/cse/sys_ballistics/atragmx/ui/display.h
deleted file mode 100644
index d82e6fb514..0000000000
--- a/TO_MERGE/cse/sys_ballistics/atragmx/ui/display.h
+++ /dev/null
@@ -1,1015 +0,0 @@
-class cse_ab_ATragMX_Display
-{
- name="cse_ab_ATragMX_Display";
- idd=-1;
- onLoad="uiNamespace setVariable ['cse_ab_ATragMX_Display', (_this select 0)]";
- movingEnable=1;
- controlsBackground[]={};
- objects[]={};
- class controls
- {
- class BACKGROUND
- {
- moving=1;
- type=0;
- font="TahomaB";
- SizeEX=0.025;
- idc=-1;
- style=48;
- x=0.55*safezoneW+safezoneX-0.256;
- y=0.265*safezoneH+safezoneY-0.1;
- w=1.024;
- h=1.024*4/3;
- colorBackground[]={1,1,1,1};
- colorText[]={1,1,1,1};
- text="cse\cse_sys_ballistics\atragmx\data\atrag.paa";
- };
- class POWER: cse_ab_ATragMX_RscButton
- {
- idc=-1;
- x=0.55*safezoneW+safezoneX+0.145;
- y=0.265*safezoneH+safezoneY+0.94;
- w=0.045;
- h=0.045*4/3;
- colorBackground[]={0,0,0,0.0};
- action="closeDialog 0";
- };
- class BACK: POWER
- {
- idc=-1;
- w=0.06;
- x=0.55*safezoneW+safezoneX+0.3122;
- action="call compile preprocessFile 'cse\cse_sys_ballistics\atragmx\init.sqf'; call cse_ab_ATragMX_fnc_update_target_selection";
- };
- class WINDOWS: cse_ab_ATragMX_RscButton
- {
- idc=-1;
- x=0.55*safezoneW+safezoneX+0.130;
- y=0.265*safezoneH+safezoneY+0.88;
- w=0.035;
- h=0.035*4/3;
- colorBackground[]={0,0,0,0.0};
- };
- class OK: WINDOWS
- {
- idc=-1;
- x=0.55*safezoneW+safezoneX+0.347;
- y=0.265*safezoneH+safezoneY+0.878;
- };
- class TOP: cse_ab_ATragMX_RscButton
- {
- idc=-1;
- x=0.55*safezoneW+safezoneX+0.242;
- y=0.265*safezoneH+safezoneY+0.85;
- w=0.03;
- h=0.03;
- colorBackground[]={0,0,0,0.0};
- action="((cse_ab_ATragMX_currentGun select cse_ab_ATragMX_currentTarget) + (count cse_ab_ATragMX_gunList) - 1) % (count cse_ab_ATragMX_gunList) call cse_ab_ATragMX_fnc_change_gun";
- };
- class BOTTOM: TOP
- {
- idc=-1;
- y=0.265*safezoneH+safezoneY+0.955;
- action="((cse_ab_ATragMX_currentGun select cse_ab_ATragMX_currentTarget) + (count cse_ab_ATragMX_gunList) + 1) % (count cse_ab_ATragMX_gunList) call cse_ab_ATragMX_fnc_change_gun";
- };
- class LEFT: cse_ab_ATragMX_RscButton
- {
- idc=-1;
- x=0.55*safezoneW+safezoneX+0.1925;
- y=0.265*safezoneH+safezoneY+0.9;
- w=0.05;
- h=0.03;
- colorBackground[]={0,0,0,0};
- action="call cse_ab_ATragMX_fnc_parse_input; cse_ab_ATragMX_currentTarget = (4 + cse_ab_ATragMX_currentTarget - 1) % 4; call cse_ab_ATragMX_fnc_update_target_selection";
- };
- class RIGHT: LEFT
- {
- idc=-1;
- x=0.55*safezoneW+safezoneX+0.2725;
- action="call cse_ab_ATragMX_fnc_parse_input; cse_ab_ATragMX_currentTarget = (4 + cse_ab_ATragMX_currentTarget + 1) % 4; call cse_ab_ATragMX_fnc_update_target_selection";
- };
- class TOP_LEFT: cse_ab_ATragMX_RscButton
- {
- idc=-1;
- x=0.55*safezoneW+safezoneX+0.162;
- y=0.265*safezoneH+safezoneY+0.82;
- w=0.031;
- h=0.031*4/3;
- colorBackground[]={0,0,0,0.0};
- };
- class TOP_RIGHT: TOP_LEFT
- {
- idc=-1;
- x=0.55*safezoneW+safezoneX+0.315;
- };
-
- class TEXT_GUN_PROFILE: cse_ab_ATragMX_RscText
- {
- idc=1000;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.20;
- w=0.18;
- h=0.03;
- style=ST_LEFT;
- sizeEx=0.025;
- text="";
- };
- class TEXT_D: cse_ab_ATragMX_RscButton
- {
- idc=600;
- w=0.0231;
- x=0.550*safezoneW+safezoneX+0.29;
- y=0.265*safezoneH+safezoneY+0.20;
- colorText[]={0,0,0,1};
- colorDisabled[]={0.8,0.8,0.8,1};
- colorBackgroundDisabled[]={0,0,0,1};
- colorBackgroundActive[]={0,0,0,0};
- text="D";
- action="cse_ab_ATragMX_currentUnit=0; call cse_ab_ATragMX_fnc_update_unit_selection";
- };
- class TEXT_E: TEXT_D
- {
- idc=601;
- x=0.550*safezoneW+safezoneX+0.3131;
- text="E";
- action="cse_ab_ATragMX_currentUnit=1; call cse_ab_ATragMX_fnc_update_unit_selection";
- };
- class TEXT_M: TEXT_E
- {
- idc=602;
- x=0.550*safezoneW+safezoneX+0.3362;
- text="M";
- action="cse_ab_ATragMX_currentUnit=2; call cse_ab_ATragMX_fnc_update_unit_selection";
- };
- class TEXT_RANGE_CARD: TEXT_D
- {
- idc=603;
- w=0.03;
- x=0.550*safezoneW+safezoneX+0.36;
- colorBackground[]={0.15,0.21,0.23,0.3};
- colorFocused[]={0.15,0.21,0.23,0.2};
- text="RC";
- action="call cse_ab_ATragMX_fnc_toggle_range_card";
- };
-
- class TEXT_GUN: cse_ab_ATragMX_RscButton
- {
- idc=4000;
- w=0.0925;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.25;
- colorBackground[]={0.15,0.21,0.23,0.3};
- colorFocused[]={0.15,0.21,0.23,0.2};
- text="Gun";
- };
- class TEXT_BORE_HEIGHT: TEXT_GUN_PROFILE
- {
- idc=10;
- style=ST_LEFT;
- y=0.265*safezoneH+safezoneY+0.285;
- text="BH";
- };
- class TEXT_BORE_HEIGHT_INPUT: cse_ab_ATragMX_RscEdit
- {
- idc=100;
- w=0.058;
- x=0.550*safezoneW+safezoneX+0.145;
- y=0.265*safezoneH+safezoneY+0.285;
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_calculate_target_solution}";
- };
- class TEXT_BULLET_MASS: TEXT_BORE_HEIGHT
- {
- idc=11;
- style=ST_LEFT;
- y=0.265*safezoneH+safezoneY+0.320;
- text="BW";
- };
- class TEXT_BULLET_MASS_INPUT: TEXT_BORE_HEIGHT_INPUT
- {
- idc=110;
- y=0.265*safezoneH+safezoneY+0.320;
- };
- class TEXT_AIR_FRICTION: TEXT_BORE_HEIGHT
- {
- idc=12;
- y=0.265*safezoneH+safezoneY+0.355;
- text="C1";
- };
- class TEXT_AIR_FRICTION_INPUT: TEXT_BORE_HEIGHT_INPUT
- {
- idc=120;
- y=0.265*safezoneH+safezoneY+0.355;
- };
- class TEXT_MUZZLE_VELOCITY: cse_ab_ATragMX_RscButton
- {
- idc=13;
- style=0;
- w=0.03;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.390;
- colorBackground[]={0.15,0.21,0.23,0.3};
- colorFocused[]={0.15,0.21,0.23,0.2};
- text="MV";
- };
- class TEXT_MUZZLE_VELOCITY_INPUT: TEXT_BORE_HEIGHT_INPUT
- {
- idc=130;
- y=0.265*safezoneH+safezoneY+0.390;
- };
- class TEXT_ZERO_RANGE: TEXT_BORE_HEIGHT
- {
- idc=14;
- y=0.265*safezoneH+safezoneY+0.425;
- text="ZR";
- };
- class TEXT_ZERO_RANGE_INPUT: TEXT_BORE_HEIGHT_INPUT
- {
- idc=140;
- y=0.265*safezoneH+safezoneY+0.425;
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_update_zero_range}";
- };
- class TEXT_ATMOSPHERE: TEXT_GUN
- {
- idc=4001;
- x=0.550*safezoneW+safezoneX+0.205;
- text="Atmsphr";
- };
- class TEXT_TEMPERATURE: TEXT_BULLET_MASS
- {
- idc=20;
- x=0.550*safezoneW+safezoneX+0.20;
- text="Tmp";
- };
- class TEXT_TEMPERATURE_INPUT: cse_ab_ATragMX_RscEdit
- {
- idc=200;
- w=0.050;
- x=0.550*safezoneW+safezoneX+0.245;
- y=0.265*safezoneH+safezoneY+0.320;
- text="";
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_calculate_target_solution}";
- };
- class TEXT_BAROMETRIC_PRESSURE: TEXT_AIR_FRICTION
- {
- idc=21;
- x=0.550*safezoneW+safezoneX+0.20;
- text="BP";
- };
- class TEXT_BAROMETRIC_PRESSURE_INPUT: TEXT_TEMPERATURE_INPUT
- {
- idc=210;
- y=0.265*safezoneH+safezoneY+0.355;
- };
- class TEXT_RELATIVE_HUMIDITY: TEXT_AIR_FRICTION
- {
- idc=22;
- x=0.550*safezoneW+safezoneX+0.20;
- y=0.265*safezoneH+safezoneY+0.390;
- text="RH";
- };
- class TEXT_RELATIVE_HUMIDITY_INPUT: TEXT_TEMPERATURE_INPUT
- {
- idc=220;
- y=0.265*safezoneH+safezoneY+0.390;
- };
- class TEXT_TARGET_A: cse_ab_ATragMX_RscButton
- {
- idc=500;
- w=0.0231;
- x=0.550*safezoneW+safezoneX+0.205;
- y=0.265*safezoneH+safezoneY+0.425;
- colorText[]={0,0,0,1};
- colorDisabled[]={0.8,0.8,0.8,1};
- colorBackgroundDisabled[]={0,0,0,1};
- colorBackgroundActive[]={0,0,0,0};
- text="A";
- action="call cse_ab_ATragMX_fnc_parse_input; cse_ab_ATragMX_currentTarget=0; call cse_ab_ATragMX_fnc_update_target_selection";
- };
- class TEXT_TARGET_B: TEXT_TARGET_A
- {
- idc=501;
- x=0.550*safezoneW+safezoneX+0.2281;
- text="B";
- action="call cse_ab_ATragMX_fnc_parse_input; cse_ab_ATragMX_currentTarget=1; call cse_ab_ATragMX_fnc_update_target_selection";
- };
- class TEXT_TARGET_C: TEXT_TARGET_B
- {
- idc=502;
- x=0.550*safezoneW+safezoneX+0.2512;
- text="C";
- action="call cse_ab_ATragMX_fnc_parse_input; cse_ab_ATragMX_currentTarget=2; call cse_ab_ATragMX_fnc_update_target_selection";
- };
- class TEXT_TARGET_D: TEXT_TARGET_B
- {
- idc=503;
- x=0.550*safezoneW+safezoneX+0.2743;
- text="D";
- action="call cse_ab_ATragMX_fnc_parse_input; cse_ab_ATragMX_currentTarget=3; call cse_ab_ATragMX_fnc_update_target_selection";
- };
-
- class TEXT_TARGET: TEXT_GUN
- {
- idc=4002;
- x=0.550*safezoneW+safezoneX+0.3;
- text="Target";
- };
- class TEXT_WIND_SPEED: TEXT_BORE_HEIGHT
- {
- idc=30;
- x=0.550*safezoneW+safezoneX+0.3;
- text="WS";
- };
- class TEXT_WIND_SPEED_INPUT: cse_ab_ATragMX_RscEdit
- {
- idc=300;
- w=0.058;
- x=0.550*safezoneW+safezoneX+0.335;
- y=0.265*safezoneH+safezoneY+0.285;
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_calculate_target_solution}";
- text="0";
- };
- class TEXT_WIND_DIRECTION: TEXT_BULLET_MASS
- {
- idc=31;
- x=0.550*safezoneW+safezoneX+0.3;
- text="WD";
- };
- class TEXT_WIND_DIRECTION_INPUT: TEXT_WIND_SPEED_INPUT
- {
- idc=310;
- y=0.265*safezoneH+safezoneY+0.32;
- };
- class TEXT_INCLINATION_ANGLE: TEXT_AIR_FRICTION
- {
- idc=32;
- x=0.550*safezoneW+safezoneX+0.3;
- text="IA";
- };
- class TEXT_INCLINATION_ANGLE_INPUT: TEXT_WIND_SPEED_INPUT
- {
- idc=320;
- y=0.265*safezoneH+safezoneY+0.355;
- };
- class TEXT_TARGET_SPEED: TEXT_MUZZLE_VELOCITY
- {
- idc=33;
- x=0.550*safezoneW+safezoneX+0.3;
- text="TS";
- action="call cse_ab_ATragMX_fnc_toggle_target_speed_assist";
- };
- class TEXT_TARGET_SPEED_INPUT: TEXT_WIND_SPEED_INPUT
- {
- idc=330;
- y=0.265*safezoneH+safezoneY+0.39;
- };
- class TEXT_TARGET_RANGE: TEXT_TARGET_SPEED
- {
- idc=34;
- y=0.265*safezoneH+safezoneY+0.425;
- text="TR";
- action="0 call cse_ab_ATragMX_fnc_toggle_target_range_assist";
- };
- class TEXT_TARGET_RANGE_INPUT: TEXT_WIND_SPEED_INPUT
- {
- idc=340;
- y=0.265*safezoneH+safezoneY+0.425;
- };
-
- class TEXT_ELEVATION: TEXT_GUN_PROFILE
- {
- idc=40;
- w=0.05;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.50;
- text="Elev";
- };
- class TEXT_ABSOLUTE: TEXT_GUN_PROFILE
- {
- idc=4003;
- w=0.07;
- style=ST_CENTER;
- x=0.550*safezoneW+safezoneX+0.17;
- y=0.265*safezoneH+safezoneY+0.47;
- text="Abs";
- };
- class TEXT_RELATIVE: TEXT_ABSOLUTE
- {
- idc=4004;
- x=0.550*safezoneW+safezoneX+0.245;
- text="Rel";
- };
- class TEXT_CURRENT: TEXT_ABSOLUTE
- {
- idc=4005;
- x=0.550*safezoneW+safezoneX+0.32;
- text="Cur";
- };
- class TEXT_ELEVATION_OUTPUT_ABSOLUTE: cse_ab_ATragMX_RscEdit
- {
- idc=400;
- w=0.07;
- x=0.550*safezoneW+safezoneX+0.17;
- y=0.265*safezoneH+safezoneY+0.50;
- text="";
- };
- class TEXT_ELEVATION_OUTPUT_RELATIVE: TEXT_ELEVATION_OUTPUT_ABSOLUTE
- {
- idc=401;
- x=0.550*safezoneW+safezoneX+0.2465;
- };
- class TEXT_ELEVATION_INPUT_CURRENT: TEXT_ELEVATION_OUTPUT_ABSOLUTE
- {
- idc=402;
- x=0.550*safezoneW+safezoneX+0.323;
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_parse_input; call cse_ab_ATragMX_fnc_update_result}";
- };
- class TEXT_WINDAGE: TEXT_ELEVATION
- {
- idc=41;
- y=0.265*safezoneH+safezoneY+0.535;
- text="Wind";
- };
- class TEXT_WINDAGE_OUTPUT_ABSOLUTE: TEXT_ELEVATION_OUTPUT_ABSOLUTE
- {
- idc=410;
- y=0.265*safezoneH+safezoneY+0.535;
- };
- class TEXT_WINDAGE_OUTPUT_RELATIVE: TEXT_WINDAGE_OUTPUT_ABSOLUTE
- {
- idc=411;
- x=0.550*safezoneW+safezoneX+0.2465;
- };
- class TEXT_WINDAGE_INPUT_CURRENT: TEXT_WINDAGE_OUTPUT_ABSOLUTE
- {
- idc=412;
- x=0.550*safezoneW+safezoneX+0.323;
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_parse_input; call cse_ab_ATragMX_fnc_update_result}";
- };
- class TEXT_LEAD: TEXT_GUN
- {
- idc=42;
- w=0.05;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.57;
- text="Lead";
- };
- class TEXT_LEAD_OUTPUT: TEXT_ELEVATION_OUTPUT_ABSOLUTE
- {
- idc=420;
- y=0.265*safezoneH+safezoneY+0.57;
- };
- class TEXT_RESET_SCOPE_ZERO: TEXT_GUN
- {
- idc=4006;
- w=0.07;
- style=ST_CENTER;
- colorBackground[]={0,0,0,0};
- x=0.550*safezoneW+safezoneX+0.2465;
- y=0.265*safezoneH+safezoneY+0.57;
- text="Reset";
- action="call cse_ab_ATragMX_fnc_reset_relative_click_memory";
- };
- class TEXT_UPDATE_SCOPE_ZERO: TEXT_RESET_SCOPE_ZERO
- {
- idc=4007;
- x=0.550*safezoneW+safezoneX+0.323;
- text="Update";
- action="call cse_ab_ATragMX_fnc_update_relative_click_memory";
- };
- class TEXT_GUN_LIST: TEXT_GUN
- {
- idc=4008;
- style=ST_LEFT;
- y=0.265*safezoneH+safezoneY+0.65;
- text="GunList";
- action="call cse_ab_ATragMX_fnc_toggle_gun_list";
- };
- class TEXT_SCOPE_UNIT: TEXT_GUN_LIST
- {
- idc=2000;
- style=ST_CENTER;
- x=0.550*safezoneW+safezoneX+0.205;
- colorBackground[]={0,0,0,0};
- text="TMOA";
- action="call cse_ab_ATragMX_fnc_cycle_scope_unit";
- };
- class TEXT_CALCULATE: TEXT_SCOPE_UNIT
- {
- idc=3000;
- style=ST_RIGHT;
- x=0.550*safezoneW+safezoneX+0.3;
- text="Calc";
- action="call cse_ab_ATragMX_fnc_calculate_target_solution";
- };
-
- class TEXT_RANGE_CARD_SCOPE_UNIT: TEXT_GUN_PROFILE
- {
- idc=5000;
- text="";
- };
- class TEXT_RANGE_CARD_SETUP: cse_ab_ATragMX_RscButton
- {
- idc=5001;
- w=0.055675;
- x=0.550*safezoneW+safezoneX+0.28;
- y=0.265*safezoneH+safezoneY+0.20;
- colorBackground[]={0.15,0.21,0.23,0.3};
- colorFocused[]={0.15,0.21,0.23,0.2};
- text="Setup";
- action="call cse_ab_ATragMX_fnc_toggle_range_card_setup";
- };
- class TEXT_RANGE_CARD_DONE: TEXT_RANGE_CARD_SETUP
- {
- idc=5002;
- x=0.550*safezoneW+safezoneX+0.3362;
- text="Done";
- action="call cse_ab_ATragMX_fnc_toggle_range_card";
- };
- class TEXT_RANGE_CARD_COLUMN_1_CAPTION: cse_ab_ATragMX_RscButton
- {
- idc=5003;
- style=ST_LEFT;
- w=0.07;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.24;
- colorBackground[]={0.15,0.21,0.23,0.3};
- text="Meters";
- };
- class TEXT_RANGE_CARD_COLUMN_2_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION
- {
- idc=5004;
- x=0.550*safezoneW+safezoneX+0.180625;
- text="Elev";
- };
- class TEXT_RANGE_CARD_COLUMN_3_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION
- {
- idc=5005;
- x=0.550*safezoneW+safezoneX+0.25125;
- text="Wind";
- };
- class TEXT_RANGE_CARD_COLUMN_4_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION
- {
- idc=5006;
- x=0.550*safezoneW+safezoneX+0.321875;
- text="TmFlt";
- action="call cse_ab_ATragMX_fnc_cycle_range_card_columns";
- };
- class TEXT_RANGE_CARD_OUTPUT: cse_ab_ATragMX_RscListNBox
- {
- idc=5007;
- idcLeft=50061;
- idcRight=50062;
- w=0.285;
- h=0.42;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.27;
- };
-
- class TEXT_GUN_LIST_OUTPUT: cse_ab_ATragMX_RscListBox
- {
- idc=6000;
- w=0.16;
- h=0.45;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.24;
- colorSelectBackground[]={0.15,0.21,0.23,0.3};
- colorSelectBackground2[]={0.15,0.21,0.23,0.3};
- onMouseButtonDblClick="true call cse_ab_ATragMX_fnc_toggle_gun_list";
- };
- class TEXT_GUN_LIST_COLUMN_CAPTION: TEXT_GUN_PROFILE
- {
- idc=6001;
- w=0.16;
- colorBackground[]={0.15,0.21,0.23,0.3};
- text="AtragGun.gun";
- };
- class TEXT_GUN_LIST_OPEN_GUN: cse_ab_ATragMX_RscButton
- {
- idc=6002;
- style=ST_RIGHT;
- w=0.115;
- x=0.550*safezoneW+safezoneX+0.28;
- y=0.265*safezoneH+safezoneY+0.20;
- colorBackground[]={0.15,0.21,0.23,0.3};
- colorFocused[]={0.15,0.21,0.23,0.2};
- sizeEx=0.024;
- text="Open Gun";
- action="true call cse_ab_ATragMX_fnc_toggle_gun_list";
- };
- class TEXT_GUN_LIST_SAVE_GUN: TEXT_GUN_LIST_OPEN_GUN
- {
- idc=6003;
- y=0.265*safezoneH+safezoneY+0.24;
- text="Save Gun";
- action="call cse_ab_ATragMX_fnc_save_gun";
- };
- class TEXT_GUN_LIST_ADD_NEW_GUN: TEXT_GUN_LIST_OPEN_GUN
- {
- idc=6004;
- y=0.265*safezoneH+safezoneY+0.28;
- text="Add New Gun";
- action="false call cse_ab_ATragMX_fnc_show_gun_list; true call cse_ab_ATragMX_fnc_show_add_new_gun";
- };
- class TEXT_GUN_LIST_DELETE_GUN: TEXT_GUN_LIST_OPEN_GUN
- {
- idc=6005;
- y=0.265*safezoneH+safezoneY+0.34;
- text="Delete Gun";
- action="call cse_ab_ATragMX_fnc_delete_gun";
- };
- class TEXT_GUN_LIST_NOTE: TEXT_GUN_LIST_OPEN_GUN
- {
- idc=6006;
- y=0.265*safezoneH+safezoneY+0.40;
- text="Note";
- };
- class TEXT_GUN_LIST_DONE: TEXT_GUN_LIST_OPEN_GUN
- {
- idc=6007;
- y=0.265*safezoneH+safezoneY+0.65;
- text="Done";
- action="false call cse_ab_ATragMX_fnc_toggle_gun_list";
- };
-
- class TEXT_TARGET_RANGE_ASSIST_CAPTION: cse_ab_ATragMX_RscText
- {
- idc=7000;
- style=16+0x200;
- lineSpacing=1.0;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.24;
- w=0.29;
- h=0.10;
- sizeEx=0.022;
- text="When using WIDTH to size a target, UP/Down Angle does not effect range calculation but will effect bullet drop.";
- };
- class TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD: TEXT_TARGET_RANGE_ASSIST_CAPTION
- {
- idc=7001;
- style=ST_LEFT;
- x=0.550*safezoneW+safezoneX+0.115;
- y=0.265*safezoneH+safezoneY+0.35;
- w=0.12;
- h=0.03;
- sizeEx=0.027;
- text="Using Target:";
- };
- class TEXT_TARGET_RANGE_ASSIST_WIDTH_HEIGHT: cse_ab_ATragMX_RscToolbox
- {
- idc=7002;
- w=0.14;
- x=0.550*safezoneW+safezoneX+0.24;
- y=0.265*safezoneH+safezoneY+0.35;
- strings[]={"Height","Width"};
- values[]={1,0};
- onToolBoxSelChanged="cse_ab_ATragMX_rangeAssistUseTargetHeight=((_this select 1)==0)";
- };
- class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE: TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD
- {
- idc=7003;
- style=ST_RIGHT;
- x=0.550*safezoneW+safezoneX+0.10;
- y=0.265*safezoneH+safezoneY+0.4;
- text="Target Size";
- };
- class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE
- {
- idc=7004;
- y=0.265*safezoneH+safezoneY+0.45;
- text="Image Size";
- };
- class TEXT_TARGET_RANGE_ASSIST_ANGLE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE
- {
- idc=7005;
- y=0.265*safezoneH+safezoneY+0.5;
- text="Angle";
- };
- class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE
- {
- idc=7006;
- y=0.265*safezoneH+safezoneY+0.55;
- text="Est Range";
- };
- class TEXT_TARGET_RANGE_ASSIST_CALC_1: TEXT_MUZZLE_VELOCITY
- {
- idc=7007;
- w=0.0231;
- x=0.550*safezoneW+safezoneX+0.22;
- y=0.265*safezoneH+safezoneY+0.4;
- sizeEx=0.03;
- text="!";
- action="0 call cse_ab_ATragMX_fnc_calculate_target_range_assist";
- };
- class TEXT_TARGET_RANGE_ASSIST_CALC_2: TEXT_TARGET_RANGE_ASSIST_CALC_1
- {
- idc=7008;
- y=0.265*safezoneH+safezoneY+0.45;
- action="1 call cse_ab_ATragMX_fnc_calculate_target_range_assist";
- };
- class TEXT_TARGET_RANGE_ASSIST_CALC_3: TEXT_TARGET_RANGE_ASSIST_CALC_1
- {
- idc=7009;
- y=0.265*safezoneH+safezoneY+0.55;
- action="2 call cse_ab_ATragMX_fnc_calculate_target_range_assist";
- };
- class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT: cse_ab_ATragMX_RscEdit
- {
- idc=7010;
- w=0.065;
- x=0.550*safezoneW+safezoneX+0.2475;
- y=0.265*safezoneH+safezoneY+0.4;
- };
- class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT
- {
- idc=7011;
- y=0.265*safezoneH+safezoneY+0.45;
- };
- class TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT
- {
- idc=7012;
- y=0.265*safezoneH+safezoneY+0.5;
- };
- class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT
- {
- idc=7013;
- y=0.265*safezoneH+safezoneY+0.55;
- };
- class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_CALC_1
- {
- idc=7014;
- w=0.07;
- x=0.550*safezoneW+safezoneX+0.32;
- text="cm";
- action="cse_ab_ATragMX_rangeAssistTargetSizeUnit=(cse_ab_ATragMX_rangeAssistTargetSizeUnit+1) % (count cse_ab_ATragMX_rangeAssistTargetSizeUnits); ctrlSetText [7014, cse_ab_ATragMX_rangeAssistTargetSizeUnits select cse_ab_ATragMX_rangeAssistTargetSizeUnit]";
- };
- class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT
- {
- idc=7015;
- y=0.265*safezoneH+safezoneY+0.45;
- text="MIL";
- action="cse_ab_ATragMX_rangeAssistImageSizeUnit=(cse_ab_ATragMX_rangeAssistImageSizeUnit+1) % (count cse_ab_ATragMX_rangeAssistImageSizeUnits); ctrlSetText [7015, cse_ab_ATragMX_rangeAssistImageSizeUnits select cse_ab_ATragMX_rangeAssistImageSizeUnit]";
- };
- class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE
- {
- idc=7016;
- style=ST_LEFT;
- w=0.07;
- x=0.550*safezoneW+safezoneX+0.32;
- text="Meters";
- };
- class TEXT_TARGET_RANGE_ASSIST_DONE: cse_ab_ATragMX_RscButton
- {
- idc=7017;
- style=ST_CENTER;
- w=0.07;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.60;
- colorBackground[]={0.15,0.21,0.23,0.3};
- colorFocused[]={0.15,0.21,0.23,0.2};
- text="Done";
- action="1 call cse_ab_ATragMX_fnc_toggle_target_range_assist";
- };
- class TEXT_TARGET_RANGE_ASSIST_CANCEL: TEXT_TARGET_RANGE_ASSIST_DONE
- {
- idc=7018;
- x=0.550*safezoneW+safezoneX+0.180625;
- text="Cancel";
- action="0 call cse_ab_ATragMX_fnc_toggle_target_range_assist";
- };
- class TEXT_TARGET_RANGE_ASSIST_PREV: TEXT_TARGET_RANGE_ASSIST_DONE
- {
- idc=7019;
- x=0.550*safezoneW+safezoneX+0.25125;
- text="Prev";
- action="";
- };
- class TEXT_TARGET_RANGE_ASSIST_NEXT: TEXT_TARGET_RANGE_ASSIST_DONE
- {
- idc=7020;
- x=0.550*safezoneW+safezoneX+0.321875;
- text="Next";
- action="";
- };
-
- class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE
- {
- idc=8000;
- x=0.550*safezoneW+safezoneX+0.12;
- text="Target Range";
- };
- class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE
- {
- idc=8001;
- x=0.550*safezoneW+safezoneX+0.12;
- text="Num Ticks";
- };
- class TEXT_TARGET_SPEED_ASSIST_TIME: TEXT_TARGET_RANGE_ASSIST_ANGLE
- {
- idc=8002;
- x=0.550*safezoneW+safezoneX+0.12;
- text="Time (secs)";
- };
- class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE
- {
- idc=8003;
- x=0.550*safezoneW+safezoneX+0.12;
- text="Est Speed";
- };
- class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT
- {
- idc=8004;
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_calculate_target_speed_assist}";
- };
- class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS_INPUT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT
- {
- idc=8005;
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_calculate_target_speed_assist}";
- };
- class TEXT_TARGET_SPEED_ASSIST_TIME_INPUT: TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT
- {
- idc=8006;
- onKeyUp="if (_this select 1 == 28) then {call cse_ab_ATragMX_fnc_calculate_target_speed_assist}";
- };
- class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_OUTPUT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE
- {
- idc=8007;
- w=0.065;
- x=0.550*safezoneW+safezoneX+0.2475;
- y=0.265*safezoneH+safezoneY+0.55;
- colorBackground[]={0.15,0.21,0.23,0.3};
- text="0";
- };
- class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT
- {
- idc=8008;
- y=0.265*safezoneH+safezoneY+0.4;
- text="Meters";
- };
- class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS_UNIT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT
- {
- idc=8009;
- text="MIL";
- action="cse_ab_ATragMX_speedAssistNumTicksUnit=(cse_ab_ATragMX_speedAssistNumTicksUnit+1) % (count cse_ab_ATragMX_speedAssistNumTicksUnits); ctrlSetText [8009, cse_ab_ATragMX_speedAssistNumTicksUnits select cse_ab_ATragMX_speedAssistNumTicksUnit]; call cse_ab_ATragMX_fnc_calculate_target_speed_assist";
- };
- class TEXT_TARGET_SPEED_ASSIST_TIMER_START: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT
- {
- idc=8010;
- y=0.265*safezoneH+safezoneY+0.5;
- text="Start";
- action="execVM '\atragmx\functions\fnc_target_speed_assist_timer.sqf'";
- };
- class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT
- {
- idc=8011;
- text="m/s";
- };
- class TEXT_TARGET_SPEED_ASSIST_DONE: TEXT_TARGET_RANGE_ASSIST_DONE
- {
- idc=8012;
- action="1 call cse_ab_ATragMX_fnc_toggle_target_speed_assist";
- };
- class TEXT_TARGET_SPEED_ASSIST_CANCEL: TEXT_TARGET_RANGE_ASSIST_CANCEL
- {
- idc=8013;
- action="0 call cse_ab_ATragMX_fnc_toggle_target_speed_assist";
- };
- class TEXT_TARGET_SPEED_ASSIST_PREV: TEXT_TARGET_RANGE_ASSIST_PREV
- {
- idc=8014;
- };
- class TEXT_TARGET_SPEED_ASSIST_NEXT: TEXT_TARGET_RANGE_ASSIST_NEXT
- {
- idc=8015;
- };
-
- class TEXT_TARGET_SPEED_ASSIST_TIMER_STOP_BACKGROUND: cse_ab_ATragMX_RscButton
- {
- idc=9000;
- w=0.285;
- h=0.49;
- x=0.550*safezoneW+safezoneX+0.11;
- y=0.265*safezoneH+safezoneY+0.2;
- colorBackground[]={0,0,0,0};
- colorBackgroundActive[]={0,0,0,0};
- action="cse_ab_ATragMX_speedAssistTimer=false";
- }
- class TEXT_TARGET_SPEED_ASSIST_TIME_OUTPUT: cse_ab_ATragMX_RscText
- {
- idc=9001;
- x=0.550*safezoneW+safezoneX+0.22;
- y=0.265*safezoneH+safezoneY+0.51;
- w=0.08;
- h=0.09;
- style=ST_CENTER;
- sizeEx=0.05;
- text="0.0";
- };
- class TEXT_TARGET_SPEED_ASSIST_TIMER_STOP: cse_ab_ATragMX_RscButton
- {
- idc=9002;
- style=ST_CENTER;
- w=0.07;
- h=0.04;
- x=0.550*safezoneW+safezoneX+0.225;
- y=0.265*safezoneH+safezoneY+0.60;
- colorBackground[]={0.15,0.21,0.23,0.3};
- colorFocused[]={0.15,0.21,0.23,0.2};
- text="Stop";
- action="cse_ab_ATragMX_speedAssistTimer=false";
- };
-
- class TEXT_RANGE_CARD_SETUP_START_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE
- {
- idc=10000;
- x=0.550*safezoneW+safezoneX+0.12;
- text="Start Range";
- };
- class TEXT_RANGE_CARD_SETUP_END_RANGE: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE
- {
- idc=10001;
- x=0.550*safezoneW+safezoneX+0.12;
- text="End Range";
- };
- class TEXT_RANGE_CARD_SETUP_INCREMENT: TEXT_TARGET_RANGE_ASSIST_ANGLE
- {
- idc=10002;
- x=0.550*safezoneW+safezoneX+0.12;
- text="Increment";
- };
- class TEXT_RANGE_CARD_SETUP_START_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT
- {
- idc=10003;
- onKeyUp="if (_this select 1 == 28) then {1 call cse_ab_ATragMX_fnc_toggle_range_card_setup}";
- };
- class TEXT_RANGE_CARD_SETUP_END_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT
- {
- idc=10004;
- onKeyUp="if (_this select 1 == 28) then {1 call cse_ab_ATragMX_fnc_toggle_range_card_setup}";
- };
- class TEXT_RANGE_CARD_SETUP_INCREMENT_INPUT: TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT
- {
- idc=10005;
- onKeyUp="if (_this select 1 == 28) then {1 call cse_ab_ATragMX_fnc_toggle_range_card_setup}";
- };
- class TEXT_RANGE_CARD_SETUP_DONE: TEXT_TARGET_SPEED_ASSIST_DONE
- {
- idc=10006;
- action="1 call cse_ab_ATragMX_fnc_toggle_range_card_setup";
- };
- class TEXT_RANGE_CARD_SETUP_CANCEL: TEXT_TARGET_SPEED_ASSIST_CANCEL
- {
- idc=10007;
- action="0 call cse_ab_ATragMX_fnc_toggle_range_card_setup";
- };
- class TEXT_RANGE_CARD_SETUP_PREV: TEXT_TARGET_SPEED_ASSIST_PREV
- {
- idc=10008;
- };
- class TEXT_RANGE_CARD_SETUP_NEXT: TEXT_TARGET_SPEED_ASSIST_NEXT
- {
- idc=10009;
- };
-
- class TEXT_ADD_NEW_GUN_CAPTION: cse_ab_ATragMX_RscText
- {
- idc=11000;
- style=ST_LEFT;
- w=0.25;
- h=0.04;
- x=0.550*safezoneW+safezoneX+0.12;
- y=0.265*safezoneH+safezoneY+0.24;
- sizeEx=0.025;
- text="New Gun Name";
- };
- class TEXT_ADD_NEW_GUN_GUN_NAME_INPUT: cse_ab_ATragMX_RscEdit
- {
- idc=11001;
- style=ST_LEFT;
- w=0.225;
- h=0.04;
- x=0.550*safezoneW+safezoneX+0.12;
- y=0.265*safezoneH+safezoneY+0.28;
- text="";
- };
- class TEXT_ADD_NEW_GUN_OK: cse_ab_ATragMX_RscButton
- {
- idc=11002;
- style=ST_CENTER;
- w=0.1;
- h=0.04;
- x=0.550*safezoneW+safezoneX+0.12;
- y=0.265*safezoneH+safezoneY+0.33;
- colorBackground[]={0.15,0.21,0.23,0.3};
- colorFocused[]={0.15,0.21,0.23,0.2};
- text="OK";
- action="call cse_ab_ATragMX_fnc_add_new_gun; false call cse_ab_ATragMX_fnc_show_add_new_gun; true call cse_ab_ATragMX_fnc_show_gun_list";
- };
- class TEXT_ADD_NEW_GUN_CANCEL: TEXT_ADD_NEW_GUN_OK
- {
- idc=11003;
- x=0.550*safezoneW+safezoneX+0.245;
- text="Cancel";
- action="false call cse_ab_ATragMX_fnc_show_add_new_gun; true call cse_ab_ATragMX_fnc_show_gun_list";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgFunctions.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgFunctions.h
deleted file mode 100644
index 961697ae3b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgFunctions.h
+++ /dev/null
@@ -1,16 +0,0 @@
-class cfgFunctions {
- class CSE_ab_kestrel4500
- {
- class Kestrel {
- file = "cse\cse_sys_ballistics\kestrel4500\functions";
- class button_pressed { recompile = 1; };
- class collect_data { recompile = 1; };
- class create_dialog { recompile = 1; };
- class display_kestrel { recompile = 1; };
- class generate_output_data { recompile = 1; };
- class update_display { recompile = 1; };
- class kestrel_mainLoop { recompile = 1; };
- class hasAdvancedBallisticsEnabled { recompile = 1; };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgSounds.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgSounds.h
deleted file mode 100644
index 5c6ac6de09..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgSounds.h
+++ /dev/null
@@ -1,39 +0,0 @@
-class CfgSounds
-{
- class cse_ab_kestrel4500_center_button_click
- {
- name="kestrel4500_center_button_click";
- sound[]={"cse\cse_sys_ballistics\kestrel4500\sound\kestrel_center_button_click.wav",1,1};
- titles[]={};
- };
- class cse_ab_kestrel4500_top_button_click
- {
- name="kestrel4500_top_button_click";
- sound[]={"cse\cse_sys_ballistics\kestrel4500\sound\kestrel_top_button_click.wav",1,1};
- titles[]={};
- };
- class cse_ab_kestrel4500_right_button_click
- {
- name="kestrel4500_right_button_click";
- sound[]={"cse\cse_sys_ballistics\kestrel4500\sound\kestrel_right_button_click.wav",1,1};
- titles[]={};
- };
- class cse_ab_kestrel4500_bottom_button_click
- {
- name="kestrel4500_bottom_button_click";
- sound[]={"cse\cse_sys_ballistics\kestrel4500\sound\kestrel_bottom_button_click.wav",1,1};
- titles[]={};
- };
- class cse_ab_kestrel4500_left_button_click
- {
- name="kestrel4500_left_button_click";
- sound[]={"cse\cse_sys_ballistics\kestrel4500\sound\kestrel_left_button_click.wav",1,1};
- titles[]={};
- };
- class cse_ab_kestrel4500_exit_button_click
- {
- name="kestrel4500_exit_button_click";
- sound[]={"cse\cse_sys_ballistics\kestrel4500\sound\kestrel_exit_button_click.wav",1,1};
- titles[]={};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgVehicles.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgVehicles.h
deleted file mode 100644
index a77b370e9c..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/CfgVehicles.h
+++ /dev/null
@@ -1,37 +0,0 @@
-class CfgVehicles
-{
- class Item_Base_F;
- class cse_ab_Item_Kestrel4500: Item_Base_F
- {
- scope=2;
- scopeCurator=2;
- displayName="Kestrel4500";
- author="Ruthberg";
- vehicleClass="Items";
- class TransportItems
- {
- class cse_ab_Kestrel4500
- {
- name="cse_ab_Kestrel4500";
- count=1;
- };
- };
- };
-
- class NATO_Box_Base;
- class cse_ballisticsItemsCrate: NATO_Box_Base
- {
- scope = 2;
- displayName = "Ballistic Items [CSE]";
- author = "Combat Space Enhancement";
- model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
- class TransportWeapons
- {
- class _xx_cse_ab_Kestrel4500
- {
- weapon="cse_ab_Kestrel4500";
- count=5;
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/Combat_space_enhancement.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/Combat_space_enhancement.h
deleted file mode 100644
index e52dee03d7..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/Combat_space_enhancement.h
+++ /dev/null
@@ -1,11 +0,0 @@
-class Combat_Space_Enhancement {
- class EventHandlers {
- class PostInit_EventHandlers {
- class cse_ab_kestrel4500 {
- init = "call compile preprocessFile 'cse\cse_sys_ballistics\kestrel4500\XEH_postClientInit.sqf';";
- name = "Kestrel 4500";
- author = "Ruthberg";
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/XEH_postClientInit.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/XEH_postClientInit.sqf
deleted file mode 100644
index fc5b82e664..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/XEH_postClientInit.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-if (!hasInterface) exitwith{};
-
-call compile preprocessFile "cse\cse_sys_ballistics\kestrel4500\init.sqf";
-
-
-[] spawn {
- waituntil {!isnil "cse_gui"};
- // TODO seperate config entry for this, outside module space.
- ["cse_sys_ballistics_Kestrel4500_open", (["cse_sys_ballistics_Kestrel4500_open","menu",[70, 0,0,0]] call cse_fnc_getKeyBindingFromProfile_F), { _this call cse_ab_kestrel4500_fnc_create_dialog; }, 790542] call cse_fnc_addKeyBindingForMenu_F;
- ["cse_sys_ballistics_Kestrel4500_open","menu", "Open Kestrel4500", "Opens the Kestrel4500 dialog"] call cse_fnc_settingsDefineDetails_F;
-
- ["cse_sys_ballistics_Kestrel4500_show", (["cse_sys_ballistics_Kestrel4500_show","action",[70, 1,0,0]] call cse_fnc_getKeyBindingFromProfile_F), { _this call cse_ab_kestrel4500_fnc_display_kestrel; }] call cse_fnc_addKeyBindingForAction_F;
- ["cse_sys_ballistics_Kestrel4500_show","action", "Show Kestrel4500", "Show the Kestrel4500 without mouse."] call cse_fnc_settingsDefineDetails_F;
-
- _entries = [
- ["Kestrel 4500", {([player, 'cse_ab_Kestrel4500'] call cse_fnc_hasItem_CC)}, "cse\cse_sys_ballistics\kestrel4500\data\Kestrel4500_Icon.paa", { closeDialog 0; call cse_ab_Kestrel4500_fnc_create_dialog; }, "Use Kestrel 4500"]
- ];
- ["ActionMenu", "equipment", _entries] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/cfgWeapons.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/cfgWeapons.h
deleted file mode 100644
index c0350297f3..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/cfgWeapons.h
+++ /dev/null
@@ -1,20 +0,0 @@
-class CfgWeapons
-{
- class ItemCore;
- class InventoryItem_Base_F;
- class cse_ab_Kestrel4500: ItemCore
- {
- scope=2;
- value = 1;
- count = 1;
- type = 16;
- displayName="Kestrel4500";
- picture= "\cse\cse_sys_ballistics\kestrel4500\data\Kestrel4500_Icon.paa";
- descriptionShort="Kestrel 4500 Pocket Weather Tracker";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/config.cpp b/TO_MERGE/cse/sys_ballistics/kestrel4500/config.cpp
deleted file mode 100644
index 9f83f3df62..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/config.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#define ST_LEFT 0
-#define ST_RIGHT 1
-#define ST_CENTER 2
-
-class CfgPatches
-{
- class cse_ab_kestrel4500
- {
- units[]={};
- weapons[]= {"cse_ab_Kestrel4500"};
- requiredVersion=1.26;
- requiredAddons[]= {"cse_f_modules", "cse_main", "cse_f_configuration"};
- version="1.3";
- author[]= {"Ruthberg"};
- };
-};
-class CfgAddons
-{
- class PreloadAddons
- {
- class cse_ab_kestrel4500
- {
- list[]=
- {
- "cse_ab_kestrel4500"
- };
- };
- };
-};
-
-#include "combat_space_enhancement.h"
-#include "CfgWeapons.h"
-#include "CfgVehicles.h"
-#include "CfgFunctions.h"
-#include "CfgSounds.h"
-#include "UI.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/data/Kestrel4500.paa b/TO_MERGE/cse/sys_ballistics/kestrel4500/data/Kestrel4500.paa
deleted file mode 100644
index 4fafe55cb2..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/kestrel4500/data/Kestrel4500.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/data/Kestrel4500_Icon.paa b/TO_MERGE/cse/sys_ballistics/kestrel4500/data/Kestrel4500_Icon.paa
deleted file mode 100644
index 062282115a..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/kestrel4500/data/Kestrel4500_Icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_button_pressed.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_button_pressed.sqf
deleted file mode 100644
index 6d0bfa7390..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_button_pressed.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "script_component.hpp"
-
-switch (_this) do {
- case 0: { // Enter
- if (!cse_ab_Kestrel4500_MinAvgMax && (cse_ab_Kestrel4500_Menu == 2 || cse_ab_Kestrel4500_Menu == 3)) then {
- cse_ab_Kestrel4500_RefHeading = getDir player;
- };
- if (cse_ab_Kestrel4500_MinAvgMax && cse_ab_Kestrel4500_Menu > 0 && cse_ab_Kestrel4500_Menu < 4) then {
- if (cse_ab_Kestrel4500_MinAvgMaxMode != 1) then {
- {
- cse_ab_Kestrel4500_MIN set [_x, 0];
- cse_ab_Kestrel4500_MAX set [_x, 0];
- cse_ab_Kestrel4500_TOTAL set [_x, 0];
- cse_ab_Kestrel4500_ENTRIES set [_x, 0];
- } forEach [1, 2, 3];
- };
- cse_ab_Kestrel4500_MinAvgMaxMode = (cse_ab_Kestrel4500_MinAvgMaxMode + 1) % 3;
- };
- };
- case 1: { // Top
- cse_ab_Kestrel4500_Menu = (cse_ab_Kestrel4500_Menu - 1 + (count cse_ab_Kestrel4500_Menus)) % (count cse_ab_Kestrel4500_Menus);
- };
- case 2: { // Bottom
- cse_ab_Kestrel4500_Menu = (cse_ab_Kestrel4500_Menu + 1 + (count cse_ab_Kestrel4500_Menus)) % (count cse_ab_Kestrel4500_Menus);
- };
- case 3: { // Left
- cse_ab_Kestrel4500_MinAvgMAx = !cse_ab_Kestrel4500_MinAvgMAx;
- };
- case 4: { // Right
- cse_ab_Kestrel4500_MinAvgMAx = !cse_ab_Kestrel4500_MinAvgMAx;
- };
- case 5: { // Memory
- };
- case 6: { // Backlight
- };
-};
-
-_null = _this spawn cse_ab_Kestrel4500_fnc_update_display;
-
-nil;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_collect_data.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_collect_data.sqf
deleted file mode 100644
index c172855533..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_collect_data.sqf
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "script_component.hpp"
-
-private ["_playerDir", "_windSpeed", "_windDir", "_crosswind", "_headwind", "_humidity", "_temperature", "_humidity", "_barometricPressure", "_altitude"];
-
-if (isNil "cse_AB_Altitude") then {AB_Altitude = 0};
-if (isNil "cse_AB_Temperature") then {AB_Temperature = 0};
-
-if (isNil "cse_ab_Kestrel4500_MIN" || isNil "cse_ab_Kestrel4500_MAX") then {
- _temperature = 15;
- _humidity = humidity;
- if ((["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_f)) then {
- _temperature = ((getPosASL player) select 2) call cse_ab_ballistics_fnc_get_temperature_at_height;
- _humidity = ((getPosASL player) select 2) call cse_ab_ballistics_fnc_get_humidity_at_height;
- };
- _barometricPressure = 1013.25 * exp(-(AB_Altitude + ((getPosASL player) select 2)) / 7990) - 10 * overcast;
- _altitude = AB_Altitude + ((getPosASL player) select 2);
- cse_ab_Kestrel4500_MIN = [0, 0, 0, 0, _temperature, _humidity, _barometricPressure, _altitude];
- cse_ab_Kestrel4500_MAX = [0, 0, 0, 0, _temperature, _humidity, _barometricPressure, _altitude];
-};
-
-{
- cse_ab_Kestrel4500_ENTRIES set [_x, (cse_ab_Kestrel4500_ENTRIES select _x) + 1];
-} forEach [0, 4, 5, 6 ,7];
-
-// Direction
-_playerDir = getDir player;
-cse_ab_Kestrel4500_MIN set [0, (cse_ab_Kestrel4500_MIN select 0) min _playerDir];
-cse_ab_Kestrel4500_MAX set [0, _playerDir max (cse_ab_Kestrel4500_MAX select 0)];
-cse_ab_Kestrel4500_TOTAL set [0, (cse_ab_Kestrel4500_TOTAL select 0) + _playerDir];
-
-if (cse_ab_Kestrel4500_MinAvgMaxMode == 1) then {
- {
- cse_ab_Kestrel4500_ENTRIES set [_x, (cse_ab_Kestrel4500_ENTRIES select _x) + 1];
- } forEach [1, 2, 3];
-
- // Wind SPD
- _windSpeed = vectorMagnitude wind;
- _windDir = (wind select 0) atan2 (wind select 1);
-
- if (call cse_ab_Kestrel4500_fnc_hasAdvancedBallisticsEnabled) then {
- _windSpeed = (eyePos player) call cse_ab_ballistics_fnc_calculate_wind_speed;
- };
-
- _windSpeed = cos(_playerDir - _windDir) * _windSpeed;
- cse_ab_Kestrel4500_MIN set [1, (cse_ab_Kestrel4500_MIN select 1) min abs(_windSpeed)];
- cse_ab_Kestrel4500_MAX set [1, abs(_windSpeed) max (cse_ab_Kestrel4500_MAX select 1)];
- cse_ab_Kestrel4500_TOTAL set [1, (cse_ab_Kestrel4500_TOTAL select 1) + abs(_windSpeed)];
-
- // CROSSWIND
- _crosswind = abs(sin(cse_ab_Kestrel4500_RefHeading - _playerDir) * _windSpeed);
- cse_ab_Kestrel4500_MIN set [2, (cse_ab_Kestrel4500_MIN select 2) min _crosswind];
- cse_ab_Kestrel4500_MAX set [2, _crosswind max (cse_ab_Kestrel4500_MAX select 2)];
- cse_ab_Kestrel4500_TOTAL set [2, (cse_ab_Kestrel4500_TOTAL select 2) + _crosswind];
-
- // HEADWIND
- _headwind = abs(cos(cse_ab_Kestrel4500_RefHeading - _playerDir) * _windSpeed);
- cse_ab_Kestrel4500_MIN set [3, (cse_ab_Kestrel4500_MIN select 3) min _headwind];
- cse_ab_Kestrel4500_MAX set [3, _headwind max (cse_ab_Kestrel4500_MAX select 3)];
- cse_ab_Kestrel4500_TOTAL set [3, (cse_ab_Kestrel4500_TOTAL select 3) + _headwind];
-};
-
-// TEMP
-_temperature = 15;
-if ((["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_f)) then {
- _temperature = ((getPosASL player) select 2) call cse_ab_ballistics_fnc_get_temperature_at_height;
-};
-cse_ab_Kestrel4500_MIN set [4, (cse_ab_Kestrel4500_MIN select 4) min _temperature];
-cse_ab_Kestrel4500_MAX set [4, _temperature max (cse_ab_Kestrel4500_MAX select 4)];
-cse_ab_Kestrel4500_TOTAL set [4, (cse_ab_Kestrel4500_TOTAL select 4) + _temperature];
-
-// HUMIDITY
-_humidity = humidity;
-if ((["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_f)) then {
- _humidity = ((getPosASL player) select 2) call cse_ab_ballistics_fnc_get_humidity_at_height;
-};
-cse_ab_Kestrel4500_MIN set [5, (cse_ab_Kestrel4500_MIN select 5) min _humidity];
-cse_ab_Kestrel4500_MAX set [5, _humidity max (cse_ab_Kestrel4500_MAX select 5)];
-cse_ab_Kestrel4500_TOTAL set [5, (cse_ab_Kestrel4500_TOTAL select 5) + _humidity];
-
-// BARO
-_barometricPressure = 1013.25 * exp(-(AB_Altitude + ((getPosASL player) select 2)) / 7990) - 10 * overcast;
-cse_ab_Kestrel4500_MIN set [6, (cse_ab_Kestrel4500_MIN select 6) min _barometricPressure];
-cse_ab_Kestrel4500_MAX set [6, _barometricPressure max (cse_ab_Kestrel4500_MAX select 6)];
-cse_ab_Kestrel4500_TOTAL set [6, (cse_ab_Kestrel4500_TOTAL select 6) + _barometricPressure];
-
-// ALTITUDE
-_altitude = AB_Altitude + ((getPosASL player) select 2);
-cse_ab_Kestrel4500_MIN set [7, (cse_ab_Kestrel4500_MIN select 7) min _altitude];
-cse_ab_Kestrel4500_MAX set [7, _altitude max (cse_ab_Kestrel4500_MAX select 7)];
-cse_ab_Kestrel4500_TOTAL set [7, (cse_ab_Kestrel4500_TOTAL select 7) + _altitude];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_create_dialog.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_create_dialog.sqf
deleted file mode 100644
index 0290c730f0..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_create_dialog.sqf
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "script_component.hpp"
-
-if (underwater player) exitWith { false };
-if (!([player] call cse_fnc_canInteract) || {!([player, "cse_ab_Kestrel4500"] call cse_fnc_hasItem_CC)}) exitwith {false};
-
-cse_ab_Kestrel4500_Overlay = false;
-3 cutText ["", "PLAIN"];
-
-cse_ab_Kestrel4500 = true;
-createDialog 'cse_ab_Kestrel4500_Display';
-[] spawn cse_ab_Kestrel4500_fnc_kestrel_mainLoop;
-
-true
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_display_kestrel.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_display_kestrel.sqf
deleted file mode 100644
index a2812d6ed3..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_display_kestrel.sqf
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "script_component.hpp"
-
-#define __dsp (uiNamespace getVariable "cse_ab_RscKestrel4500")
-#define __ctrlcse_ab_Kestrel4500 (__dsp displayCtrl 75000)
-#define __ctrlTop (__dsp displayCtrl 75100)
-#define __ctrlCenterBig (__dsp displayCtrl 75200)
-#define __ctrlCenterLine1Left (__dsp displayCtrl 75300)
-#define __ctrlCenterLine2Left (__dsp displayCtrl 75301)
-#define __ctrlCenterLine3Left (__dsp displayCtrl 75302)
-#define __ctrlCenterLine1Right (__dsp displayCtrl 75303)
-#define __ctrlCenterLine2Right (__dsp displayCtrl 75304)
-#define __ctrlCenterLine3Right (__dsp displayCtrl 75305)
-#define __ctrlInfoLine1 (__dsp displayCtrl 75400)
-#define __ctrlInfoLine2 (__dsp displayCtrl 75401)
-
-if (cse_ab_Kestrel4500_Overlay) exitWith {
- cse_ab_Kestrel4500_Overlay = false;
- 3 cutText ["", "PLAIN"];
- true
-};
-if (underwater player) exitWith { true };
-if (!([player, "cse_ab_Kestrel4500"] call cse_fnc_hasItem_CC)) exitWith { true };
-
-if (cse_ab_Kestrel4500 && dialog) then {
- cse_ab_Kestrel4500 = false;
- closeDialog 0;
-};
-
-[] spawn {
- private ["_outputData"];
-
- cse_ab_Kestrel4500_Overlay = true;
-
- while {cse_ab_Kestrel4500_Overlay && (("cse_ab_Kestrel4500" in (uniformItems player)) || ("cse_ab_Kestrel4500" in (vestItems player)))} do {
- _outputData = call cse_ab_Kestrel4500_fnc_generate_output_data;
-
- 3 cutRsc ["cse_ab_RscKestrel4500", "PLAIN", 1, false];
-
- __ctrlTop ctrlSetText (_outputData select 0);
- __ctrlCenterBig ctrlSetText (_outputData select 1);
-
- __ctrlTop ctrlSetText (_outputData select 0);
- __ctrlCenterBig ctrlSetText (_outputData select 1);
-
- __ctrlCenterLine1Left ctrlSetText (_outputData select 2);
- __ctrlCenterLine2Left ctrlSetText (_outputData select 3);
- __ctrlCenterLine3Left ctrlSetText (_outputData select 4);
-
- __ctrlCenterLine1Right ctrlSetText (_outputData select 5);
- __ctrlCenterLine2Right ctrlSetText (_outputData select 6);
- __ctrlCenterLine3Right ctrlSetText (_outputData select 7);
-
- __ctrlInfoLine1 ctrlSetText (_outputData select 8);
- __ctrlInfoLine2 ctrlSetText (_outputData select 9);
-
- sleep 1;
- };
-
- cse_ab_Kestrel4500_Overlay = false;
- 3 cutText ["", "PLAIN"];
-};
-
-true
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_generate_output_data.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_generate_output_data.sqf
deleted file mode 100644
index 38627a7dfc..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_generate_output_data.sqf
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "script_component.hpp"
-
-private ["_playerDir", "_textTop", "_textCenterBig", "_textCenterLine1Left", "_textCenterLine2Left", "_textCenterLine3Left", "_textCenterLine1Right", "_textCenterLine2Right", "_textCenterLine3Right", "_textInfoLine1", "_textInfoLine2", "_temperature", "_humidity", "_windSpeed", "_windDir", "_newWindSpeed", "_windSource", "_height"];
-
-if (isNil "cse_AB_Altitude") then {AB_Altitude = 0};
-if (isNil "cse_AB_Temperature") then {AB_Temperature = 0};
-
-call cse_ab_Kestrel4500_fnc_collect_data;
-
-_textTop = cse_ab_Kestrel4500_Menus select cse_ab_Kestrel4500_Menu;
-_textCenterBig = "";
-
-_textCenterLine1Left = "";
-_textCenterLine2Left = "";
-_textCenterLine3Left = "";
-_textCenterLine1Right = "";
-_textCenterLine2Right = "";
-_textCenterLine3Right = "";
-
-_textInfoLine1 = "";
-_textInfoLine2 = "";
-
-_windSpeed = vectorMagnitude wind;
-_windDir = (wind select 0) atan2 (wind select 1);
-
-_temperature = 15;
-_humidity = humidity;
-
-if (call cse_ab_Kestrel4500_fnc_hasAdvancedBallisticsEnabled) then {
- _windSpeed = (eyePos player) call cse_ab_ballistics_fnc_calculate_wind_speed;
- _temperature = ((getPosASL player) select 2) call cse_ab_ballistics_fnc_get_temperature_at_height;
- _humidity = ((getPosASL player) select 2) call cse_ab_ballistics_fnc_get_humidity_at_height;
-};
-
-_playerDir = getDir player;
-_windSpeed = cos(_playerDir - _windDir) * _windSpeed;
-
-cse_ab_Kestrel4500_Direction = 4 * floor(_playerDir / 90);
-if (_playerDir % 90 > 10) then { cse_ab_Kestrel4500_Direction = cse_ab_Kestrel4500_Direction + 1};
-if (_playerDir % 90 > 35) then { cse_ab_Kestrel4500_Direction = cse_ab_Kestrel4500_Direction + 1};
-if (_playerDir % 90 > 55) then { cse_ab_Kestrel4500_Direction = cse_ab_Kestrel4500_Direction + 1};
-if (_playerDir % 90 > 80) then { cse_ab_Kestrel4500_Direction = cse_ab_Kestrel4500_Direction + 1};
-cse_ab_Kestrel4500_Direction = cse_ab_Kestrel4500_Direction % 16;
-
-switch (cse_ab_Kestrel4500_Menu) do {
- case 0: { // Direction
- if (!cse_ab_Kestrel4500_MinAvgMax) then {
- _textCenterBig = format["%1", format["%1 %2", cse_ab_Kestrel4500_Directions select cse_ab_Kestrel4500_Direction, round(_playerDir)]];
- } else {
- _textCenterLine1Left = "Min";
- _textCenterLine2Left = "Avg";
- _textCenterLine3Left = "Max";
- _textCenterLine1Right = "N/A";
- _textCenterLine2Right = "N/A";
- _textCenterLine3Right = "N/A";
- };
- };
- case 1: { // Wind SPD
- if (!cse_ab_Kestrel4500_MinAvgMax) then {
- _textCenterBig = Str(round(abs(_windSpeed) * 10) / 10);
- } else {
- _textCenterLine1Left = "Max";
- _textCenterLine2Left = "Avg";
- switch (cse_ab_Kestrel4500_MinAvgMaxMode) do {
- case 0: {
- _textCenterLine1Right = "--. -";
- _textCenterLine2Right = "--. -";
- _textInfoLine2 = "- average";
- };
- case 1: {
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MAX select 1) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 1) / (cse_ab_Kestrel4500_ENTRIES select 1) * 10) / 10);
- _textInfoLine2 = "- stop";
- };
- case 2: {
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MAX select 1) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 1) / (cse_ab_Kestrel4500_ENTRIES select 1) * 10) / 10);
- _textInfoLine2 = "- clear";
- };
- };
- };
- };
- case 2: { // CROSSWIND
- if (!cse_ab_Kestrel4500_MinAvgMax) then {
- _textCenterBig = Str(round(abs(sin(cse_ab_Kestrel4500_RefHeading - _playerDir) * _windSpeed) * 10) / 10);
- _textInfoLine1 = format["%1 m/s @ %2", round((cos(_playerDir - _windDir) * _windSpeed) * 10) / 10, round(_playerDir)];
- _textInfoLine2 = "- set heading";
- } else {
- _textCenterLine1Left = "Max";
- _textCenterLine2Left = "Avg";
- switch (cse_ab_Kestrel4500_MinAvgMaxMode) do {
- case 0: {
- _textCenterLine1Right = "--. -";
- _textCenterLine2Right = "--. -";
- _textInfoLine2 = "- average";
- };
- case 1: {
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MAX select 2) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 2) / (cse_ab_Kestrel4500_ENTRIES select 2) * 10) / 10);
- _textInfoLine2 = "- stop";
- };
- case 2: {
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MAX select 2) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 2) / (cse_ab_Kestrel4500_ENTRIES select 2) * 10) / 10);
- _textInfoLine2 = "- clear";
- };
- };
- };
- };
- case 3: { // HEADWIND
- if (!cse_ab_Kestrel4500_MinAvgMax) then {
- _textCenterBig = Str(round(abs(cos(cse_ab_Kestrel4500_RefHeading - _playerDir) * _windSpeed) * 10) / 10);
- _textInfoLine1 = format["%1 m/s @ %2", round((cos(_playerDir - _windDir) * _windSpeed) * 10) / 10, round(_playerDir)];
- _textInfoLine2 = "- set heading";
- } else {
- _textCenterLine1Left = "Max";
- _textCenterLine2Left = "Avg";
- switch (cse_ab_Kestrel4500_MinAvgMaxMode) do {
- case 0: {
- _textCenterLine1Right = "--. -";
- _textCenterLine2Right = "--. -";
- _textInfoLine2 = "- average";
- };
- case 1: {
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MAX select 3) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 3) / (cse_ab_Kestrel4500_ENTRIES select 3) * 10) / 10);
- _textInfoLine2 = "- stop";
- };
- case 2: {
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MAX select 3) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 3) / (cse_ab_Kestrel4500_ENTRIES select 3) * 10) / 10);
- _textInfoLine2 = "- clear";
- };
- };
- };
- };
- case 4: { // TEMP
- if (!cse_ab_Kestrel4500_MinAvgMax) then {
- _textCenterBig = Str(round(_temperature * 10) / 10);
- } else {
- _textCenterLine1Left = "Min";
- _textCenterLine2Left = "Avg";
- _textCenterLine3Left = "Max";
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MIN select 4) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 4) / (cse_ab_Kestrel4500_ENTRIES select 4) * 10) / 10);
- _textCenterLine3Right = Str(round((cse_ab_Kestrel4500_MAX select 4) * 10) / 10);
- };
- };
- case 5: { // HUMIDITY
- if (!cse_ab_Kestrel4500_MinAvgMax) then {
- _textCenterBig = Str(round(_humidity * 100 * 10) / 10);
- } else {
- _textCenterLine1Left = "Min";
- _textCenterLine2Left = "Avg";
- _textCenterLine3Left = "Max";
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MIN select 5) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 5) / (cse_ab_Kestrel4500_ENTRIES select 5) * 10) / 10);
- _textCenterLine3Right = Str(round((cse_ab_Kestrel4500_MAX select 5) * 10) / 10);
- };
- };
- case 6: { // BARO
- if (!cse_ab_Kestrel4500_MinAvgMax) then {
- _textCenterBig = Str(round((1013.25 * exp(-(AB_Altitude + ((getPosASL player) select 2)) / 7990) - 10 * overcast) * 10) / 10);
- } else {
- _textCenterLine1Left = "Min";
- _textCenterLine2Left = "Avg";
- _textCenterLine3Left = "Max";
- _textCenterLine1Right = Str(round((cse_ab_Kestrel4500_MIN select 6) * 10) / 10);
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 6) / (cse_ab_Kestrel4500_ENTRIES select 6) * 10) / 10);
- _textCenterLine3Right = Str(round((cse_ab_Kestrel4500_MAX select 6) * 10) / 10);
- };
- };
- case 7: { // ALTITUDE
- if (!cse_ab_Kestrel4500_MinAvgMax) then {
- _textCenterBig = Str(round(AB_Altitude + ((getPosASL player) select 2)));
- } else {
- _textCenterLine1Left = "Min";
- _textCenterLine2Left = "Avg";
- _textCenterLine3Left = "Max";
- _textCenterLine1Right = Str(round(cse_ab_Kestrel4500_MIN select 7));
- _textCenterLine2Right = Str(round((cse_ab_Kestrel4500_TOTAL select 7) / (cse_ab_Kestrel4500_ENTRIES select 7)));
- _textCenterLine3Right = Str(round(cse_ab_Kestrel4500_MAX select 7));
- };
- };
- case 8: { // User Screen 1
- _textCenterLine1Left = Str(round(_playerDir));
- _textCenterLine2Left = Str(round(AB_Altitude + ((getPosASL player) select 2)));
- _textCenterLine3Left = Str(round(abs(_windSpeed) * 10) / 10);
- _textCenterLine1Right = cse_ab_Kestrel4500_Directions select cse_ab_Kestrel4500_Direction;
- _textCenterLine2Right = "m";
- _textCenterLine3Right = "m/s";
- };
- case 9: { // User Screen 2
- _textCenterLine1Left = Str(round(_temperature * 10) / 10);
- _textCenterLine2Left = Str(round(_humidity * 100 * 10) / 10);
- _textCenterLine3Left = Str(round((1013.25 * exp(-(AB_Altitude + ((getPosASL player) select 2)) / 7990) - 10 * overcast) * 10) / 10);
- _textCenterLine1Right = "C";
- _textCenterLine2Right = "%";
- _textCenterLine3Right = "hPA";
- };
-};
-
-[_textTop, _textCenterBig, _textCenterLine1Left, _textCenterLine2Left, _textCenterLine3Left, _textCenterLine1Right, _textCenterLine2Right, _textCenterLine3Right, _textInfoLine1, _textInfoLine2]
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_hasAdvancedBallisticsEnabled.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_hasAdvancedBallisticsEnabled.sqf
deleted file mode 100644
index bff36a159c..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_hasAdvancedBallisticsEnabled.sqf
+++ /dev/null
@@ -1 +0,0 @@
-(["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_f)
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_kestrel_mainLoop.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_kestrel_mainLoop.sqf
deleted file mode 100644
index d5a141b6c7..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_kestrel_mainLoop.sqf
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "script_component.hpp"
-
-while {dialog} do {
- _null = _this spawn cse_ab_Kestrel4500_fnc_update_display;
- sleep 1;
-};
-
-cse_ab_Kestrel4500 = false;
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_update_display.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_update_display.sqf
deleted file mode 100644
index 4923db22d3..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/fn_update_display.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "script_component.hpp"
-
-private ["_outputData"];
-
-_outputData = call cse_ab_Kestrel4500_fnc_generate_output_data;
-
-ctrlSetText [74100, _outputData select 0];
-ctrlSetText [74200, _outputData select 1];
-
-ctrlSetText [74300, _outputData select 2];
-ctrlSetText [74301, _outputData select 3];
-ctrlSetText [74302, _outputData select 4];
-
-ctrlSetText [74303, _outputData select 5];
-ctrlSetText [74304, _outputData select 6];
-ctrlSetText [74305, _outputData select 7];
-
-ctrlSetText [74400, _outputData select 8];
-ctrlSetText [74401, _outputData select 9];
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/script_component.hpp b/TO_MERGE/cse/sys_ballistics/kestrel4500/functions/script_component.hpp
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/init.sqf b/TO_MERGE/cse/sys_ballistics/kestrel4500/init.sqf
deleted file mode 100644
index bda593a908..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/init.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-private ["_temperature", "_barometricPressure", "_altitude"];
-
-cse_ab_Kestrel4500_Menus = ["Direction", "Wind SPD m/s", "CROSSWIND m/s", "HEADWIND m/s", "TEMP C", "HUMIDITY %", "BARO hPA", "ALTITUDE m", "User Screen 1", "User Screen 2"];
-
-cse_ab_Kestrel4500_TOTAL = [0, 0, 0, 0, 0, 0, 0, 0];
-cse_ab_Kestrel4500_ENTRIES = [0, 0, 0, 0, 0, 0, 0, 0];
-
-cse_ab_Kestrel4500_MinAvgMax = false;
-cse_ab_Kestrel4500_MinAvgMaxMode = 0;
-
-cse_ab_Kestrel4500_Menu = 1;
-cse_ab_Kestrel4500_Directions = ["N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW"];
-cse_ab_Kestrel4500_Direction = 0;
-
-cse_ab_Kestrel4500_RefHeading = 0;
-
-cse_ab_Kestrel4500 = false;
-cse_ab_Kestrel4500_Overlay = false;
-cse_ab_Kestrel4500_OverlayStart = diag_tickTime;
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/license.txt b/TO_MERGE/cse/sys_ballistics/kestrel4500/license.txt
deleted file mode 100644
index eb925e129b..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/license.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) <2014>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_bottom_button_click.wav b/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_bottom_button_click.wav
deleted file mode 100644
index 1f5a2ddeb1..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_bottom_button_click.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_center_button_click.wav b/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_center_button_click.wav
deleted file mode 100644
index ce34a645c3..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_center_button_click.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_exit_button_click.wav b/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_exit_button_click.wav
deleted file mode 100644
index 1f5a2ddeb1..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_exit_button_click.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_left_button_click.wav b/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_left_button_click.wav
deleted file mode 100644
index a880e76dc1..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_left_button_click.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_right_button_click.wav b/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_right_button_click.wav
deleted file mode 100644
index 14ff2e0689..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_right_button_click.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_top_button_click.wav b/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_top_button_click.wav
deleted file mode 100644
index e4ef1df50d..0000000000
Binary files a/TO_MERGE/cse/sys_ballistics/kestrel4500/sound/kestrel_top_button_click.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/ui.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/ui.h
deleted file mode 100644
index ce5f794555..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/ui.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "ui\defines.h"
-#include "ui\display.h"
-#include "ui\rscTitles.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/defines.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/defines.h
deleted file mode 100644
index 88e19da70f..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/defines.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#define ST_LEFT 0
-#define ST_RIGHT 1
-#define ST_CENTER 2
-
-#ifndef CSE_KESTREL_DEFINES_H_
-#define CSE_KESTREL_DEFINES_H_
-
-class Kestrel4500_RscText
-{
- idc=-1;
- type=0;
- style=ST_CENTER;
- colorDisabled[]={0,0,0,0};
- colorBackground[]={0,0,0,0};
- colorText[]={0,0,0,1};
- text="";
- x=0;
- y=0;
- w=0.1;
- h=0.03;
- font="TahomaB";
- sizeEx=0.04;
- shadow=0;
-};
-class Kestrel4500_RscButton
-{
- text="";
- colorText[]={0,0,0,1};
- colorDisabled[]={0,0,0,0};
- colorBackground[]={0,0,0,0};
- colorBackgroundDisabled[]={0,0,0,0};
- colorBackgroundActive[]={0,0,0,0};
- colorFocused[]={0,0,0,0};
- colorShadow[]={0,0,0,0};
- colorBorder[]={0,0,0,1};
- soundEnter[]={"",0,1};
- soundPush[]={"",0,1};
- soundClick[]={"",0,1};
- soundEscape[]={"",0,1};
- type=1;
- style="0x02+0x100";
- x=0;
- y=0;
- w=0.10;
- h=0.03;
- font="TahomaB";
- SizeEx=0.025;
- offsetX=0.003;
- offsetY=0.003;
- offsetPressedX=0.0020;
- offsetPressedY=0.0020;
- borderSize=0;
- shadow=0;
-};
-
-#endif
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/display.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/display.h
deleted file mode 100644
index bce6030cd8..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/display.h
+++ /dev/null
@@ -1,162 +0,0 @@
-class cse_ab_Kestrel4500_Display {
- name="cse_ab_Kestrel4500_Display";
- idd=790542;
- onLoad="uiNamespace setVariable ['cse_ab_Kestrel4500_Display', (_this select 0)]";
- movingEnable=1;
- controlsBackground[]={};
- objects[]={};
- class controls
- {
- class BACKGROUND
- {
- moving=1;
- type=0;
- font="TahomaB";
- SizeEX=0.025;
- idc=-1;
- style=48;
- x=safezoneX;
- y=safezoneY;
- w=1.024;
- h=1.024*4/3;
- colorBackground[]={1,1,1,1};
- colorText[]={1,1,1,1};
- text="cse\cse_sys_ballistics\kestrel4500\data\kestrel4500.paa";
-
- };
- class POWER: Kestrel4500_RscButton
- {
- idc=-1;
- x=safezoneX+0.385;
- y=safezoneY+1.125;
- w=0.042;
- h=0.042*4/3;
- action="closeDialog 0";
- onMouseButtonDown = "playSound 'cse_ab_kestrel4500_exit_button_click'";
- };
- class ENTER: POWER
- {
- idc=-1;
- x=safezoneX+0.46;
- y=safezoneY+1.0;
- w=0.1;
- action="0 call CSE_ab_kestrel4500_fnc_button_pressed;";
- onMouseButtonDown = "playSound 'cse_ab_kestrel4500_center_button_click'";
- };
- class TOP: Kestrel4500_RscButton
- {
- idc=-1;
- x=safezoneX+0.46;
- y=safezoneY+0.93;
- w=0.1;
- h=0.03;
- action="1 call CSE_ab_kestrel4500_fnc_button_pressed;";
- onMouseButtonDown = "playSound 'cse_ab_kestrel4500_top_button_click'";
- };
- class BOTTOM: TOP
- {
- idc=-1;
- y=safezoneY+1.1;
- action="2 call CSE_ab_kestrel4500_fnc_button_pressed;";
- onMouseButtonDown = "playSound 'cse_ab_kestrel4500_bottom_button_click'";
- };
- class LEFT: Kestrel4500_RscButton
- {
- idc=-1;
- x=safezoneX+0.4;
- y=safezoneY+0.97;
- w=0.046;
- h=0.11;
- action="3 call CSE_ab_kestrel4500_fnc_button_pressed;";
- onMouseButtonDown = "playSound 'cse_ab_kestrel4500_left_button_click'";
- };
- class RIGHT: LEFT
- {
- idc=-1;
- x=safezoneX+0.58;
- action="4 call CSE_ab_kestrel4500_fnc_button_pressed;";
- onMouseButtonDown = "playSound 'cse_ab_kestrel4500_right_button_click'";
- };
- class MEMORY: Kestrel4500_RscButton
- {
- idc=-1;
- x=safezoneX+0.395;
- y=safezoneY+0.87;
- w=0.05;
- h=0.045*4/3;
- action="5 call CSE_ab_kestrel4500_fnc_button_pressed;";
- };
- class BACKLIGHT: MEMORY
- {
- idc=-1;
- x=safezoneX+0.585;
- action="6 call CSE_ab_kestrel4500_fnc_button_pressed;";
- };
-
- class TEXT_TOP: Kestrel4500_RscText
- {
- idc=74100;
- x=safezoneX+0.40;
- y=safezoneY+0.58;
- w=0.22;
- h=0.04;
- text="";
- };
- class TEXT_CENTER_BIG: TEXT_TOP
- {
- idc=74200;
- y=safezoneY+0.61;
- h=0.10;
- SizeEx=0.06;
- text="";
- };
- class TEXT_CENTER_LINE_1_LEFT: TEXT_TOP
- {
- idc=74300;
- y=safezoneY+0.60;
- style=ST_LEFT;
- h=0.10;
- SizeEx=0.05;
- text="";
- };
- class TEXT_CENTER_LINE2_LEFT: TEXT_CENTER_LINE_1_LEFT
- {
- idc=74301;
- y=safezoneY+0.64;
- text="";
- };
- class TEXT_CENTER_LINE_3_LEFT: TEXT_CENTER_LINE2_LEFT
- {
- idc=74302;
- y=safezoneY+0.68;
- text="";
- };
- class TEXT_CENTER_LINE_1_RIGHT: TEXT_CENTER_LINE_1_LEFT
- {
- idc=74303;
- style=ST_RIGHT;
- };
- class TEXT_CENTER_LINE2_RIGHT: TEXT_CENTER_LINE2_LEFT
- {
- idc=74304;
- style=ST_RIGHT;
- };
- class TEXT_CENTER_LINE_3_RIGHT: TEXT_CENTER_LINE_3_LEFT
- {
- idc=74305;
- style=ST_RIGHT;
- };
- class TEXT_INFO_LINE_1: TEXT_TOP
- {
- idc=74400;
- y=safezoneY+0.69;
- text="";
- };
- class TEXT_INFO_LINE_2: TEXT_TOP
- {
- idc=74401;
- y=safezoneY+0.72;
- text="";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/rscTitles.h b/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/rscTitles.h
deleted file mode 100644
index 2f18667c2d..0000000000
--- a/TO_MERGE/cse/sys_ballistics/kestrel4500/ui/rscTitles.h
+++ /dev/null
@@ -1,98 +0,0 @@
-class RscTitles
-{
- class cse_ab_RscKestrel4500
- {
- idd=-1;
- onLoad="with uiNameSpace do { cse_ab_RscKestrel4500 = _this select 0 };";
- movingEnable=0;
- duration=60;
- fadeIn="false";
- fadeOut="false";
- class controls
- {
- class cse_ab_RscKestrel4500
- {
- idc=75000;
- moving=0;
- type=0;
- font="TahomaB";
- SizeEX=0.025*0.75;
- style=48;
- x=safezoneX-0.05;
- y=safezoneY+0.7;
- w=1.024*0.75;
- h=1.024*4/3*0.75;
- colorBackground[]={1,1,1,1};
- colorText[]={1,1,1,1};
- text="cse\cse_sys_ballistics\kestrel4500\data\kestrel4500.paa";
-
- };
- class RscTextTop: Kestrel4500_RscText
- {
- idc=75100;
- x=safezoneX-0.05+0.40*0.75;
- y=safezoneY+0.7+0.58*0.75;
- w=0.22*0.75;
- h=0.04*0.75;
- SizeEx=0.04*0.75;
- text="";
- };
- class RscTextCenterBig: RscTextTop
- {
- idc=75200;
- y=safezoneY+0.7+0.61*0.75;
- h=0.10*0.75;
- SizeEx=0.06*0.75;
- text="";
- };
- class RscTextCenterLine1Left: RscTextTop
- {
- idc=75300;
- y=safezoneY+0.7+0.60*0.75;
- style=ST_LEFT;
- h=0.10*0.75;
- SizeEx=0.05*0.75;
- text="";
- };
- class RscTextCenterLine2Left: RscTextCenterLine1Left
- {
- idc=75301;
- y=safezoneY+0.7+0.64*0.75;
- text="";
- };
- class RscTextCenterLine3Left: RscTextCenterLine2Left
- {
- idc=75302;
- y=safezoneY+0.7+0.68*0.75;
- text="";
- };
- class RscTextCenterLine1Right: RscTextCenterLine1Left
- {
- idc=75303;
- style=ST_RIGHT;
- };
- class RscTextCenterLine2Right: RscTextCenterLine2Left
- {
- idc=75304;
- style=ST_RIGHT;
- };
- class RscTextCenterLine3Right: RscTextCenterLine3Left
- {
- idc=75305;
- style=ST_RIGHT;
- };
- class RscTextInfoLine1: RscTextTop
- {
- idc=75400;
- y=safezoneY+0.7+0.69*0.75;
- text="";
- };
- class RscTextInfoLine2: RscTextTop
- {
- idc=75401;
- y=safezoneY+0.7+0.72*0.75;
- text="";
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_assignTrackerIDs_Server_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_assignTrackerIDs_Server_CC.sqf
deleted file mode 100644
index 3b444910f0..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_assignTrackerIDs_Server_CC.sqf
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- NAME: fnc_assignTrackersServer
- USAGE: running serverside, assigning IDs to all newly found trackers
- AUTHOR: Glowbal
- ARGUMENTS: none
- RETURN: void
-*/
-
-// SERVER SIDE ONLY
-
-
-if !(isServer) exitwith{};
-private ["_storedIDs","_newID","_availableClasses"];
-_availableClasses = ["cse_m_tablet","cse_m_pda"];
-
-waituntil {!isnil "CSE_CC_LOGIC_OBJECT_CC"};
-_storedIDs = [];
-{
- _storedIDs set[count _storedIDs,[]];
-}foreach _availableClasses;
-_newID = "";
-while {true} do {
- {
- private ["_unit","_IDCollection"];
- _unit = _x;
- if (alive _unit) then {
- _IDCollection = 0;
- {
- _foundIt = (_x in ((backpackItems _unit) + (uniformItems _unit)+ (vestItems _unit) + (assignedItems _unit)));
- if (_foundIt) exitwith {
- _newID = format["%1_%2",_x,count(_storedIDs select _IDCollection)+1];
-
- _check = CSE_CC_LOGIC_OBJECT_CC getvariable _newID;
- if (isnil "_check") then {
- (_storedIDs select _IDCollection) set [count((_storedIDs select _IDCollection)),_newID];
- _trackerStatus = _unit getvariable ["cse_bft_info_cc",["Infantry"," ",true,false]];
- CSE_CC_LOGIC_OBJECT_CC setvariable [_newID,_trackerStatus,true];
-
- if (_x in (assignedItems _unit)) then {
- _unit unassignItem _x;
- };
- [[_unit,_x,_newID], "cse_fnc_switchItem", owner _unit, false] spawn BIS_fnc_MP;
- //waituntil {(!((_x in ((backpackItems _unit) + (uniformItems _unit)+ (vestItems _unit) + (assignedItems _unit)))) || (!alive _unit))};
- };
- };
- _IDCollection = _IDCollection + 1;
- }foreach _availableClasses;
- //sleep 0.001;
- sleep 1;
- };
- }foreach allUnits;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_assignTrackerInformation_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_assignTrackerInformation_CC.sqf
deleted file mode 100644
index 0cd4f473dd..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_assignTrackerInformation_CC.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- fnc_assignTrackerInfo.sqf
- Usage: Assigns tracker info for the BFT
- Author: Glowbal
-
- Arguments: array [logic (OBJECT)]
- Returns: void
-
- Affects: All localities
- Executes: All Localities
-
-*/
-
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-if (!isNull _logic) then {
-
- _type = _logic getvariable ["type","Infantry"];
- _callsign = _logic getvariable ["callSign",""];
- _objects = synchronizedObjects _logic;
- {
- _x setvariable ["cse_bft_info_cc",[_type,_callsign,true,false]];
- }foreach _objects;
- };
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFTSymbolOnPerson_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFTSymbolOnPerson_CC.sqf
deleted file mode 100644
index ef8fa9e8b9..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFTSymbolOnPerson_CC.sqf
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- NAME: fnc_displayBFTSymbolOnPerson.sqf
- USAGE: grabs BFT item and information from unit, then returns information
- AUTHOR: Glowbal
- ARGUMENTS: PERSON / UNIT.
- RETURN: 2d ARRAY. Contains information about every tracker on unit.
-*/
-
-private ["_person","_trackers","_tracker","_newMarker","_filterLevel","_return"];
-_person = _this select 0;
-_return = [];
-_trackers = [_person] call cse_fnc_getAllBFTItems_CC;
-{
- _trackerInfo = [_person] call cse_fnc_getTrackerInformation_CC;
-
- if (_trackerInfo select 2) then {
- _prefix = switch (([_x] call cse_fnc_getDeviceSide_CC)) do {
- case WEST: {"b_"};
- case EAST: {"o_"};
- case independent: {"n_"};
- default {"n_"};
- };
-
- _prefix = "\A3\ui_f\data\map\markers\nato\" + _prefix;
- _icon = switch (_trackerInfo select 0) do {
- case "Infantry": {_prefix+"inf.paa"};
- case "Motorized": {_prefix+"motor_inf.paa"};
- case "Plane": {_prefix+"plane.paa"};
- case "Helicopter": {_prefix+"air.paa"};
- case "Armor": {_prefix+"armor.paa"};
- case "Naval": {_prefix+"naval.paa"};
- case "HQ": {_prefix+"hq.paa"};
- case "Medical": {_prefix+"med.paa"};
- case "Maintanance": {_prefix+"maint.paa"};
- case "Artillery": {_prefix+"art.paa"};
- case "Mortar": {_prefix+"mortar.paa"};
- case "Service": {_prefix+"service.paa"};
- case "Recon": {_prefix+"recon.paa"};
- case "Mechanized": {_prefix+"mech_inf.paa"};
- case "uav": {_prefix+"uav.paa"};
- case "Installation": {_prefix+"installation.paa"};
- default {_prefix+"unknown.paa"};
- };
-
- _return pushback [_icon,getPos _person, (_trackerInfo select 1),CSE_SIDE_WEST_COLOR,_x,_person,([_x] call cse_fnc_getDeviceSide_CC)];
- };
-}foreach _trackers;
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFTSymbols_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFTSymbols_CC.sqf
deleted file mode 100644
index dbb77aed37..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFTSymbols_CC.sqf
+++ /dev/null
@@ -1,118 +0,0 @@
-
-private ["_enableTracking","_toggleRoute","_toggleIntel","_return", "_iconType", "_callsign", "_person", "_trackerInfo"];
-_return = [];
-if (!isDedicated) then {
- {
- _person = _x;
- _trackerInfo = [_person] call cse_fnc_getTrackerInformation_CC;
- if (_trackerInfo select 2) then {
- _positionOf = getPosASL _person;
- _trackers = [_person] call cse_fnc_getAllBFTItems_CC;
- {
- _sideOfDevice = ([_x] call cse_fnc_getDeviceSide_CC);
-
- _prefix = switch (_sideOfDevice) do {
- case WEST: {"b_"};
- case EAST: {"o_"};
- case independent: {"n_"};
- default {"n_"};
- };
-
- _prefix = "\A3\ui_f\data\map\markers\nato\" + _prefix;
- _icon = switch (_trackerInfo select 0) do {
- case "Infantry": {_prefix+"inf.paa"};
- case "Motorized": {_prefix+"motor_inf.paa"};
- case "Plane": {_prefix+"plane.paa"};
- case "Helicopter": {_prefix+"air.paa"};
- case "Armor": {_prefix+"armor.paa"};
- case "Naval": {_prefix+"naval.paa"};
- case "HQ": {_prefix+"hq.paa"};
- case "Medical": {_prefix+"med.paa"};
- case "Maintanance": {_prefix+"maint.paa"};
- case "Artillery": {_prefix+"art.paa"};
- case "Mortar": {_prefix+"mortar.paa"};
- case "Service": {_prefix+"service.paa"};
- case "Recon": {_prefix+"recon.paa"};
- case "Mechanized": {_prefix+"mech_inf.paa"};
- case "uav": {_prefix+"uav.paa"};
- case "Installation": {_prefix+"installation.paa"};
- default {_prefix+"unknown.paa"};
- };
- _return pushback [_icon, _positionOf, (_trackerInfo select 1), CSE_SIDE_WEST_COLOR, _x, _person, _sideOfDevice];
- }foreach _trackers;
- };
- }foreach allUnits;
-
- {
- _info = _x getvariable "cse_bft_info_cc";
- if (!isnil "_info") then {
- if (isEngineOn _x) then {
- _prefix = switch (side _x) do {
- case WEST: {"b_"};
- case EAST: {"o_"};
- case independent: {"n_"};
- default {"n_"};
- };
- _prefix = "\A3\ui_f\data\map\markers\nato\" + _prefix;
- _icon = switch (_info select 0) do {
- case "Infantry": {_prefix+"inf.paa"};
- case "Motorized": {_prefix+"motor_inf.paa"};
- case "Plane": {_prefix+"plane.paa"};
- case "Helicopter": {_prefix+"air.paa"};
- case "Armor": {_prefix+"armor.paa"};
- case "Naval": {_prefix+"naval.paa"};
- case "HQ": {_prefix+"hq.paa"};
- case "Medical": {_prefix+"med.paa"};
- case "Maintanance": {_prefix+"maint.paa"};
- case "Artillery": {_prefix+"art.paa"};
- case "Mortar": {_prefix+"mortar.paa"};
- case "Service": {_prefix+"service.paa"};
- case "Recon": {_prefix+"recon.paa"};
- case "Mechanized": {_prefix+"mech_inf.paa"};
- case "uav": {_prefix+"uav.paa"};
- case "Installation": {_prefix+"installation.paa"};
- default {_prefix+"unknown.paa"};
- };
-
- _return pushback [_icon,getPosASL _x, _info select 1,CSE_SIDE_WEST_COLOR,"vehicle",_x, side _x];
- };
- } else {
- if !(_x in allUnitsUav) then {
- if (local _x) then {
- if (CSE_AUTO_ASSIGN_CALLSIGNS_CC == 0 || CSE_AUTO_ASSIGN_CALLSIGNS_CC == 1) then {
- _iconType = switch (true) do {
- case (_x isKindOf "Car"): {"Motorized"};
- case (_x isKindOf "Helicopter"): {"Helicopter"};
- case (_x isKindOf "Air"): {"Plane"};
- case (_x isKindOf "Armor"): {"Armor"};
- case (_x isKindOf "Boat"): {"Naval"};
- case (_x isKindOf "Artillery"): {"Artillery"};
- default {"Unknown"};
- };
- _callsign = [_x] call cse_fnc_findTargetName_gui;
- _x setvariable ["cse_bft_info_cc", [_iconType, _callsign, false, true], true];
- };
- };
- };
- };
-
- }foreach vehicles;
-
- if (CSE_AUTO_SHOW_UAV_TRACKERS_ON_BFT) then {
- {
- _info = _x getvariable "cse_bft_info_cc";
- if (isnil "_info") then {
- if (isEngineOn _x) then {
- _prefix = switch (side _x) do {
- case WEST: {"b_"};
- case EAST: {"o_"};
- case independent: {"n_"};
- default {"n_"};
- };
- _return pushback [ "\A3\ui_f\data\map\markers\nato\" + _prefix + "uav.paa",getPosASL _x, [_x] call cse_fnc_findTargetName_gui,CSE_SIDE_WEST_COLOR,"uav",_x, side _x];
- };
- };
- }foreach allUnitsUav;
- };
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFT_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFT_CC.sqf
deleted file mode 100644
index c7fd6c9979..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_displayBFT_CC.sqf
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * fn_displayBFT_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName", "_display"];
-_deviceName = _this select 0;
-if (isnil "CSE_CURRENT_SELECTED_FILTER_CC_APP_CC") then {
- CSE_CURRENT_SELECTED_FILTER_CC_APP_CC = -1;
- CSE_TOGGLE_ROUTE_LAYER_CC = true;
- CSE_TOGGLE_INTEL_LAYER_CC = true;
- CSE_TOGGLE_CALLSIGNS_CC = true;
- CSE_SELECTED_ICON_CC = "";
-};
-
-if (isnil "CSE_INTEL_MARKER_COLLECTION_CC") then {
- CSE_INTEL_MARKER_COLLECTION_CC = [];
-};
-if (isnil "CSE_ROUTE_MARKER_COLLECTION_CC") then {
- CSE_ROUTE_MARKER_COLLECTION_CC = [];
-};
-if (isnil "CSE_TRACKER_ICONS") then {
- CSE_TRACKER_ICONS = [];
-};
-
-/*
- {
- if (call (_X select 0)) then {
- {
- [_x,(_this select 0)] call cse_fnc_drawBFTMarker_CC;
- }foreach (_x select 1);
- };
- }foreach CSE_MARKER_COLLECTIONS_CC;
-*/
-
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-(_display displayCtrl 10) ctrlAddEventHandler ["draw","
- {[_x,(_this select 0)] call cse_fnc_drawBFTIcons_CC;}foreach CSE_TRACKER_ICONS;
-
- if (CSE_TOGGLE_INTEL_LAYER_CC) then {{[_x,(_this select 0)] call cse_fnc_drawBFTMarker_CC;}foreach CSE_INTEL_MARKER_COLLECTION_CC;};
- if (CSE_TOGGLE_ROUTE_LAYER_CC) then {{[_x,(_this select 0)] call cse_fnc_drawBFTMarker_CC;}foreach CSE_ROUTE_MARKER_COLLECTION_CC;};
- "];
-
-(_display displayCtrl 10) ctrlAddEventHandler ["MouseButtonUp",'if ((_this select 1) == 0) then {[[_this select 2, _this select 3]] call cse_fnc_clickedOnMap_CC;};'];
-(_display displayCtrl 10) ctrlAddEventHandler ["MouseMoving",'CSE_MOUSE_RELATIVE_POSITION = [_this select 1, _this select 2];'];
-(_display displayCtrl 10) ctrlMapAnimAdd [0, 0.05, player];
-ctrlMapAnimCommit (_display displayCtrl 10);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_drawBFTIcons_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_drawBFTIcons_CC.sqf
deleted file mode 100644
index 8dda24a02d..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_drawBFTIcons_CC.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * fn_drawBFTIcons_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_trackerInfo", "_icon", "_pos", "_text", "_unit", "_side", "_color", "_map"];
-_trackerInfo = _this select 0;
-_map = _this select 1;
-
-_icon = _trackerInfo select 0;
-_pos = _trackerInfo select 1;
-_text = _trackerInfo select 2;
-_unit = _trackerInfo select 5;
-_side = _trackerInfo select 6;
-
-if (([([] call cse_fnc_getCurrentDeviceName_CC)] call cse_fnc_getDeviceSide_CC) == _side || ([] call cse_fnc_getCurrentDeviceName_CC) == "") then {
- if (!CSE_TOGGLE_CALLSIGNS_CC) then {
- _text = "";
- };
- _color = _trackerInfo select 3;
- if (_unit == player) then {
- _color = [0.78,0.8,0.1,1];
- };
- _map drawIcon [_icon,_color, _pos, 30, 30, 0, _text, 0, 0.05, 'PuristaMedium', 'right'];
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_drawBFTMarker_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_drawBFTMarker_CC.sqf
deleted file mode 100644
index 56bdfbe297..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_drawBFTMarker_CC.sqf
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * fn_drawBFTMarkers_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-_marker = _this select 0;
-_map = _this select 1;
-if !(_marker isEqualTo []) then {
- _pos = _marker select 0;
- _args = _marker select 1;
- _icon = _args select 0;
- _text = _args select 1;
- _color = _args select 2;
-
- _timeOfPlacement = _marker select 2;
- _side = _marker select 3;
- if (([([] call cse_fnc_getCurrentDeviceName_CC)] call cse_fnc_getDeviceSide_CC) == _side) then {
- _map drawIcon [_icon,_color, _pos, 30, 30, 0, _text, 0, 0.05, 'PuristaMedium', 'right'];
- };
-};
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getAllBFTItemsOfType_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getAllBFTItemsOfType_CC.sqf
deleted file mode 100644
index ba07467985..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getAllBFTItemsOfType_CC.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-private["_unit","_return","_toCheck"];
-_unit = _this select 0;
-_item = _this select 1;
-_return = [];
-
-
-_itemArray = toArray _item;
-{
- _compArray = toArray _x;
- if (_compArray select 0 == _itemArray select 0) then {
- if ([_item,_x] call BIS_fnc_inString) then {
- _return pushback _x;
- };
- };
-}foreach ([_unit] call cse_fnc_getAllBFTItems_CC);
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getAllBFTItems_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getAllBFTItems_CC.sqf
deleted file mode 100644
index fdba4efc68..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getAllBFTItems_CC.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-
-private["_unit","_return","_toCheck","_item"];
-_unit = _this select 0;
-_return = [];
-_toCheck = [];
-if (!isNull _unit) then {
- if (_unit iskindof "CaManBase") then {
- _toCheck = items _unit;
- };
- {
- if (_x != "") then {
- if (((toArray _x) select 0) == ((toArray 'c') select 0)) then {
- if ([_x] call cse_fnc_isBFTItem_CC) then {
- _return pushback _x;
- };
- };
- };
- }foreach _toCheck;
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getDeviceSide_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getDeviceSide_CC.sqf
deleted file mode 100644
index c7579ad664..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getDeviceSide_CC.sqf
+++ /dev/null
@@ -1,13 +0,0 @@
-
-private ["_device","_side","_deviceName"];
-_deviceName = _this select 0;
-_side = playerSide;
-if (isnil "CSE_REGISTERED_DEVICES_CC") then {
- CSE_REGISTERED_DEVICES_CC = [];
-};
-{
- if ((_x select 0) == _deviceName) exitwith {
- _side = _x select 3;
- };
-}foreach CSE_REGISTERED_DEVICES_CC;
-_side
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getTrackerInformation_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getTrackerInformation_CC.sqf
deleted file mode 100644
index e3a02ce5f0..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_getTrackerInformation_CC.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * fn_getTrackerInformation_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-((_this select 0) getvariable ["cse_bft_info_cc",["Infantry","",true,false]])
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hasItem_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hasItem_CC.sqf
deleted file mode 100644
index 7598a06b8e..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hasItem_CC.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_hasItem_CC.sqf
- * @Descr: Check if unit has an item of type.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, item STRING (Classname of CfgWeapons item)]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_unit","_item"];
-_unit = _this select 0;
-_item = _this select 1;
-
-if !(_unit isKindOf "CAManBase") exitwith {false};
-(_item in ((items _unit) + (assignedItems _unit)));
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hasTrackerItem_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hasTrackerItem_CC.sqf
deleted file mode 100644
index 3ef814842e..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hasTrackerItem_CC.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_hasTrackerItem_CC.sqf
- * @Descr: Check if unit has a BFT enabled item
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private["_unit"];
-_unit = _this select 0;
-if (!isNull _unit && {(_unit iskindof "CaManBase")}) exitwith {
- (({([_x] call cse_fnc_isBFTItem_CC)}count ((items _unit) + (assignedItems _unit))) > 0);
-};
-false
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hideAllBFTSymbols_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hideAllBFTSymbols_CC.sqf
deleted file mode 100644
index 34a871459d..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_hideAllBFTSymbols_CC.sqf
+++ /dev/null
@@ -1,6 +0,0 @@
-if (isnil "CSE_EXISTING_BFTRACKERS_CC") then {
- CSE_EXISTING_BFTRACKERS_CC = [];
-};
-{
- _x setMarkerAlphaLocal 0.0;
-}foreach CSE_EXISTING_BFTRACKERS_CC;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_isBFTItem_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_isBFTItem_CC.sqf
deleted file mode 100644
index 6761d70dbd..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_isBFTItem_CC.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * fn_isBFTItem_CC.sqf
- * @Descr: Check if item has blue force tracking enabled.
- * @Author: Glowbal
- *
- * @Arguments: [item STRING (Classname of item)]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-(getNumber(configFile >> "CfgWeapons" >> (_this select 0) >> "cse_blueForceTracker") == 1);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_removeIntelMarker_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_removeIntelMarker_CC.sqf
deleted file mode 100644
index 1014d499fb..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_removeIntelMarker_CC.sqf
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-fnc_removeIntelMarker.sqf
-Usage: Removes intel marker nearest to given position
-Author: Glowbal
-
-Arguments: array [position (Position 3D)]
- 0: Position. Format: 3D [ x, y, z]
-Returns: Void
-
-Affects: Global
-Executes: Local
-
-Example:
- [[50,20,0] call cse_fnc_removeIntelMarker_CC;
-*/
-
-private ["_mpSync","_args","_nearest","_lastestCount","_pos","_count","_position"];
-if (count _this < 2) exitwith {
- _mpSync = [_this, count _this, "", [""]] call BIS_fnc_param;
- if (isnil "_mpSync") then {
- _mpSync = "";
- };
- if (_mpSync != "MP_SYNC") then {
- _args = _this + ["MP_SYNC"];
- [_args, "cse_fnc_removeIntelMarker_CC", true, true] spawn BIS_fnc_MP;
- };
-};
-if (isnil "CSE_INTEL_MARKER_COLLECTION_CC") then {
- waituntil{!isnil "CSE_INTEL_MARKER_COLLECTION_CC"};
-};
-_position = [_this, 0, [0,0,0], [[]],3] call BIS_fnc_param;
-_count = 0;
-_nearest = 25;
-_lastestCount = -1;
-{
- _pos = (_x select 0);
- if ((_pos distance _position) < _nearest) then {
- _nearest = _pos distance _position;
- _lastestCount = _count;
- };
- _count = _count + 1;
-}count CSE_INTEL_MARKER_COLLECTION_CC;
-if (_lastestCount < 0) exitwith {};
- CSE_INTEL_MARKER_COLLECTION_CC set [ _lastestCount, "REMOVE"];
- CSE_INTEL_MARKER_COLLECTION_CC = CSE_INTEL_MARKER_COLLECTION_CC - ["REMOVE"];
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_removeRouteMarker_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_removeRouteMarker_CC.sqf
deleted file mode 100644
index 8affaa8cf1..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_removeRouteMarker_CC.sqf
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-fnc_removeRouteMarker.sqf
-Usage: Removes route marker nearest to given position
-Author: Glowbal
-
-Arguments: array [position (Position 3D)]
- 0: Position. Format: 3D [ x, y, z]
-Returns: Void
-
-Affects: Global
-Executes: Local
-
-Example:
- [[50,20,0] call cse_fnc_removeRouteMarker_CC;
-*/
-
-private ["_mpSync","_args","_nearest","_lastestCount","_pos","_count","_position"];
-if (count _this < 2) exitwith {
- _mpSync = [_this, 1, "", [""]] call BIS_fnc_param;
-
- if (isnil "_mpSync") then {
- _mpSync = "";
- };
- if (_mpSync != "MP_SYNC") then {
- _args = _this + ["MP_SYNC"];
- [_args, "cse_fnc_removeRouteMarker_CC", true, true] spawn BIS_fnc_MP;
- };
-};
-if (isnil "CSE_ROUTE_MARKER_COLLECTION_CC") then {
- // This is a fix for waiting MP JIP synchronization.
- waituntil{!isnil "CSE_ROUTE_MARKER_COLLECTION_CC"};
-};
-
-_position = [_this, 0, [0,0,0], [[]],3] call BIS_fnc_param;
-_count = 0;
-_nearest = 25;
-_lastestCount = -1;
-{
- _pos = (_x select 0);
- if ((_pos distance _position) < _nearest) then {
- _nearest = _pos distance _position;
- _lastestCount = _count;
- };
- _count = _count + 1;
-}count CSE_ROUTE_MARKER_COLLECTION_CC;
-if (_lastestCount < 0) exitwith {};
-CSE_ROUTE_MARKER_COLLECTION_CC set [ _lastestCount, "REMOVE"];
-CSE_ROUTE_MARKER_COLLECTION_CC = CSE_ROUTE_MARKER_COLLECTION_CC - ["REMOVE"];
diff --git a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_setTrackerInformation_CC.sqf b/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_setTrackerInformation_CC.sqf
deleted file mode 100644
index 321deef0c9..0000000000
--- a/TO_MERGE/cse/sys_cc/BlueForceTracking/functions/fn_setTrackerInformation_CC.sqf
+++ /dev/null
@@ -1,7 +0,0 @@
-private ["_id","_info"];
-_id = _this select 0;
-_info = _this select 1;
-
-CSE_CC_LOGIC_OBJECT_CC setvariable [_id,_info,true];
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/CfgFactionClasses.h b/TO_MERGE/cse/sys_cc/CfgFactionClasses.h
deleted file mode 100644
index b0fd80e0f9..0000000000
--- a/TO_MERGE/cse/sys_cc/CfgFactionClasses.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgFactionClasses
-{
- class NO_CATEGORY;
- class cseCCModule: NO_CATEGORY {
- displayName = "CSE Command & Control";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/CfgFunctions.h b/TO_MERGE/cse/sys_cc/CfgFunctions.h
deleted file mode 100644
index 4ec4bd24d7..0000000000
--- a/TO_MERGE/cse/sys_cc/CfgFunctions.h
+++ /dev/null
@@ -1,126 +0,0 @@
-class CfgFunctions {
- class CSE {
- class CC {
- file = "cse\cse_sys_cc\Modules\functions";
- class assignTrackerInfo_CC { recompile = 1; };
- class modulePlaceIntelMarker_CC { recompile = 1; };
- };
-
- class Tablets
- {
- file = "cse\cse_sys_cc\tablets\functions";
- class registerDevice_CC { recompile = 1; };
- class registerApp_CC{ recompile = 1; };
- class getDeviceSettings_CC { recompile = 1; };
- class openDevice_CC { recompile = 1; };
- class openDeviceSmall_CC { recompile = 1; };
- class openLastScreen_CC { recompile = 1; };
- class getLastScreen_CC { recompile = 1; };
- class openScreen_CC { recompile = 1; };
- class getCurrentApplication_CC { recompile = 1; };
- class openIntelMarkersMenu_CC { recompile = 1; };
- class openRouteMarkersMenu_CC { recompile = 1; };
- class openIconSelectMenu_CC { recompile = 1; };
- class isSideBarOpen_CC { recompile = 1; };
- class getCurrentDeviceName_CC { recompile = 1; };
- class clickedOnMap_CC { recompile = 1; };
- class clearDeviceScreen_CC { recompile = 1; };
- class isLoggedIn_CC { recompile = 1; };
- class setLoggedIn_CC { recompile = 1; };
- class placeMarker_CC { recompile = 1; };
- class placeMarkerGlobal_CC { recompile = 1; };
- class manageLayers_CC { recompile = 1; };
- };
-
- class TabletResources
- {
- file = "cse\cse_sys_cc\TabletResources\functions";
- class setBackground_CC { recompile = 1; };
- class setMap_CC { recompile = 1; };
- class setNavBar_CC { recompile = 1; };
- class setPiP_CC { recompile = 1; };
- class setTitle_CC { recompile = 1; };
- class setSideBar_CC { recompile = 1; };
- class setOptionField_CC { recompile = 1; };
- class getFirstAvailableOptionField_CC { recompile = 1; };
- class removeOptionField_CC { recompile = 1; };
- class getOptionFieldOnPos_CC { recompile = 1; };
- class sideBarHasMap_CC { recompile = 1; };
- class setPopUpMenu_CC { recompile = 1; };
- class setPopUpOptions_CC { recompile = 1; };
- class popUpAccept_CC { recompile = 1; };
- class isPopUpOpen_CC { recompile = 1; };
- class getPopUpRatio_CC { recompile = 1; };
- class setProgramIcons_CC { recompile = 1; };
- class getSideBarOptionFields_CC { recompile = 1; };
- class isMapOpen_CC { recompile = 1; };
- class isPiPOpen_CC { recompile = 1; };
- class getSideBarRatio_CC { recompile = 1; };
- class getNavBarRatio_CC { recompile = 1; };
- class removeSelectMenu_CC { recompile = 1; };
- class isSelectMenuOpen_CC { recompile = 1; };
- class setBottomBar_CC { recompile = 1; };
- class isOpenBottomBar_CC { recompile = 1; };
- class showLoadingScreen_CC { recompile = 1; };
- class editIntelMarker_CC { recompile = 1; };
- };
-
- class tabletScreens
- {
- file = "cse\cse_sys_cc\tabletScreens\functions";
- class openScreen_cc_app_CC { recompile = 1; };
- class openScreen_home_CC { recompile = 1; };
- class openScreen_login_CC { recompile = 1; };
- class openScreen_notepad_CC { recompile = 1; };
- class openScreen_settings_CC { recompile = 1; };
- class openScreen_startUp_CC { recompile = 1; };
- class openScreen_liveFeed_app_CC { recompile = 1; };
- };
-
- class BlueForceTracking
- {
- file = "cse\cse_sys_cc\BlueForceTracking\functions";
- class displayBFT_CC { recompile = 1; };
- class displayBFTSymbols_CC { recompile = 1; };
- class displayBFTSymbolOnPerson_CC { recompile = 1; };
- class getAllBFTItems_CC { recompile = 1; };
- class hasTrackerItem_CC { recompile = 1; };
- class hasItem_CC { recompile = 1; };
- class getAllBFTItemsOfType_CC { recompile = 1; };
- class getDeviceSide_CC { recompile = 1; };
- class isBFTItem_CC { recompile = 1; };
- class hideAllBFTSymbols_CC { recompile = 1; };
- class assignTrackerIDs_Server_CC { recompile = 1; };
- class getTrackerInformation_CC { recompile = 1; };
- class setTrackerInformation_CC { recompile = 1; };
- class removeIntelMarker_CC { recompile = 1; };
- class removeRouteMarker_CC { recompile = 1; };
- class drawBFTIcons_CC { recompile = 1; };
- class drawBFTMarker_CC { recompile = 1; };
- };
-
- class LiveFeed {
- file = "cse\cse_sys_cc\LiveFeed\functions";
- class openScreen_LiveFeed_CC { recompile = 1; };
- class viewLiveFeed_CC { recompile = 1; };
- class setLiveFeedTargetObj_CC { recompile = 1; };
- class canViewFeed_CC { recompile = 1; };
- class getAllViewableFeeds_CC { recompile = 1; };
- class takeControlUAV_CC { recompile = 1; };
- };
-
- class VehicleDisplaysBFT {
- file = "cse\cse_sys_cc\vehicles\functions";
- class openFlight_Display_CC;
- class hasFlightDisplay_CC;
- class drawBFTMarker_Vehicles_CC;
- class drawBFTIcons_Vehicles_CC;
- class canUseOnBoard_BFT_Device_CC;
- };
-
- class FutureSoldier {
- file = "cse\cse_sys_cc\FutureSoldier\functions";
- class startFutureSoldierDisplay_CC { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/CfgMagazines.h b/TO_MERGE/cse/sys_cc/CfgMagazines.h
deleted file mode 100644
index 73260427c5..0000000000
--- a/TO_MERGE/cse/sys_cc/CfgMagazines.h
+++ /dev/null
@@ -1,59 +0,0 @@
-class CfgMagazines {
- class Default;
- class CA_magazine: Default{};
- class cse_m_tablet: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Military Tablet (NATO)";
- descriptionUse = "Military Tablet (NATO)";
- picture = "\cse\cse_sys_cc\data\m_tablet.paa";
- descriptionShort = "Military Tablet";
- mass = 5;
- };
- class cse_m_pda: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- descriptionUse = "A PDA, for use in the field. NATO Software compatible.";
- descriptionShort = "A PDA for use in the field (NATO)";
- displayName = "PDA (NATO)";
- picture = "\cse\cse_sys_cc\data\m_pda.paa";
- mass = 2;
- };
- class cse_m_tablet_uk: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- descriptionUse = "UK Tablet. NATO Software compatible.";
- descriptionShort = "A Tablet for use in the field (UK)";
- displayName = "Military Tablet (UK)";
- picture = "\cse\cse_sys_cc\data\uk_tablet.paa";
- mass = 5;
- };
- class cse_m_tablet_o: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- descriptionUse = "OPFOR Tablet. OPFOR Software compatible.";
- descriptionShort = "A Tablet for use in the field (OPFOR)";
- displayName = "Military Tablet (OPFOR)";
- picture = "\cse\cse_sys_cc\data\m_tablet.paa";
- mass = 5;
- };
- class cse_m_pda_o: CA_magazine {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- descriptionUse = "OPFOR PDA. OPFOR Software compatible.";
- descriptionShort = "A PDA for use in the field (OPFOR)";
- displayName = "Military PDA (OPFOR)";
- picture = "\cse\cse_sys_cc\data\m_pda.paa";
- mass = 2;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/CfgVehicles.h b/TO_MERGE/cse/sys_cc/CfgVehicles.h
deleted file mode 100644
index 733b58ef02..0000000000
--- a/TO_MERGE/cse/sys_cc/CfgVehicles.h
+++ /dev/null
@@ -1,370 +0,0 @@
-class CfgVehicles
-{
- class Logic;
- class Module_F: Logic
- {
- class ArgumentsBaseUnits
- {
- };
- };
- class cse_sys_cc: Module_F
- {
- scope = 2;
- displayName = "Command and Control [CSE]";
- icon = "\cse\cse_main\data\cse_cc_module.paa";
- category = "cseCCModule";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class allowFeeds {
- displayName = "Enable Live Feeds";
- description = "Enable Live Feeds & UAV control";
- typeName = "BOOL";
- defaultValue = true;
- };
- class showUAV {
- displayName = "UAVs on BFT";
- description = "Automatically show UAVs on the BFT Map";
- typeName = "BOOL";
- defaultValue = true;
- };
- class uavRestriction {
- displayName = "Restrict UAV Feeds";
- description = "Should UAV Feeds be restricted";
- typeName = "BOOL";
- defaultValue = false;
- };
- class allowVehicleDisplays {
- displayName = "Vehicle Display";
- description = "Allow Vehicle Displays";
- typeName = "BOOL";
- defaultValue = false;
- };
- class autoAssignCallSigns {
- displayName = "Auto Assign Callsigns";
- description = "Automatically assign callsigns for units";
- typeName = "NUMBER";
- defaultValue = -1;
- class values {
- class disabled {name="Disabled"; value=-1; default=1; };
- class all {name="All"; value = 0; };
- class vehicles {name="Vehicles only"; value = 1; };
- class groups {name="Groups Only"; value = 2; };
- };
- };
- class allowDisplayOnMainMap {
- displayName = "Allow Main Map";
- description = "Allow CC to be used on the main map";
- typeName = "BOOL";
- defaultValue = false;
- };
- };
- };
-
- class cse_assignTrackerInfo_CC: Module_F
- {
- scope = 2;
- displayName = "Assign BFT Information [CSE]";
- icon = "\cse\cse_main\data\cse_cc_module.paa";
- category = "cseCCModule";
- function = "cse_fnc_assignTrackerInfo_CC";
- functionPriority = 1;
- isGlobal = 2;
- isTriggerActivated = 0;
- isDisposable = 0;
- author = "Combat Space Enhancement";
- class Arguments
- {
- class EnableList {
- displayName = "List";
- description = "List of unit names that will be used for assigning the BFT information, separated by commas.";
- defaultValue = "";
- };
-
- class type
- {
- displayName = "Type of Icon";
- description = "What icon is being displayed on BFT";
- typeName = "STRING";
- class values {
- class Infantry {name="Infantry"; value="Infantry"; default=1; };
- class Motorized {name="Motorized"; value="Motorized";};
- class Plane {name="Plane"; value="Plane";};
- class Helicopter {name="Helicopter"; value="Helicopter";};
- class Armor {name="Armor"; value="Armor";};
- class Naval {name="Naval"; value="Naval";};
- class HQ {name="HQ"; value="HQ";};
- class Medical {name="Medical"; value="Medical";};
- class Maintanance {name="Maintanance"; value="Maintanance";};
- class Artillery {name="Artillery"; value="Artillery";};
- class Mortar {name="Mortar"; value="Mortar";};
- class Service {name="Service"; value="Service";};
- class Recon {name="Recon"; value="Recon";};
- class Mechanized {name="Mechanized"; value="Mechanized";};
- class uav {name="uav"; value="uav";};
- };
- };
- class callSign
- {
- displayName = "Call Sign";
- description = "The Call Sign being displayed on BFT";
- typeName = "STRING";
- defaultValue = "";
- };
- };
- class ModuleDescription {
- description = "Sync this module to objects to assign tracker information. Please be aware that synchronizing this to JIP players does not work currently. Visit our wiki (wiki.csemod.com) for more information.";
- sync[] = {"Car","Air", "Amoured"};
- };
- };
- class cse_placeIntelMarker_CC: Module_F
- {
- scope = 2;
- displayName = "Place SALUTE Report[CSE]";
- icon = "\cse\cse_main\data\cse_cc_module.paa";
- category = "cseCCModule";
- function = "cse_fnc_modulePlaceIntelMarker_CC";
- functionPriority = 1;
- isGlobal = 0;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- class Arguments
- {
- class Type
- {
- displayName = "Type of Icon";
- description = "What icon is being displayed on BFT";
- typeName = "STRING";
- class values {
- class Infantry {name="Infantry"; value="Infantry"; default=1; };
- class Motorized {name="Motorized"; value="Motorized";};
- class Plane {name="Plane"; value="Plane";};
- class Helicopter {name="Helicopter"; value="Helicopter";};
- class Armor {name="Armor"; value="Armor";};
- class Naval {name="Naval"; value="Naval";};
- class HQ {name="HQ"; value="HQ";};
- class Medical {name="Medical"; value="Medical";};
- class Maintanance {name="Maintanance"; value="Maintanance";};
- class Artillery {name="Artillery"; value="Artillery";};
- class Mortar {name="Mortar"; value="Mortar";};
- class Service {name="Service"; value="Service";};
- class Recon {name="Recon"; value="Recon";};
- class Mechanized {name="Mechanized"; value="Mechanized";};
- class uav {name="uav"; value="uav";};
- };
- };
- class Side
- {
- displayName = "Side";
- description = "Side of the marker icon (Visual)";
- typeName = "STRING";
- class values {
- class BLUFOR {name="BLUFOR"; value="BLUFOR"; default=1;};
- class OPFOR {name="OPFOR"; value="OPFOR";};
- class GREENFOR {name="GREENFOR"; value="GREENFOR";};
- class UNKNOWN {name="UNKNOWN"; value="UNKNOWN";};
- };
- };
- class Direction
- {
- displayName = "Direction";
- description = "Which direction is the moment";
- typeName = "STRING";
- class values {
- class Static {name="Static"; value="Static"; default=1;};
- class North {name="North"; value="North";};
- class NorthEast {name="North East"; value="North East";};
- class East {name="East"; value="East";};
- class SouthEast {name="South East"; value="South East";};
- class South {name="South"; value="South";};
- class SouthWest {name="South West"; value="South West";};
- class West {name="West"; value="West";};
- class NorthWest {name="North West"; value="North West";};
- };
- };
- class Size
- {
- displayName = "Size";
- description = "What is the amount of Units spotted";
- typeName = "STRING";
- class values {
- class Building {name="Building"; value="Building"; default=1;};
- class Fortication {name="Fortication"; value="Fortication";};
- class Pax {name="Pax"; value="Pax";};
- class FireTeam {name="Fire Team"; value="Fire Team";};
- class Section {name="Section"; value="Section";};
- class Platoon {name="Platoon"; value="Platoon";};
- class Company {name="Company"; value="Company";};
- class Battalion {name="Battalion"; value="Battalion";};
- class Regiment {name="Regiment"; value="Regiment";};
- class Brigade {name="Brigade"; value="Brigade";};
- };
- };
- class Number
- {
- displayName = "Number";
- description = "What is the amount of Units spotted";
- typeName = "STRING";
- class values {
- class One {name="1x"; value="1x"; default=1;};
- class Two {name="2x"; value="2x";};
- class Three {name="3x"; value="3x";};
- class Four {name="4x"; value="4x";};
- class Five {name="5x"; value="5x";};
- class Six {name="6x"; value="6x";};
- class Seven {name="7x"; value="7x";};
- };
- };
- class Note
- {
- displayName = "Note";
- description = "Note for Salute Report";
- typeName = "STRING";
- defaultValue = "";
- };
- class PlacementSide
- {
- displayName = "Placement Side";
- description = "Side for which the marker will be placed.";
- typeName = "STRING";
- class values {
- class BLUFOR {name="BLUFOR"; value="west"; default=1;};
- class OPFOR {name="OPFOR"; value="east";};
- class GREENFOR {name="Independent"; value="independent";};
- };
- };
-
- };
- };
-
-
- class Item_Base_F;
- class cse_m_tabletItem: Item_Base_F
- {
- scope = 2;
- scopeCurator = 2;
- displayName = "Military Tablet (NATO)";
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_m_tablet
- {
- name = "cse_m_tablet";
- count = 1;
- };
- };
- };
- class cse_m_pdaItem: Item_Base_F
- {
- scope = 2;
- scopeCurator = 2;
- displayName = "Military PDA (NATO)";
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_m_pda
- {
- name = "cse_m_pda";
- count = 1;
- };
- };
- };
- class cse_m_tablet_uk_Item: Item_Base_F
- {
- scope = 2;
- scopeCurator = 2;
- displayName = "Military Tablet (UK)";
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_m_tablet_uk
- {
- name = "cse_m_tablet_uk";
- count = 1;
- };
- };
- };
- class cse_m_tablet_o_Item: Item_Base_F
- {
- scope = 2;
- scopeCurator = 2;
- displayName = "Military Tablet (OPFOR)";
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_m_tablet_o
- {
- name = "cse_m_tablet_o";
- count = 1;
- };
- };
- };
- class cse_m_pda_o_Item: Item_Base_F
- {
- scope = 2;
- scopeCurator = 2;
- displayName = "Military PDA (OPFOR)";
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_m_pda_o
- {
- name = "cse_m_pda_o";
- count = 1;
- };
- };
- };
-
- class NATO_Box_Base;
- class cse_ccItems_W : NATO_Box_Base {
- scope = 2;
- accuracy = 1000;
- displayName = "CC Devices [NATO] (CSE)";
- model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
- author = "Combat Space Enhancement";
- class TransportItems {
- class cse_m_tablet {
- name = "cse_m_tablet";
- count = 5;
- };
- class cse_m_pda {
- name = "cse_m_pda";
- count = 5;
- };
- };
- };
- class cse_ccItems_O: cse_ccItems_W {
- displayName = "CC Devices [OPFOR] (CSE)";
- class TransportItems {
- class cse_m_tablet_o {
- name = "cse_m_tablet_o";
- count = 5;
- };
- class cse_m_pda_o {
- name = "cse_m_pda_o";
- count = 5;
- };
- };
- };
- class cse_ccItems_G: cse_ccItems_W {
- displayName = "CC Devices [IND] (CSE)";
- class TransportItems {
- class cse_m_tablet_g {
- name = "cse_m_tablet_g";
- count = 5;
- };
- class cse_m_pda_g {
- name = "cse_m_pda_g";
- count = 5;
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_cc/CfgWeapons.h b/TO_MERGE/cse/sys_cc/CfgWeapons.h
deleted file mode 100644
index ba44c89ef0..0000000000
--- a/TO_MERGE/cse/sys_cc/CfgWeapons.h
+++ /dev/null
@@ -1,166 +0,0 @@
-class CfgWeapons {
-
- class ItemCore;
- class InventoryItem_Base_F;
- class cse_m_tablet: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = $STR_ITEM_CSE_M_TABLET_DISPLAY;
- picture = "\cse\cse_sys_cc\data\m_tablet.paa";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- descriptionShort = $STR_ITEM_CSE_M_TABLET_DESC;
- descriptionUse = $STR_ITEM_CSE_M_TABLET_DESC_USE;
- cse_blueForceTracker = 1; // enable Blue Force Tracking for item
- class ItemInfo: InventoryItem_Base_F
- {
- mass=6;
- type=201;
-
- };
- };
- class cse_m_pda: cse_m_tablet
- {
- descriptionUse = $STR_ITEM_CSE_M_PDA_DESC_USE;
- descriptionShort = $STR_ITEM_CSE_M_PDA_DESC;
- displayName = $STR_ITEM_CSE_M_PDA_DISPLAY;
- picture = "\cse\cse_sys_cc\data\m_pda.paa";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
-
- };
- };
- class cse_m_tablet_uk: cse_m_tablet
- {
- descriptionUse = $STR_ITEM_CSE_M_TABLET_UK_DESC_USE;
- descriptionShort = $STR_ITEM_CSE_M_TABLET_UK_DESC;
- displayName = $STR_ITEM_CSE_M_TABLET_UK_DISPLAY;
- picture = "\cse\cse_sys_cc\data\uk_tablet.paa";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=6;
- type=201;
-
- };
- };
- class cse_m_tablet_o: cse_m_tablet
- {
- descriptionUse = $STR_ITEM_CSE_M_TABLET_O_DESC_USE;
- descriptionShort = $STR_ITEM_CSE_M_TABLET_O_DESC;
- displayName = $STR_ITEM_CSE_M_TABLET_O_DISPLAY;
- picture = "\cse\cse_sys_cc\data\m_tablet.paa";
- };
- class cse_m_pda_o: cse_m_pda
- {
- descriptionUse = $STR_ITEM_CSE_M_PDA_O_DESC_USE;
- descriptionShort = $STR_ITEM_CSE_M_PDA_O_DESC;
- displayName = $STR_ITEM_CSE_M_PDA_O_DISPLAY;
- picture = "\cse\cse_sys_cc\data\m_pda.paa";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
-
- };
- };
-
- class cse_m_tablet_g: cse_m_tablet
- {
- descriptionUse = $STR_ITEM_CSE_M_TABLET_G_DESC_USE;
- descriptionShort = $STR_ITEM_CSE_M_TABLET_G_DESC;
- displayName = $STR_ITEM_CSE_M_TABLET_O_DISPLAY;
- picture = "\cse\cse_sys_cc\data\m_tablet.paa";
- };
- class cse_m_pda_g: cse_m_pda
- {
- descriptionUse = $STR_ITEM_CSE_M_PDA_G_DESC_USE;
- descriptionShort = $STR_ITEM_CSE_M_PDA_G_DESC;
- displayName = $STR_ITEM_CSE_M_PDA_G_DISPLAY;
- picture = "\cse\cse_sys_cc\data\m_pda.paa";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
-
- };
- };
-
- class cse_itemHelmetCamera_W: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- descriptionUse = $STR_ITEM_CSE_HELMET_CAMERA_DESC_SHORT;
- descriptionShort = $STR_ITEM_CSE_HELMET_CAMERA_DESC;
- displayName = $STR_ITEM_CSE_HELMET_CAMERA_DISPLAY;
- picture = "\cse\cse_sys_cc\data\helmet_camera.paa";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- simulation = "Weapon";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
-
- };
- };
- class cse_itemHelmetCamera_O: cse_itemHelmetCamera_W {
- descriptionUse = $STR_ITEM_CSE_HELMET_CAMERA_O_DESC_SHORT;
- descriptionShort = $STR_ITEM_CSE_HELMET_CAMERA_O_DESC;
- displayName = $STR_ITEM_CSE_HELMET_CAMERA_O_DISPLAY;
- picture = "\cse\cse_sys_cc\data\helmet_camera.paa";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
-
- };
- };
- class cse_itemHelmetCamera_G: cse_itemHelmetCamera_W {
- descriptionUse = $STR_ITEM_CSE_HELMET_CAMERA_G_DESC_SHORT;
- descriptionShort = $STR_ITEM_CSE_HELMET_CAMERA_G_DESC;
- displayName = $STR_ITEM_CSE_HELMET_CAMERA_G_DISPLAY;
- picture = "\cse\cse_sys_cc\data\helmet_camera.paa";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
-
- };
- };
-
- class cse_trackerItem_w: cse_m_tablet {
- displayName = $STR_ITEM_CSE_TRACKERITEM_W_DISPLAY;
- picture = "\cse\cse_sys_cc\data\m_pda.paa";
- descriptionShort = $STR_ITEM_CSE_TRACKERITEM_W_DESC;
- descriptionUse = $STR_ITEM_CSE_TRACKERITEM_W_DESC_SHORT;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
-
- };
- };
- class cse_trackerItem_o: cse_trackerItem_w {
- displayName = $STR_ITEM_CSE_TRACKERITEM_O_DISPLAY;
- descriptionShort = $STR_ITEM_CSE_TRACKERITEM_O_DESC;
- descriptionUse = $STR_ITEM_CSE_TRACKERITEM_O_DESC_SHORT;
- picture = "\cse\cse_sys_cc\data\m_pda.paa";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
-
- };
- };
- class cse_trackerItem_g: cse_trackerItem_w {
- displayName = $STR_ITEM_CSE_TRACKERITEM_G_DISPLAY;
- descriptionShort = $STR_ITEM_CSE_TRACKERITEM_G_DESC;
- descriptionUse = $STR_ITEM_CSE_TRACKERITEM_G_DESC_SHORT;
- picture = "\cse\cse_sys_cc\data\m_pda.paa";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
-
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_cc/Combat_Space_Enhancement.h
deleted file mode 100644
index a01b2f2245..0000000000
--- a/TO_MERGE/cse/sys_cc/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#define MENU_KEYBINDING 1
-#define ACTION_KEYBINDING 2
-#define CLIENT_SETTING 3
-
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_cc {
- init = "call compile preprocessFile 'cse\cse_sys_cc\init_sys_cc.sqf';";
- name = "Command and Control";
- class Configurations {
- class Command_and_Control {
- type = MENU_KEYBINDING;
- title = $STR_OPEN_CC_DEVICE_CONFIGURATION_TITLE;
- description = $STR_OPEN_CC_DEVICE_CONFIGURATION_DESC;
- value[] = {35,0,1,0};
- onPressed = "switch (true) do {case ([player,'cse_m_tablet'] call cse_fnc_hasItem_CC): {['cse_m_tablet'] call cse_fnc_openDevice_CC;};case ([player,'cse_m_tablet_uk'] call cse_fnc_hasItem_CC): {['cse_m_tablet_uk'] call cse_fnc_openDevice_CC;};case ([player,'cse_m_tablet_o'] call cse_fnc_hasItem_CC): {['cse_m_tablet_o'] call cse_fnc_openDevice_CC;};case ([player,'cse_m_pda'] call cse_fnc_hasItem_CC): {['cse_m_pda'] call cse_fnc_openDevice_CC;};case ([player,'cse_m_pda_o'] call cse_fnc_hasItem_CC): {['cse_m_pda_o'] call cse_fnc_openDevice_CC;};default {};};";
- idd = 590823;
- };
- class OpenOnBoard_BFT_Device {
- type = MENU_KEYBINDING;
- title = $STR_OPEN_CC_ONBOARD_CONFIGURATION_TITLE;
- description = $STR_OPEN_CC_ONBOARD_CONFIGURATION_DESC;
- value[] = {0,0,0,0};
- onPressed = "[vehicle player] call cse_fnc_openFlight_Display_CC;";
- idd = 590823;
- };
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/FutureSoldier/functions/fn_startFutureSoldierDisplay_CC.sqf b/TO_MERGE/cse/sys_cc/FutureSoldier/functions/fn_startFutureSoldierDisplay_CC.sqf
deleted file mode 100644
index 949b69bf6d..0000000000
--- a/TO_MERGE/cse/sys_cc/FutureSoldier/functions/fn_startFutureSoldierDisplay_CC.sqf
+++ /dev/null
@@ -1,32 +0,0 @@
-
-_code = {
- if (isnil "CSE_INTEL_MARKER_COLLECTION_CC" || !(([player] call cse_fnc_hasTrackerItem_CC))) exitwith {};
-
- _playerPos = (getPos player);
- {
-
- _pos = _x select 0;
- _args = _x select 1;
- _icon = _args select 0;
- _text = _args select 1;
- _color = _args select 2;
- _side = _x select 3;
- if (playerSide == _side && {_playerPos distance _pos < 200}) then {
- drawIcon3D [_icon,_color, _pos, 1, 1, 0, _text, 0, 0.03, 'PuristaMedium'];
- };
-
- false;
- }count CSE_INTEL_MARKER_COLLECTION_CC;
-
- {
- _pos = _x select 1;
- _unit = _x select 5;
- if (playerSide == (_x select 6) && {_playerPos distance _pos < 200} && {_unit != player}) then {
- drawIcon3D [(_x select 0), (_X select 3), _pos, 1, 1, 0, (_x select 2), 0, 0.03, 'PuristaMedium'];
- };
- false;
- }count CSE_TRACKER_ICONS;
-
-};
-
-["cse_futureSoldierDraw", [], _code] call cse_fnc_addTaskToPool_f;
diff --git a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_canViewFeed_CC.sqf b/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_canViewFeed_CC.sqf
deleted file mode 100644
index 262b0cd4e4..0000000000
--- a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_canViewFeed_CC.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_canViewFeed_CC.sqf
- * @Descr: Check if the provided device can view the feed of target if available.
- * @Author: Glowbal
- *
- * @Arguments: [target OBJECT, device STRING (Device classname)]
- * @Return: BOOL True if targets feed can be viewed with devices of given classname.
- * @PublicAPI: true
- */
-
-private ["_target", "_return", "_deviceName", "_item"];
-_target = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-_deviceName = [_this, 1, "", [""]] call BIS_fnc_Param;
-
-_return = false;
-if (_target isKindOf "CAManBase") then {
- //if ([_target] call cse_fnc_hasTrackerItem_CC) then {
- if (_target getvariable ["cse_hasCameraFeed_enabled_CC", false]) then {
- _item = switch (([_deviceName] call cse_fnc_getDeviceSide_CC)) do {
- case WEST: {"cse_itemHelmetCamera_W"};
- case EAST: {"cse_itemHelmetCamera_O"};
- case independent: {"cse_itemHelmetCamera_I"};
- default {""};
- };
- if (_item == "") exitwith{};
- if ([_target, _item] call cse_fnc_hasItem_CC) then {
- _return = true;
- };
- };
- //};
-} else {
- if (_deviceName != "") then {
- if (_target in allUnitsUAV) then {
- if (side _target == ([_deviceName] call cse_fnc_getDeviceSide_CC)) then {
- _return = true;
- };
- };
- };
-};
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_closeLiveFeedScreen_CC.sqf b/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_closeLiveFeedScreen_CC.sqf
deleted file mode 100644
index 70f91897cf..0000000000
--- a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_closeLiveFeedScreen_CC.sqf
+++ /dev/null
@@ -1 +0,0 @@
-[_deviceName,"main","hide"] call cse_fnc_setPiP_CC;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_getAllviewableFeeds_CC.sqf b/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_getAllviewableFeeds_CC.sqf
deleted file mode 100644
index d67cd977ac..0000000000
--- a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_getAllviewableFeeds_CC.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_getAllviewableFeeds_CC.sqf
- * @Descr: Get all feeds that are viewable for provided device classname.
- * @Author: Glowbal
- *
- * @Arguments: [deviceName STRING (Device classname)]
- * @Return: ARRAY An array with objects that have a viewable feed.
- * @PublicAPI: true
- */
-
-private ["_deviceName", "_return", "_displayText"];
-_deviceName = _this select 0;
-
-_return = [];
-{
- if (_x isKindOf "CAManBase") then {
- if ([_x, _deviceName] call cse_fnc_canViewFeed_CC) then {
- _trackerInfo = [_x] call cse_fnc_getTrackerInformation_CC;
- _displayText = _trackerInfo select 1;
- if (_displayText == "") then {
- _displayText = format["Unknown: ", _trackerInfo select 0];
- };
- _return pushback [_displayText, [_x]];
- };
- };
-}foreach allUnits;
-
-{
- if ([_x, _deviceName] call cse_fnc_canViewFeed_CC) then {
- _trackerInfo = [_x] call cse_fnc_getTrackerInformation_CC;
- _displayText = _trackerInfo select 1;
- if (_displayText == "") then {
- _displayText = format["UAV: %1", [_x] call cse_fnc_findTargetName_gui];
- };
- _return pushback [_displayText, [_x]];
- };
-
-}foreach allUnitsUAV;
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_openScreen_liveFeed_CC.sqf b/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_openScreen_liveFeed_CC.sqf
deleted file mode 100644
index 8114a31851..0000000000
--- a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_openScreen_liveFeed_CC.sqf
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * fn_openScreen_liveFeed_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName", "_appOpening", "_display", "_background"];
-_deviceName = _this select 0;
-
-if (isnil "CSE_LIVEFEED_TARGET_CC") exitwith {}; // error
-[_deviceName,"main","full"] call cse_fnc_setPiP_CC;
-[true] call cse_fnc_viewLiveFeed_CC;
-
-CSE_PREVIOUS_APPLICATION_CC = [_deviceName] call cse_fnc_getCurrentApplication_CC;
-
-_appOpening = "LiveFeed_Viewing";
-if (CSE_LIVEFEED_TARGET_CC in allUnitsUAV) then {
- _sideBarFullScreen = {
- private["_deviceName","_cfg","_allowSidebar"];
- _deviceName = _this select 0;
-
- _allowSidebar = 0;
- if (isnil 'CSE_REGISTERED_DEVICES_CC') then {
- CSE_REGISTERED_DEVICES_CC = [];
- };
-
- {
- if (_x select 0 == _deviceName) exitwith {
- _allowSidebar = _x select 2;
- };
- }foreach CSE_REGISTERED_DEVICES_CC;
- _allowSidebar
- };
-
- _sideBarN = ([_deviceName] call _sideBarFullScreen);
- if (_sideBarN == 1) then {
- _appOpening = _appOpening + "_UAV";
- };
-};
-
-call compile format["CSE_CURRENT_APPLICATION_%1_CC = '%2';",_deviceName, _appOpening];
-
-if ([_deviceName] call cse_fnc_isSideBarOpen_CC) then {
- [_deviceName,"right"] call cse_fnc_setSideBar_CC;
-};
-
-_display = uiNamespace getvariable _deviceName;
-_background = _display displayCtrl 602;
-_background ctrlSetPosition [0,0,0,0];
-_background ctrlSetBackgroundColor [0.9,0.9,0.9,1];
-_background ctrlCommit 0;
-
-(_display displayCtrl 603) ctrlSetText "";
-(_display displayCtrl 604) ctrlSetText "";
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_setLiveFeedTargetObj_CC.sqf b/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_setLiveFeedTargetObj_CC.sqf
deleted file mode 100644
index 58e14f9ce8..0000000000
--- a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_setLiveFeedTargetObj_CC.sqf
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * fn_setLiveFeedTarget_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define QUAD_COPTER_POS [0,0,-0.5]
-#define LARGE_UAV_POS [0,0.5,-1.0]
-#define GAV_POS [0,0,1]
-
-private ["_target", "_camera", "_cameraAttachToPos"];
-_target = _this select 0;
-CSE_LIVEFEED_TARGET_CC = _target;
-
-[format["Setting live feed target: %1",_this]] call cse_fnc_debug;
-
-if (isNull _target) then {
- [false] call cse_fnc_viewLiveFeed_CC;
-} else {
- _camera = objNull;
- if (isnil "CSE_PIP_CAMERA_CC") then {
- _camera = "camera" camCreate (position _target);
- CSE_PIP_CAMERA_CC = _camera;
- _camera cameraEffect ["INTERNAL", "BACK", "rendertarget11"];
- } else {
- if (isNull CSE_PIP_CAMERA_CC) then {
- ["LiveFeed Camera was null. Creating a new one."] call cse_fnc_debug;
- _camera = "camera" camCreate (position _target);
- CSE_PIP_CAMERA_CC = _camera;
- _camera cameraEffect ["INTERNAL", "BACK", "rendertarget11"];
- };
- _camera = CSE_PIP_CAMERA_CC;
- };
- detach _camera;
- if (_target isKindOf "CaManBase") then {
- _camera attachto [_target,[-0.18,0.1,0.1], "head"];
-
- [_target, _camera] spawn {
- _target = _this select 0;
- _camera = _this select 1;
- while {((alive _target) && (CSE_LIVEFEED_TARGET_CC == _target) && alive _camera && dialog)} do {
- if (vehicle _target != _target) then {
- _positionInWorld = _target modelToWorld (_target selectionPosition "head");
- _vehPos = (vehicle _target) worldToModel _positionInWorld;
- _camera attachTo [(vehicle _target),_vehPos];
- } else {
- _camera attachto [_target,[-0.18,0.1,0.1], "head"];
- };
- };
- };
-
- } else {
- if ((_target in allUnitsUAV)) then {
- // TODO Make this dynamic through an array.
- _cameraAttachToPos = switch (typeOf _target) do {
- case "B_UAV_01_F": {
- QUAD_COPTER_POS;
- };
- case "B_UAV_02_CAS_F": {
- LARGE_UAV_POS;
- };
- case "B_UAV_02_F": {
- LARGE_UAV_POS;
- };
- case "B_UGV_01_F": {
- GAV_POS;
- };
- case "B_UGV_01_rcws_F": {
- GAV_POS;
- };
-
- case "O_UAV_01_F": {
- QUAD_COPTER_POS;
- };
- case "O_UAV_02_CAS_F": {
- LARGE_UAV_POS;
- };
- case "O_UAV_02_F": {
- LARGE_UAV_POS;
- };
- case "O_UGV_01_F": {
- GAV_POS;
- };
- case "O_UGV_01_rcws_F": {
- GAV_POS;
- };
-
- case "I_UAV_01_F": {
- QUAD_COPTER_POS;
- };
- case "I_UAV_02_CAS_F": {
- LARGE_UAV_POS;
- };
- case "I_UAV_02_F": {
- LARGE_UAV_POS;
- };
- case "I_UGV_01_F": {
- GAV_POS;
- };
- case "I_UGV_01_rcws_F": {
- GAV_POS;
- };
- default {
- QUAD_COPTER_POS;
- };
- };
-
- _camera attachto [_target,_cameraAttachToPos];
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_takeControlUAV_CC.sqf b/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_takeControlUAV_CC.sqf
deleted file mode 100644
index ae383f31b6..0000000000
--- a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_takeControlUAV_CC.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_takeControlUAV_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: [uav OBJECT (Of type UAV)]
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_uav", "_continue"];
-_uav = _this select 0;
-if (_uav in allUnitsUAV) then {
- if (isnil "CSE_CONTROL_UAV_RESTRICTED_CC") then {
- CSE_CONTROL_UAV_RESTRICTED_CC = false;
- };
- _continue = true;
- if (CSE_CONTROL_UAV_RESTRICTED_CC) then {
- _continue = player getvariable ["cse_canControlUAVs_CC", false];
- };
-
- if (!_continue) exitwith {}; // has no access to control the UAV.
- if (!("GUNNER" in uavControl _uav)) then {
- if (count (crew _uav) >= 2) then {
- player remoteControl ((crew _uav) select 1);
- _uav switchCamera "Gunner";
- closeDialog 0;
- } else {
- if (!("DRIVER" in uavControl _uav)) then {
- if (count (crew _uav) >= 1) then {
- player remoteControl ((crew _uav) select 0);
- _uav switchCamera "INTERNAL";
- closeDialog 0;
- };
- };
- };
-
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_viewLiveFeed_CC.sqf b/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_viewLiveFeed_CC.sqf
deleted file mode 100644
index cb8c3ff886..0000000000
--- a/TO_MERGE/cse/sys_cc/LiveFeed/functions/fn_viewLiveFeed_CC.sqf
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * fn_viewLiveFeed_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_display","_view","_ctrl", "_camera"];
-
-_view = _this select 0;
-
-disableSerialization;
-_deviceName = [] call cse_fnc_getCurrentDeviceName_CC;
-[format["fn_viewLiveFeed_CC %1 %2",_this, _deviceName]] call cse_fnc_debug;
-_display = uiNamespace getvariable _deviceName;
-_ctrl = (_display displayCtrl 20);
-
-if (_view) then {
- _camera = objNull;
- if (isnil "CSE_PIP_CAMERA_CC") then {
- _camera = "camera" camCreate (position player);
- CSE_PIP_CAMERA_CC = _camera;
- _camera cameraEffect ["INTERNAL", "BACK","rendertarget11"];
- } else {
- if (isNull CSE_PIP_CAMERA_CC) then {
- ["LiveFeed Camera was null. Creating a new one."] call cse_fnc_debug;
- _camera = "camera" camCreate (position player);
- CSE_PIP_CAMERA_CC = _camera;
- _camera cameraEffect ["INTERNAL", "BACK","rendertarget11"];
- };
- _camera = CSE_PIP_CAMERA_CC;
- };
- "rendertarget11" setPiPEffect [0];
- _ctrl ctrlsettext "#(argb,256,256,1)r2t(rendertarget11,1.0)";
- _ctrl ctrlcommit 0;
-} else {
- _ctrl ctrlsettext "";
- _ctrl ctrlcommit 0;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/Modules/functions/fn_assignTrackerInfo_CC.sqf b/TO_MERGE/cse/sys_cc/Modules/functions/fn_assignTrackerInfo_CC.sqf
deleted file mode 100644
index 05cb0865c2..0000000000
--- a/TO_MERGE/cse/sys_cc/Modules/functions/fn_assignTrackerInfo_CC.sqf
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * fn_assignTrackerInfo_CC.sqf
- * @Descr: assigns tracker info for the BFT. Does not work well with JIP players.
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_logic", "_type", "_objects", "_callsign"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-
-[format["AssigningTrackerInfo called. Arguments are: %1", _this]] call cse_fnc_debug;
-if (!isNull _logic) then {
-
- _type = _logic getvariable ["type","Infantry"];
- _callsign = _logic getvariable ["callSign",""];
-
- _list = _logic getvariable ["EnableList",""];
- _splittedList = [_list, ","] call BIS_fnc_splitString;
- _nilCheckPassedList = "";
- {
- _x = [_x] call cse_fnc_string_removeWhiteSpace;
- if !(isnil _x) then {
- if (_nilCheckPassedList == "") then {
- _nilCheckPassedList = _x;
- } else {
- _nilCheckPassedList = _nilCheckPassedList + ","+ _x;
- };
- };
- }foreach _splittedList;
-
- _list = "[" + _nilCheckPassedList + "]";
- _parsedList = [] call compile _list;
- _objects = synchronizedObjects _logic;
- if (!(_objects isEqualTo []) && _parsedList isEqualTo []) then {
-
- /*
- This has been enabled again to allow backwards compatability for older CSE missions.
- */
- [["synchronizedObjects for the 'assign BFT Information' Module is deprecated. Please use the enable for list instead!"], 1] call cse_fnc_debug;
- {
- if (!isnil "_x") then {
- if (typeName _x == typeName objNull) then {
- if (local _x) then {
- (vehicle _x) setvariable ["cse_bft_info_cc",[_type,_callsign,true,false],true];
- };
- };
- };
- }foreach _objects;
- };
-
- {
- if (!isnil "_x") then {
- if (typeName _x == typeName objNull) then {
- if (local _x) then {
- (vehicle _x) setvariable ["cse_bft_info_cc",[_type,_callsign,true,false],true];
- };
- };
- };
- }foreach _parsedList;
-
-} else {
- [format["AssigningTrackerInfo called but logic is NULL"]] call cse_fnc_debug;
- deleteVehicle _logic;
-};
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/Modules/functions/fn_modulePlaceIntelMarker_CC.sqf b/TO_MERGE/cse/sys_cc/Modules/functions/fn_modulePlaceIntelMarker_CC.sqf
deleted file mode 100644
index e4cbe90e65..0000000000
--- a/TO_MERGE/cse/sys_cc/Modules/functions/fn_modulePlaceIntelMarker_CC.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_modulePlaceIntelMarker_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private["_logic", "_placeMentSide"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-if (!isServer) exitwith{};
-if (!isNull _logic) then {
- if (!isnil "cse_fnc_placeMarker_CC") then {
-
- _placeMentSide = _logic getvariable ["PlacementSide", "west"],
- _placeMentSide = switch (_placeMentSide) do {
- case "west": {west};
- case "east": {east};
- case "independent": {independent};
- default {west};
- };
-
- [
- [
- _logic getvariable "Type",
- _logic getvariable "Side",
- _logic getvariable "Direction",
- _logic getvariable "Size",
- _logic getvariable "Number",
- _logic getVariable "Note",
- [0,0,0,0,0]
- ],
- ASLToATL getPosASL _logic,
- "intel", _placeMentSide
- ] call cse_fnc_placeMarker_CC;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/SupportRequests/fn_supportRequests_CC.sqf b/TO_MERGE/cse/sys_cc/SupportRequests/fn_supportRequests_CC.sqf
deleted file mode 100644
index 0d9c673d22..0000000000
--- a/TO_MERGE/cse/sys_cc/SupportRequests/fn_supportRequests_CC.sqf
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Support Requests:
-
- - different amount of lines
- - different priorities
- - action on
-
-
-*/
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/UI.h b/TO_MERGE/cse/sys_cc/UI.h
deleted file mode 100644
index 49e034d68b..0000000000
--- a/TO_MERGE/cse/sys_cc/UI.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "ui\define.hpp"
-#include "ui\cse_m_tablet.hpp"
-#include "ui\cse_m_pda.hpp"
-#include "ui\cse_m_tablet_uk.hpp"
-#include "ui\m_flight_display.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/config.cpp b/TO_MERGE/cse/sys_cc/config.cpp
deleted file mode 100644
index 332b69f12e..0000000000
--- a/TO_MERGE/cse/sys_cc/config.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#define _ARMA_
-class CfgPatches
-{
- class cse_sys_cc
- {
- units[] = {"cse_m_tabletItem", "cse_m_pdaItem", "cse_m_tablet_uk_Item", "cse_m_tablet_o_Item", "cse_m_pda_o_Item"};
- weapons[] = {"cse_m_tablet","cse_m_pda","cse_m_tablet_uk","cse_m_tablet_o", "cse_m_pda_o"};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_gui","cse_main", "A3_Weapons_F", "A3_Weapons_F_Items"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_cc {
- list[] = {"cse_sys_cc"};
- };
- };
-};
-
-#include "CfgFactionClasses.h"
-#include "CfgVehicles.h"
-#include "CfgWeapons.h"
-#include "CfgFunctions.h"
-#include "ui.h"
-#include "Combat_Space_Enhancement.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/data/black_background.paa b/TO_MERGE/cse/sys_cc/data/black_background.paa
deleted file mode 100644
index c1af9b82c8..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/black_background.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/button_dropdown_menu.paa b/TO_MERGE/cse/sys_cc/data/button_dropdown_menu.paa
deleted file mode 100644
index a37ddb4ee8..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/button_dropdown_menu.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/button_dropdown_menu_hover.paa b/TO_MERGE/cse/sys_cc/data/button_dropdown_menu_hover.paa
deleted file mode 100644
index 35c17ae73e..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/button_dropdown_menu_hover.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/dropdown_menu2.paa b/TO_MERGE/cse/sys_cc/data/dropdown_menu2.paa
deleted file mode 100644
index 511e46aab9..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/dropdown_menu2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/empty_background.paa b/TO_MERGE/cse/sys_cc/data/empty_background.paa
deleted file mode 100644
index 1e708c623d..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/empty_background.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/empty_background.png b/TO_MERGE/cse/sys_cc/data/empty_background.png
deleted file mode 100644
index 7840c05423..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/empty_background.png and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/empty_background2.paa b/TO_MERGE/cse/sys_cc/data/empty_background2.paa
deleted file mode 100644
index 8fdc404973..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/empty_background2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/helmet_camera.paa b/TO_MERGE/cse/sys_cc/data/helmet_camera.paa
deleted file mode 100644
index dbf519925f..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/helmet_camera.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/home_icon.paa b/TO_MERGE/cse/sys_cc/data/home_icon.paa
deleted file mode 100644
index 6f204172b4..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/home_icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/icons/Thumbs.db b/TO_MERGE/cse/sys_cc/data/icons/Thumbs.db
deleted file mode 100644
index f2f0037220..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/icons/Thumbs.db and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/icons/calculator_icon.paa b/TO_MERGE/cse/sys_cc/data/icons/calculator_icon.paa
deleted file mode 100644
index 0e583c2f0e..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/icons/calculator_icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/icons/icon_template.png b/TO_MERGE/cse/sys_cc/data/icons/icon_template.png
deleted file mode 100644
index 06dc5e8601..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/icons/icon_template.png and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/icons/map-icon.paa b/TO_MERGE/cse/sys_cc/data/icons/map-icon.paa
deleted file mode 100644
index 3d9638f361..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/icons/map-icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/icons/settings-icon.paa b/TO_MERGE/cse/sys_cc/data/icons/settings-icon.paa
deleted file mode 100644
index 1d9a72d28c..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/icons/settings-icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/m_flight_display.paa b/TO_MERGE/cse/sys_cc/data/m_flight_display.paa
deleted file mode 100644
index c84ce7914b..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/m_flight_display.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/m_pda.paa b/TO_MERGE/cse/sys_cc/data/m_pda.paa
deleted file mode 100644
index 7c29772968..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/m_pda.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/m_tablet.paa b/TO_MERGE/cse/sys_cc/data/m_tablet.paa
deleted file mode 100644
index 3aab4e4e78..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/m_tablet.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/m_vehicle_display.paa b/TO_MERGE/cse/sys_cc/data/m_vehicle_display.paa
deleted file mode 100644
index d2fb6b4b3c..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/m_vehicle_display.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/menuIcon.paa b/TO_MERGE/cse/sys_cc/data/menuIcon.paa
deleted file mode 100644
index 34e7a6e681..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/menuIcon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/sidebar_background.paa b/TO_MERGE/cse/sys_cc/data/sidebar_background.paa
deleted file mode 100644
index 2c8ecbcfb9..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/sidebar_background.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/data/uk_tablet.paa b/TO_MERGE/cse/sys_cc/data/uk_tablet.paa
deleted file mode 100644
index 04a83c08d5..0000000000
Binary files a/TO_MERGE/cse/sys_cc/data/uk_tablet.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_cc/init_server.sqf b/TO_MERGE/cse/sys_cc/init_server.sqf
deleted file mode 100644
index 4a424150cf..0000000000
--- a/TO_MERGE/cse/sys_cc/init_server.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-server_init.sqf
-Usage: Initalizes the Command and Control Server functionality
-Author: Glowbal
-
-Arguments: array []
-Returns: void
-
-Affects: Server
-Executes: All Localities
-*/
-
-//if (isServer) exitwith{};
-
-if (isnil "CSE_CC_LOGIC_OBJECT_CC") then {
- _group = createGroup sideLogic;
- CSE_CC_LOGIC_OBJECT_CC = _group createUnit ["logic", [1,1,1], [], 0, "FORM"];
- publicVariable "CSE_CC_LOGIC_OBJECT_CC";
-// [] call cse_fnc_assignTrackerIDs_Server_CC; // temp disabled, switching to non id based???
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/init_sys_cc.sqf b/TO_MERGE/cse/sys_cc/init_sys_cc.sqf
deleted file mode 100644
index c58bb51cee..0000000000
--- a/TO_MERGE/cse/sys_cc/init_sys_cc.sqf
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * init_sys_cc.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_args"];
-_args = _this;
-CSE_CONTROL_UAV_RESTRICTED_CC = false;
-CSE_AUTO_SHOW_UAV_TRACKERS_ON_BFT = false;
-CSE_ALLOW_LIVE_FEEDS_CC = true;
-CSE_ALLOW_VEHICLE_DISPLAYS_CC = true;
-CSE_AUTO_ASSIGN_CALLSIGNS_CC = -1;
-CSE_VIEW_ON_MAIN_MAP_SETTING_CC = false;
-CSE_VIEW_ON_MAIN_MAP_ALLOWED_CC = false;
-
-{
- if (_x select 0 == "uavRestriction") then {
- CSE_CONTROL_UAV_RESTRICTED_CC = (_x select 1);
- };
- if (_x select 0 == "showUAV") then {
- CSE_AUTO_SHOW_UAV_TRACKERS_ON_BFT = _x select 1;
- };
- if (_x select 0 == "allowFeeds") then {
- CSE_ALLOW_LIVE_FEEDS_CC = _x select 1;
- };
- if (_x select 0 == "allowVehicleDisplays") then {
- CSE_ALLOW_VEHICLE_DISPLAYS_CC = _x select 1;
- };
- if (_x select 0 == "autoAssignCallSigns") then {
- CSE_AUTO_ASSIGN_CALLSIGNS_CC = _x select 1;
- };
- if (_x select 0 == "allowDisplayOnMainMap") then {
- CSE_VIEW_ON_MAIN_MAP_ALLOWED_CC = _x select 1;
- };
-}foreach _args;
-
-[format["AIM - Command and Control initialisation started"],3] call cse_fnc_debug;
-waituntil{!isnil "cse_gui"};
-[format["CC - Command and Control Module initialised"],2] call cse_fnc_debug;
-
-
-["cse_sys_cc_allowUseOfMainMap", ["Enable", "Disable"], (["cse_sys_cc_allowUseOfMainMap", 0] call cse_fnc_getClientSideOptionFromProfile_F), {
- CSE_VIEW_ON_MAIN_MAP_SETTING_CC = (_this select 1) == 0;
-}] call cse_fnc_addClientSideOptions_f;
-
-["cse_sys_cc_allowUseOfMainMap","option","Use main map (CC)","Use Command and Control on the main map when you have a CC device. Read only."] call cse_fnc_settingsDefineDetails_F;
-
-
-
-["cse_m_tablet",[-0.03,0.06,1.014,0.827],1,WEST] call cse_fnc_registerDevice_CC;
-["cse_m_pda",[0.2761,0.38,0.33,0.47],2,WEST] call cse_fnc_registerDevice_CC;
-
-["cse_m_tablet_o",[-0.03,0.06,1.014,0.827],1,EAST] call cse_fnc_registerDevice_CC;
-["cse_m_pda_o",[0.2761,0.38,0.33,0.47],2,EAST] call cse_fnc_registerDevice_CC;
-
-["cse_m_tablet_g",[-0.03,0.06,1.014,0.827],1,independent] call cse_fnc_registerDevice_CC;
-["cse_m_pda_g",[0.2761,0.38,0.33,0.47],2,independent] call cse_fnc_registerDevice_CC;
-
-["cse_m_tablet_uk",[-0.03,0.06,1.014,0.827],1,WEST] call cse_fnc_registerDevice_CC;
-
-cse_fnc_switchItem = {
- private ["_unit","_orig","_newI"];
- _unit = _this select 0;
- _orig = _this select 1;
- _newI = _this select 2;
- _unit removeItem _orig;
- _unit addItem _newI;
-};
-
-CSE_DISPLAY_CC_VIEW_FULL_SCREEN_CC = false;
-[] call compile preprocessFile "cse\cse_sys_cc\register_applications.sqf";
-[] call compile preprocessFile "cse\cse_sys_cc\init_server.sqf";
-
-CSE_ICON_PATH = "cse\cse_gui\radialmenu\data\icons\";
-CSE_LIVEFEED_TARGET_CC = ObjNull;
-_entries = [
- ["PDA (NATO)", {([player,"cse_m_pda"] call cse_fnc_hasItem_CC)}, CSE_ICON_PATH + "icon_pda.paa", {closeDialog 0; ["cse_m_pda"] call cse_fnc_openDevice_CC;}, "Open PDA (NATO)"],
- ["Tablet (NATO)", {([player,"cse_m_tablet"] call cse_fnc_hasItem_CC)}, CSE_ICON_PATH + "icon_tablet.paa", {closeDialog 0; ["cse_m_tablet"] call cse_fnc_openDevice_CC;}, "Open Tablet (NATO)"],
- ["Tablet (UK)", {([player,"cse_m_tablet_uk"] call cse_fnc_hasItem_CC)}, CSE_ICON_PATH + "icon_tablet_uk.paa", {closeDialog 0; ["cse_m_tablet_uk"] call cse_fnc_openDevice_CC;}, "Open Tablet (UK)"],
- ["PDA (OPFOR)", {([player,"cse_m_pda_o"] call cse_fnc_hasItem_CC)}, CSE_ICON_PATH + "icon_pda.paa", {closeDialog 0; ["cse_m_pda_o"] call cse_fnc_openDevice_CC;}, "Open PDA (OPFOR)"],
- ["Tablet (OPFOR)", {([player,"cse_m_tablet_o"] call cse_fnc_hasItem_CC)}, CSE_ICON_PATH + "icon_tablet.paa", {closeDialog 0; ["cse_m_tablet_o"] call cse_fnc_openDevice_CC;}, "Open Tablet (OPFOR)"],
- ["PDA (IND)", {([player,"cse_m_pda_g"] call cse_fnc_hasItem_CC)}, CSE_ICON_PATH + "icon_pda.paa", {closeDialog 0; ["cse_m_pda_g"] call cse_fnc_openDevice_CC;}, "Open PDA (IND)"],
- ["Tablet (IND)", {([player,"cse_m_tablet_g"] call cse_fnc_hasItem_CC)}, CSE_ICON_PATH + "icon_tablet.paa", {closeDialog 0; ["cse_m_tablet_g"] call cse_fnc_openDevice_CC;}, "Open Tablet (IND)"]
-];
-["ActionMenu","equipment", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-cse_fnc_hasHelmetCameraItem_CC = {
- (([player,"cse_itemHelmetCamera_W"] call cse_fnc_hasItem_CC) || ([player,"cse_itemHelmetCamera_O"] call cse_fnc_hasItem_CC) || ([player,"cse_itemHelmetCamera_G"] call cse_fnc_hasItem_CC))
-};
-
-_entries = [
- ["Enable Camera", {(([] call cse_fnc_hasHelmetCameraItem_CC) && !(player getvariable ["cse_hasCameraFeed_enabled_CC", false]))}, CSE_ICON_PATH + "icon_helmetCam_small.paa", {closeDialog 0; player setvariable ["cse_hasCameraFeed_enabled_CC", true, true];}, "Turn on your helmet camera"],
- ["Disable Camera", {(([] call cse_fnc_hasHelmetCameraItem_CC) && (player getvariable ["cse_hasCameraFeed_enabled_CC", false]))}, CSE_ICON_PATH + "icon_helmetCam_small.paa", {closeDialog 0; player setvariable ["cse_hasCameraFeed_enabled_CC", false, true];}, "Turn off your helmet camera"]
-];
-["ActionMenu","equipment", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
-// Request players to access their BFT device(s)
-_entries = [
- ["PDA (NATO)", {([_this select 1,"cse_m_pda"] call cse_fnc_hasItem_CC) && (player != (_this select 1))}, CSE_ICON_PATH + "icon_pda.paa", {closeDialog 0; [player, _this select 1, "access_device", "%1 wants to access your BFT", "if !(_this select 2) exitwith {}; if ([_this select 1, 'cse_m_pda'] call cse_fnc_hasItem_CC) then { ['cse_m_pda'] call cse_fnc_openDevice_CC; };"] call cse_fnc_sendRequest_f;}, "Access PDA (NATO)"],
-
- ["Tablet (NATO)", {([_this select 1,"cse_m_tablet"] call cse_fnc_hasItem_CC) && (player != (_this select 1))}, CSE_ICON_PATH + "icon_tablet.paa", {closeDialog 0; [player, _this select 1, "access_device", "%1 wants to access your BFT", "if !(_this select 2) exitwith {}; if ([_this select 1, 'cse_m_tablet'] call cse_fnc_hasItem_CC) then { ['cse_m_tablet'] call cse_fnc_openDevice_CC; };"] call cse_fnc_sendRequest_f;}, "Access Tablet (NATO)"],
-
- ["Tablet (UK)", {([_this select 1,"cse_m_tablet_uk"] call cse_fnc_hasItem_CC) && (player != (_this select 1))}, CSE_ICON_PATH + "icon_tablet_uk.paa", {closeDialog 0; [player, _this select 1, "access_device", "%1 wants to access your BFT", "if !(_this select 2) exitwith {}; if ([_this select 1, 'cse_m_tablet_uk'] call cse_fnc_hasItem_CC) then { ['cse_m_tablet_uk'] call cse_fnc_openDevice_CC; };"] call cse_fnc_sendRequest_f;}, "Access Tablet (UK)"],
-
- ["PDA (OPFOR)", {([_this select 1,"cse_m_pda_o"] call cse_fnc_hasItem_CC) && (player != (_this select 1))}, CSE_ICON_PATH + "icon_pda.paa", {closeDialog 0; [player, _this select 1, "access_device", "%1 wants to access your BFT", "if !(_this select 2) exitwith {}; if ([_this select 1, 'cse_m_pda_o'] call cse_fnc_hasItem_CC) then { ['cse_m_pda_o'] call cse_fnc_openDevice_CC; };"] call cse_fnc_sendRequest_f;}, "Access PDA (OPFOR)"],
-
- ["Tablet (OPFOR)", {([_this select 1,"cse_m_tablet_o"] call cse_fnc_hasItem_CC) && (player != (_this select 1))}, CSE_ICON_PATH + "icon_tablet.paa", {closeDialog 0; [player, _this select 1, "access_device", "%1 wants to access your BFT", "if !(_this select 2) exitwith {}; if ([_this select 1, 'cse_m_tablet_o'] call cse_fnc_hasItem_CC) then { ['cse_m_tablet_o'] call cse_fnc_openDevice_CC; };"] call cse_fnc_sendRequest_f;}, "Access Tablet (OPFOR)"],
-
- ["PDA (IND)", {([_this select 1,"cse_m_pda_g"] call cse_fnc_hasItem_CC) && (player != (_this select 1))}, CSE_ICON_PATH + "icon_pda.paa", {closeDialog 0; [player, _this select 1, "access_device", "%1 wants to access your BFT", "if !(_this select 2) exitwith {}; if ([_this select 1, 'cse_m_pda_g'] call cse_fnc_hasItem_CC) then { ['cse_m_pda_g'] call cse_fnc_openDevice_CC; };"] call cse_fnc_sendRequest_f;}, "Access PDA (IND)"],
-
- ["Tablet (IND)", {([_this select 1,"cse_m_tablet_g"] call cse_fnc_hasItem_CC) && (player != (_this select 1))}, CSE_ICON_PATH + "icon_tablet.paa", {closeDialog 0; [player, _this select 1, "access_device", "%1 wants to access your BFT", "if !(_this select 2) exitwith {}; if ([_this select 1, 'cse_m_tablet_g'] call cse_fnc_hasItem_CC) then { ['cse_m_tablet_g'] call cse_fnc_openDevice_CC; };"] call cse_fnc_sendRequest_f;}, "Access Tablet (IND)"]
-];
-["ActionMenu","interaction", _entries] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
-_entries = [
- ["BFT Display", {[player, vehicle player] call cse_fnc_canUseOnBoard_BFT_Device_CC}, CSE_ICON_PATH + "icon_m_flight_display.paa", {closeDialog 0; [vehicle player] call cse_fnc_openFlight_Display_CC;}, "Use onboard BFT Display"]
-];
-["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
-if (hasInterface) then {
- // set the event handlers for the map
- {
- _x spawn {
- disableserialization;
- waituntil {!isnull (finddisplay _this displayctrl 51)};
-
- private "_control";
- _control = finddisplay _this displayctrl 51;
- _control ctrlAddEventHandler ["draw","
- if ([player] call cse_fnc_hasTrackerItem_CC && CSE_VIEW_ON_MAIN_MAP_SETTING_CC && CSE_VIEW_ON_MAIN_MAP_ALLOWED_CC) then {
- {[_x,(_this select 0)] call cse_fnc_drawBFTIcons_CC;}foreach CSE_TRACKER_ICONS;
- if (CSE_TOGGLE_INTEL_LAYER_CC) then {{[_x,(_this select 0)] call cse_fnc_drawBFTMarker_CC;}foreach CSE_INTEL_MARKER_COLLECTION_CC;};
- if (CSE_TOGGLE_ROUTE_LAYER_CC) then {{[_x,(_this select 0)] call cse_fnc_drawBFTMarker_CC;}foreach CSE_ROUTE_MARKER_COLLECTION_CC;};
- };
- "];
- };
- } foreach [getnumber (configfile >> "RscDisplayMainMap" >> "idd"), getnumber (configfile >> "RscDisplayGetReady" >> "idd"), getnumber (configfile >> "RscDisplayClientGetReady" >> "idd"), getnumber (configfile >> "RscDisplayServerGetReady" >> "idd")
- ];
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/register_applications.sqf b/TO_MERGE/cse/sys_cc/register_applications.sqf
deleted file mode 100644
index 03baabb4c3..0000000000
--- a/TO_MERGE/cse/sys_cc/register_applications.sqf
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-registerApplications.sqf
-Usage: Registers applications for the Command and Control Module
-Author: Glowbal
-
-Arguments: array []
-Returns: Void
-
-Affects: Clients
-Executes: All Localities
-*/
-
-_r = profilenamespace getvariable ['Map_BLUFOR_R',0];
-_g = profilenamespace getvariable ['Map_BLUFOR_G',0.8];
-_b = profilenamespace getvariable ['Map_BLUFOR_B',1];
-_a = profilenamespace getvariable ['Map_BLUFOR_A',0.8];
-CSE_SIDE_WEST_COLOR = [_r,_g,_b,_a];
-
-CSE_SIDE_EAST_COLOR =
- [
- profilenamespace getvariable ['Map_OPFOR_R',0.5],
- profilenamespace getvariable ['Map_OPFOR_G',0],
- profilenamespace getvariable ['Map_OPFOR_B',0],
- profilenamespace getvariable ['Map_OPFOR_A',0.8]
- ];
-
-_r = profilenamespace getvariable ['Map_Independent_R',0];
-_g = profilenamespace getvariable ['Map_Independent_G',1];
-_b = profilenamespace getvariable ['Map_Independent_B',1];
-_a = profilenamespace getvariable ['Map_OPFOR_A',0.8];
-CSE_SIDE_IND_COLOR = [_r,_g,_b,_a];
-
-if (isDedicated) exitwith {};
-
- ["home","","",1,[["Show BFT Icon","button","private '_var'; _var = [player] call cse_fnc_getTrackerInformation_CC; _var set [2, true]; player setvariable ['cse_bft_info_cc', _var, true]; ",0], ["Hide BFT Icon","button","private '_var'; _var = [player] call cse_fnc_getTrackerInformation_CC; _var set [2, false]; player setvariable ['cse_bft_info_cc', _var, true]; ",0]],[WEST,EAST,INDEPENDENT],"[_this select 0] call cse_fnc_openScreen_home_CC;", ["All"]]call cse_fnc_registerApp_CC;
-
- _sideBarCC_APP = [["Blue Force Tracking","label","",0],
- ["Toggle Intel Layer","button","if (isnil 'CSE_TOGGLE_INTEL_LAYER_CC') then { CSE_TOGGLE_INTEL_LAYER_CC = true; } else { CSE_TOGGLE_INTEL_LAYER_CC = !CSE_TOGGLE_INTEL_LAYER_CC; };",0],
- ["Toggle Route Layer","button","if (isnil 'CSE_TOGGLE_ROUTE_LAYER_CC') then { CSE_TOGGLE_ROUTE_LAYER_CC = true; } else { CSE_TOGGLE_ROUTE_LAYER_CC = !CSE_TOGGLE_ROUTE_LAYER_CC; };",0],
- ["Toggle Callsigns","button","if (isnil 'CSE_TOGGLE_CALLSIGNS_CC') then { CSE_TOGGLE_CALLSIGNS_CC = true; } else { CSE_TOGGLE_CALLSIGNS_CC = !CSE_TOGGLE_CALLSIGNS_CC; };",0]
- ];
- ["cc_app","C2","cse\cse_sys_cc\data\icons\map-icon.paa",0,_sideBarCC_APP,[WEST,EAST,INDEPENDENT],"[_this select 0,WEST] call cse_fnc_openScreen_cc_app_CC;", ["All"]] call cse_fnc_registerApp_CC;
-
- CSE_TOGGLE_CALLSIGNS_CC = true;
- CSE_TOGGLE_ROUTE_LAYER_CC = true;
- CSE_TOGGLE_INTEL_LAYER_CC = true;
-
-[] spawn {
- waituntil {
- CSE_TRACKER_ICONS = [] call cse_fnc_displayBFTSymbols_CC;
- uisleep 5;
- false;
- };
-};
-
-
-if (CSE_ALLOW_LIVE_FEEDS_CC) then {
- _sideBarCC_APP = [["Live Feed","label","",0],
- ["Disconnect","button","[call cse_fnc_getCurrentDeviceName_CC, CSE_PREVIOUS_APPLICATION_CC] call cse_fnc_openScreen_CC; [call cse_fnc_getCurrentDeviceName_CC,'main', 'hidden'] call cse_fnc_setPiP_CC; ",0]
- ];
- ["LiveFeed_Viewing","","", 1,_sideBarCC_APP,[WEST,EAST,INDEPENDENT],"if (!isNull CSE_LIVEFEED_TARGET_CC) then { if (CSE_LIVEFEED_TARGET_CC in allUnitsUAV) exitwith {}; if ([CSE_LIVEFEED_TARGET_CC, call cse_fnc_getCurrentDeviceName_CC] call cse_fnc_canViewFeed_CC) then {[_this select 0] call cse_fnc_openScreen_liveFeed_CC;} else {[_this select 0, 'LiveFeed_app'] call cse_fnc_openScreen_CC;}; };", ["All"]] call cse_fnc_registerApp_CC;
-
-
- _sideBarCC_APP = [["Live Feed","label","",0],
- ["Disconnect","button","[call cse_fnc_getCurrentDeviceName_CC, CSE_PREVIOUS_APPLICATION_CC] call cse_fnc_openScreen_CC; [call cse_fnc_getCurrentDeviceName_CC,'main', 'hidden'] call cse_fnc_setPiP_CC; ",0],
- ["Take Control","button","if (!isNull CSE_LIVEFEED_TARGET_CC) then { if !(CSE_LIVEFEED_TARGET_CC in allUnitsUAV) exitwith {}; if ([CSE_LIVEFEED_TARGET_CC, call cse_fnc_getCurrentDeviceName_CC] call cse_fnc_canViewFeed_CC) then {[CSE_LIVEFEED_TARGET_CC] call cse_fnc_takeControlUAV_CC; }; };",0]
- ];
- ["LiveFeed_Viewing_UAV","","", 1, _sideBarCC_APP,[WEST,EAST,INDEPENDENT],"if (!isNull CSE_LIVEFEED_TARGET_CC) then { if !(CSE_LIVEFEED_TARGET_CC in allUnitsUAV) exitwith {}; if ([CSE_LIVEFEED_TARGET_CC, call cse_fnc_getCurrentDeviceName_CC] call cse_fnc_canViewFeed_CC) then {[_this select 0] call cse_fnc_openScreen_liveFeed_CC;} else {[_this select 0, 'LiveFeed_app'] call cse_fnc_openScreen_CC;};};", ["All"]] call cse_fnc_registerApp_CC;
-
-
- ["LiveFeed_app","TACNET","cse\cse_sys_cc\data\icons\icon_livefeed_app.paa", 0,[],[WEST,EAST,INDEPENDENT],"[_this select 0] call cse_fnc_openScreen_liveFeed_app_CC;", ["All"]] call cse_fnc_registerApp_CC;
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/stringtable.xml b/TO_MERGE/cse/sys_cc/stringtable.xml
deleted file mode 100644
index b25f4ec012..0000000000
--- a/TO_MERGE/cse/sys_cc/stringtable.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-
-
-
- open BFT Tablet/PDA
- Otwórz Tablet/PDA BFT
- Abrir Tableta BFT/PDA
-
-
- Opens the tablet or PDA from CC if you have one in your inventory. Tablet takes priority above PDA.
- Otwiera tablet lub PDA z poziomu Konsoli Dowodzenia jeżeli posiadasz takowy na wyposażeniu. Tablet ma priorytet nad PDA.
- Abre la Tableta o PDA desde CC si tienes una en el inventario. La Tableta tiene priorida sobre la PDA
-
-
-
- open On board BFT Device
- Otwórz pokładowe urządzenie BFT
- Abre el dispositivo BFT de a bordo
-
-
- Opens the onboard BFT device of the vehicle the player is currently in, if available.
- Otwiera pokładowe urządzenie BFT w pojeździe, w którym znajduje się gracz, jeżeli pojazd ten posiada takowe urzadzenie.
- Abre el dispositivo BFT del vehículo del jugador, si estuviera disponible.
-
-
-
-
-
- Military Tablet (NATO)
- Wojskowy Tablet (NATO)
- Tableta Militar (OTAN)
-
-
- Military Tablet (NATO)
- Wojskowy Tablet (NATO)
- Tableta Militar (OTAN)
-
-
- Military Tablet (NATO)
- Wojskowy Tablet (NATO)
- Tableta Militar (OTAN)
-
-
-
- PDA (NATO)
- PDA (NATO)
- PDA (OTAN)
-
-
- A PDA for use in the field (NATO)
- Palmtop przystosowany do użytku w polu (NATO)
- PDA para uso en el campo de batalla (OTAN)
-
-
- A PDA, for use in the field (NATO)
- Palmtop przystosowany do użytku w polu (NATO)
- PDA para uso en el campo de batalla (OTAN)
-
-
-
- Military Tablet (UK/NATO)
- Wojskowy Tablet (UK/NATO)
- Tableta Militar (UK/OTAN)
-
-
- A Tablet for use in the field (UK/NATO)
- Tablet przystosowany do użytku w polu (UK/NATO)
- Una Tableta para uso en el campo de batalla (UK/OTAN)
-
-
- UK Tablet. Functions with NATO side.
- Brytyjski Tablet. Współdziała dla strony NATO.
- Tableta UK. Funciones del bando OTAN.
-
-
-
- Military Tablet (OPFOR)
- Wojskowy Tablet (OPFOR)
- Tableta Militar (OPFOR)
-
-
- Military Tablet for OPFOR
- Wojskowy Tablet dla strony OPFOR
- Tableta Militar para OPFOR
-
-
- OPFOR Tablet
- Tablet OPFOR
- Tableta Militar OPFOR
-
-
-
- PDA (OPFOR)
- PDA (OPFOR)
- PDA (OPFOR)
-
-
- A PDA for use in the field (OPFOR)
- Palmtop przystosowany do użytku w polu (OPFOR)
- PDA para uso en el campo de batalla (OPFOR)
-
-
- OPFOR PDA
- PDA (OPFOR)
- PDA OPFOR
-
-
-
-
- Military Tablet (IND)
- Wojskowy Tablet (IND)
- Tableta Militar (IND)
-
-
- Military Tablet for IND
- Wojskowy Tablet dla strony INDFOR
- Tableta Militar para IND
-
-
- Independent Tablet
- Wojskowy Tablet (IND)
- Tableta del bando Independiente
-
-
-
- PDA (IND)
- PDA (IND)
- PDA (IND)
-
-
- A PDA for use in the field (IND)
- Palmtop przystosowany do użytku w polu (IND)
- PDA para uso en el campo de batalla (IND)
-
-
- Independent PDA
- PDA (INDFOR)
- PDA del bando Independiente
-
-
-
- Helmet Camera (NATO)
- Kamera nahełmowa (NATO)
- Cámara del Casco (OTAN)
-
-
- Helmet Camera for NATO forces
- Kamera nahełmowa dla sił NATO
- Cámara del Casco para fuerzas de la OTAN
-
-
- NATO Helmet Camera
- Kamera nahełmowa NATO
- Cámara del Casco OTAN
-
-
-
- Helmet Camera (OPFOR)
- Kamera nahełmowa (OPFOR)
- Cámara del Casco (OPFOR)
-
-
- Helmet Camera for OPFOR forces
- Kamera nahełmowa dla sił OPFOR
- Cámara del Casco para fuerzas OPFOR
-
-
- OPFOR Helmet Camera
- Kamera nahełmowa OPFOR
- Cámara del Casco OPFOR
-
-
-
- Helmet Camera (IND)
- Kamera nahełmowa (IND)
- Cámara del Casco (IND)
-
-
- Helmet Camera for Independent
- Kamera nahełmowa dla sił INDFOR
- Cámara del Casco de los Independientes
-
-
- IND Helmet Camera
- Kamera nahełmowa INDFOR
- Cámara del Casco IND
-
-
-
-
- Blue Force Tracker (IND)
- Blue Force Tracker (IND)
- Blue Force Tracker (IND)
-
-
- Blue Force Tracker for Independent
- Blue Force Tracker dla strony INDFOR
- Blue Force Tracker para Independentes
-
-
- Blue Force Tracker (IND)
- Blue Force Tracker (IND)
- Blue Force Tracker (IND)
-
-
- Blue Force Tracker (OPFOR)
- Blue Force Tracker (OPFOR)
- Blue Force Tracker (OPFOR)
-
-
- Blue Force Tracker for OPFOR
- Blue Force Tracker dla strony OPFOR
- Blue Force Tracker para OPFOR
-
-
- Blue Force Tracker (OPFOR)
- Blue Force Tracker (OPFOR)
- Blue Force Tracker (OPFOR)
-
-
- Blue Force Tracker (BLUFOR)
- Blue Force Tracker (BLUFOR)
- Blue Force Tracker (BLUFOR)
-
-
- Blue Force Tracker for BLUFOR
- Blue Force Tracker dla strony BLUFOR
- Blue Force Tracker para BLUFOR
-
-
- Blue Force Tracker (BLUFOR)
- Blue Force Tracker (BLUFOR)
- Blue Force Tracker (BLUFOR)
-
-
-
-
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_editIntelMarker_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_editIntelMarker_CC.sqf
deleted file mode 100644
index 8b5a5e147a..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_editIntelMarker_CC.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-
-private ["_mpSync","_args","_nearest","_lastestCount","_pos","_count","_position"];
-_position = [_this, 0, [0,0,0], [[]],3] call BIS_fnc_param;
-_nearest = 25;
-_lastestCount = -1;
-
-_marker = [];
-{
- _pos = (_x select 0);
- if ((_pos distance _position) < _nearest) then {
- _nearest = _pos distance _position;
- _lastestCount = _foreachIndex;
- _marker = _x;
- };
-}foreach CSE_INTEL_MARKER_COLLECTION_CC;
-if (_lastestCount < 0) exitwith {};
-_selection = _marker select 4;
-_usedDesc = _marker select 5;
-_inputDesc = if (_usedDesc) then { _marker select 1 select 1;} else { "" };
-
-_device = call cse_fnc_getCurrentDeviceName_CC;
-[_device,"open","SALUTE Report",format["[_this,%1,'intel', ([([] call cse_fnc_getCurrentDeviceName_CC)] call cse_fnc_getDeviceSide_CC)] call cse_fnc_updateMarker_CC",_position]] call cse_fnc_setPopUpMenu_CC;
-
-_opt = [
- ["Type:","combo","",
- ["Infantry","Motorized","Plane","Helicopter","Armor","Naval","HQ","Medical","Maintanance","Artillery","Mortar","Service","Recon","Mechanized","uav","Installation","Unknown"], _selection select 0
- ],
- ["Side:","combo","",["BLUFOR","OPFOR","GREENFOR","UNKNOWN"], _selection select 1],
- ["direction:","combo","",["Static","North","North East","East","South East","South","South West","West","North West"], _selection select 2],
- ["Size:","combo","",["Pax","Fire Team","Section","Platoon","Company","Battalion","Regiment", "Brigade"], _selection select 3],
- ["","combo","",["1x","2x","3x","4x","5x","6x", "7x"], _selection select 4],
- ["Description:","input",_inputDesc]
- ];
-[_device,_opt] call cse_fnc_setPopUpOptions_CC;
-
-cse_fnc_updateMarker_CC = {
- [CSE_CLICKED_ON_MAP_FOUND_INTELMARKER_CC] call cse_fnc_removeIntelMarker_CC;
- _this call cse_fnc_placeMarker_CC;
-};
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getFirstAvailableOptionFieldMain_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getFirstAvailableOptionFieldMain_CC.sqf
deleted file mode 100644
index e771e0b2bb..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getFirstAvailableOptionFieldMain_CC.sqf
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * fn_getFirstAvailableOptionFieldMain_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_LABEL_IDC 140
-#define START_COMBO_IDC 150
-#define START_BUTTON_IDC 160
-#define START_EDIT_IDC 171
-#define START_LB_IDC 180
-
-private ["_deviceName","_display","_type","_idcStart","_return"];
-_deviceName = _this select 0;
-_type = _this select 1;
-
- disableSerialization;
- _display = uiNamespace getvariable _deviceName;
-
- _idcStart = switch (_type) do {
- case "label": {
- START_LABEL_IDC
- };
- case "drop": {
- START_COMBO_IDC
- };
- case "button": {
- START_BUTTON_IDC
- };
- case "edit": {
- START_EDIT_IDC
- };
- case "lb": {
- START_LB_IDC
- };
- default {-1};
- };
- _return = controlNull;
- for [{_i=_idcStart},{_i < _idcStart + 10},{_i=_i+1}] do {
- _ctrl = (_display displayCtrl _i);
- _foundPos = ctrlPosition _ctrl;
- if (_foundPos select 2 <= 0) exitwith {
- _return = _ctrl;
- };
- };
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getFirstAvailableOptionField_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getFirstAvailableOptionField_CC.sqf
deleted file mode 100644
index 082b309f7e..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getFirstAvailableOptionField_CC.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * fn_getFirstAvailableOptionField_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_LABEL_IDC 40;
-#define START_LB_IDC 50;
-#define START_BUTTON_IDC 60;
-#define START_EDIT_IDC 71;
-
-private ["_deviceName","_display","_type","_idcStart","_return"];
-_deviceName = _this select 0;
-_type = _this select 1;
-
- disableSerialization;
- _display = uiNamespace getvariable _deviceName;
-
- _idcStart = switch (_type) do {
- case "label": {
- START_LABEL_IDC
- };
- case "drop": {
- START_LB_IDC
- };
- case "button": {
- START_BUTTON_IDC
- };
- case "edit": {
- START_EDIT_IDC
- };
- default {-1};
- };
- _return = controlNull;
- for [{_i=_idcStart},{_i < _idcStart + 10},{_i=_i+1}] do {
- _ctrl = (_display displayCtrl _i);
- _foundPos = ctrlPosition _ctrl;
- if (_foundPos select 2 <= 0) exitwith {
- _return = _ctrl;
- };
- };
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getMainOptionFieldCtrl_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getMainOptionFieldCtrl_CC.sqf
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getNavBarRatio_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getNavBarRatio_CC.sqf
deleted file mode 100644
index c694eaf448..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getNavBarRatio_CC.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_getNavBarRatio_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings"];
-_deviceName = _this select 0;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_settings set[3,(_settings select 3) / 13];
-
-_settings
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getOptionFieldOnPos_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getOptionFieldOnPos_CC.sqf
deleted file mode 100644
index 1740122ded..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getOptionFieldOnPos_CC.sqf
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * fn_getOptionFieldOnPos_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_LABEL_IDC 40;
-#define START_LB_IDC 50;
-#define START_BUTTON_IDC 60;
-#define START_EDIT_IDC 71;
-
-private ["_deviceName","_settings","_display","_pos","_ctrl","_options","_idcStart","_ctrlPosition","_return","_possibleTypes","_sideBarHeight","_buttonHeightwithSpacing","_buttonSpacing","_buttonHeight","_maxPositions"];
-_deviceName = _this select 0;
-_pos = _this select 1;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_sideBarRatio = [_deviceName] call cse_fnc_getSideBarRatio_CC;
-_navBarRatio = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-_maxPositions = (_settings select 3) / 0.05;
-_maxPositions = 12;
-_sideBarHeight = _sideBarRatio select 3;
-_buttonHeightwithSpacing = _sideBarHeight / _maxPositions;
-_buttonSpacing = _buttonHeightwithSpacing / 20;
-_buttonHeight = _buttonHeightwithSpacing - _buttonSpacing;
-
-_ctrlPosition = [(_sideBarRatio select 0) + 0.001, (_sideBarRatio select 1) + (_navBarRatio select 3)/1.5, (_sideBarRatio select 2) - 0.002, _buttonHeight];
-_ctrlPosition set[1, (_ctrlPosition select 1) + (_pos * (_buttonHeight + _buttonSpacing))+ 0.002];
-
-_display = uiNamespace getvariable _deviceName;
-_return = controlNull;
-
- _possibleTypes = ["label","drop","button","edit"];
- {
- _idcStart = switch (_x) do {
- case "label": {
- START_LABEL_IDC
- };
- case "drop": {
- START_LB_IDC
- };
- case "button": {
- START_BUTTON_IDC
- };
- case "edit": {START_EDIT_IDC};
- default {-1};
- };
- private ["_i","_foundPos"];
- for [{_i=_idcStart},{_i < _idcStart + 10},{_i=_i+1}] do {
- _ctrl = (_display displayCtrl _i);
- _foundPos = ctrlPosition _ctrl;
-
- if (((_foundPos select 0 == _ctrlPosition select 0) && (_foundPos select 1 == _ctrlPosition select 1) && (_foundPos select 2 == _ctrlPosition select 2) && (_foundPos select 3 == _ctrlPosition select 3))) then {
- _return = _ctrl;
- };
- };
- }foreach _possibleTypes;
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getPopUpRatio_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getPopUpRatio_CC.sqf
deleted file mode 100644
index e4060260ec..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getPopUpRatio_CC.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_getPopUpRatio_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_spacingSide","_spacingTop","_widthOfPopUp","_heightOfPopUp"];
- disableSerialization;
- _deviceName = (call cse_fnc_getCurrentDeviceName_CC);
- _settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
- _spacingSide = (_settings select 2) / 10;
- _spacingTop = (_settings select 3) / 10;
- _widthOfPopUp = ((_settings select 2)) - (_spacingSide * 2);
- _heightOfPopUp = ((_settings select 3)) - (_spacingTop * 2);
-
-([(_settings select 0) + _spacingSide, (_settings select 1) + _spacingTop,_widthOfPopUp, _heightOfPopUp])
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getSideBarOptionFields_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getSideBarOptionFields_CC.sqf
deleted file mode 100644
index 3a7c478524..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getSideBarOptionFields_CC.sqf
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * fn_getSideBarOptionFields_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_currentApp","_cfg","_return","_posCounter","_pos"];
-_deviceName = _this select 0;
-_return = [];
-_currentApp = call cse_fnc_getCurrentApplication_CC;
-_posCounter = 0;
-
-if (isnil 'CSE_REGISTERED_DEVICES_CC') then {
- CSE_REGISTERED_DEVICES_CC = [];
-};
-
-{
- if (_x select 0 == _currentApp) exitwith {
- {
- private ["_text","_type","_action","_newOptionField"];
- _text = _x select 0;
- _type = _x select 1;
- _action = _x select 2;
- _pos = _x select 3;
- _option = [_text,_type,_action];
-
- if (_pos < _posCounter) then {
- _pos = _posCounter;
- };
- if (_posCounter < _pos) then {
- _posCounter = _pos;
- };
-
-
- if (_type == "drop") then {
- private ["_values","_valueCfg"];
- _values = (_x select 4);
- _option set[3,_values];
- };
- _newOptionField = [_pos,_option];
- _return pushback _newOptionField;
- _posCounter = _posCounter + 1;
- }foreach (_x select 4);
- };
-}foreach CSE_REGISTERED_APPLICATIONS_CC;
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getSideBarRatio_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getSideBarRatio_CC.sqf
deleted file mode 100644
index ea98c02ed2..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_getSideBarRatio_CC.sqf
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * fn_getSideBarRatio_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_pos","_ctrl"];
-_deviceName = _this select 0;
-
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_navBarSettings = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-
-_sideBarFullScreen = {
- private["_deviceName","_cfg","_allowSideBar"];
- _deviceName = _this select 0;
-
- _allowSidebar = 0;
- if (isnil 'CSE_REGISTERED_DEVICES_CC') then {
- CSE_REGISTERED_DEVICES_CC = [];
- };
-
- {
- if (_x select 0 == _deviceName) exitwith {
- _allowSidebar = _x select 2;
- };
- }foreach CSE_REGISTERED_DEVICES_CC;
- _allowSidebar
-};
-
-_sideBarN = ([_deviceName] call _sideBarFullScreen);
-_return = switch (_sideBarN) do {
- case 1: {[(_settings select 0) + ((_settings select 2)-((_settings select 2) / 4.5)), (_settings select 1) + (_navBarSettings select 3)/2, (_settings select 2)/4.5, (_settings select 3) - (_navBarSettings select 3)/2]};
- case 2: {[(_settings select 0) + ((_settings select 2)-((_settings select 2) / 1.5)), (_settings select 1)+ (_navBarSettings select 3)/2, (_settings select 2)/1.5, (_settings select 3) - (_navBarSettings select 3)/2]};
- case 3: {[_settings select 0, (_settings select 1)+ (_navBarSettings select 3)/2, _settings select 2, (_settings select 3) - (_navBarSettings select 3)/2]};
- default {[0,0,0,0]};
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isMapOpen_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isMapOpen_CC.sqf
deleted file mode 100644
index 30499de28d..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isMapOpen_CC.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_isMapOpen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_return","_idc"];
-_deviceName = _this select 0;
-_selected = _this select 1;
-_display = uiNamespace getvariable _deviceName;
-_idc = switch (_selected) do {
- case "main": {10};
- case "sidebar": {11};
- default {10};
-};
-!((ctrlPosition ((_display displayCtrl _idc)) select 0 == 0) && ((ctrlPosition (_display displayCtrl _idc)) select 1 == 0))
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isOpenBottomBar_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isOpenBottomBar_CC.sqf
deleted file mode 100644
index bdbf29babc..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isOpenBottomBar_CC.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_isOpenBottomBar_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_return","_idc"];
-_deviceName = _this select 0;
-_display = uiNamespace getvariable _deviceName;
-_idc = 155;
-!((ctrlPosition ((_display displayCtrl _idc)) select 0 == 0) && ((ctrlPosition (_display displayCtrl _idc)) select 2 == 0))
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isPiPOpen_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isPiPOpen_CC.sqf
deleted file mode 100644
index 6f89467f3b..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isPiPOpen_CC.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_isPiPOpen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_return","_idc"];
-_deviceName = _this select 0;
-_selected = _this select 1;
-_display = uiNamespace getvariable _deviceName;
-_idc = switch (_selected) do {
- case "main": {20};
- case "sidebar": {21};
- default {20};
-};
-!((ctrlPosition ((_display displayCtrl _idc)) select 0 == 0) && ((ctrlPosition (_display displayCtrl _idc)) select 2 == 0))
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isPopUpOpen_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isPopUpOpen_CC.sqf
deleted file mode 100644
index 77ac0b510b..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isPopUpOpen_CC.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * fn_isPopUpOpen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName"];
-_deviceName = _this select 0;
-
- disableSerialization;
- _display = uiNamespace getvariable _deviceName;
- _backGroundCtrl = (_display displayCtrl 150);
- _return = false;
- {
- if (_x != 0) then {
- _return = true;
- };
- }foreach (ctrlPosition _backGroundCtrl);
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isSelectMenuOpen_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isSelectMenuOpen_CC.sqf
deleted file mode 100644
index 5313bd636f..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_isSelectMenuOpen_CC.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_isSelectMenuOpen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_IDC 260
-#define NUMBER_OF_IC 9
-
-private ["_deviceName","_display"];
-_deviceName = _this select 0;
-_display = uiNamespace getvariable _deviceName;
-
-
-(((ctrlPosition (_display displayCtrl START_IDC)) select 2) != 0)
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_popUpAccept_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_popUpAccept_CC.sqf
deleted file mode 100644
index 6102fe4151..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_popUpAccept_CC.sqf
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * fn_popUpAccept_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_IDC_LABEL 240
-#define START_IDC_COMBO 250
-#define START_IDC_BTN 260
-#define START_IDC_LIST 280
-#define START_IDC_INPUT 270
-
-private ["_deviceName","_display","_ctrlBtn","_ctrlLbl","_ctrlCmbo","_return","_name","_type","_action","_ctrlRight","_ctrlLeft","_content","_ctrlInput"];
-_deviceName = _this select 0;
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-
-_ctrlBtn = START_IDC_BTN;
-_ctrlLbl = START_IDC_LABEL;
-_ctrlCmbo = START_IDC_COMBO;
-_ctrlInput = START_IDC_INPUT;
-_return = [];
-_selectables = [];
-{
- _name = _x select 0;
- _type = _x select 1;
- _action = _x select 2;
-
- switch (_type) do {
- case "btn": {
- _ctrlRight = (_display displayCtrl _ctrlBtn);
- _ctrlBtn = _ctrlBtn + 1;
- _selectables pushback -1;
- };
- case "label": {
- _ctrlRight = (_display displayCtrl _ctrlLbl);
- _ctrlLbl = _ctrlLbl + 1;
- _selectables pushback -1;
- };
- case "combo": {
- _ctrlRight = (_display displayCtrl _ctrlCmbo);
- _ctrlLeft = (_display displayCtrl _ctrlLbl);
- _ctrlCmbo = _ctrlCmbo + 1;
- _ctrlLbl = _ctrlLbl + 1;
-
- _content = (_x select 3);
- if (isnil "_content") then {
- _content = [];
- };
- if (typeName _content != typeName []) then {
- _content = [];
- };
-
- _selected = lbCurSel _ctrlRight;
- if (_selected <0) then {
- _selected = 0;
- };
- _value = (_content select _selected);
- _return pushback _value;
- _selectables pushback _selected;
- };
- case "input": {
- _ctrlRight = (_display displayCtrl _ctrlInput);
- _ctrlInput = _ctrlInput + 1;
- _return pushback (ctrlText _ctrlRight);
- _selectables pushback -1;
- };
- default {};
- };
-}foreach CSE_POP_UP_OPTIONS_CC;
-_return pushback _selectables;
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_removeOptionField_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_removeOptionField_CC.sqf
deleted file mode 100644
index 094de05005..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_removeOptionField_CC.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * fn_removeOptionField_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_LABEL_IDC 40;
-#define START_LB_IDC 50;
-#define START_BUTTON_IDC 60;
-
-
-private ["_deviceName","_pos","_return","_ctrl"];
-_deviceName = _this select 0;
-_pos = _this select 1;
-_ctrl = [_deviceName,_pos] call cse_fnc_getOptionFieldOnPos_CC;
-_ctrl ctrlSetPosition [0,0,0,0];
-_ctrl ctrlCommit 0;
-
-_ctrl
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_removeSelectMenu_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_removeSelectMenu_CC.sqf
deleted file mode 100644
index 87a62354fc..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_removeSelectMenu_CC.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_removeSelectMenu_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_IDC 260
-#define NUMBER_OF_IC 9
-
-
-private ["_deviceName","_display"];
-_deviceName = _this select 0;
-_display = uiNamespace getvariable _deviceName;
-
-for [{_i=START_IDC},{_i < START_IDC + NUMBER_OF_IC},{_i=_i+1}] do {
- (_display displayCtrl _i) ctrlSetPosition [0,0,0,0];
- (_display displayCtrl _i) ctrlCommit 0;
-};
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setBackground_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setBackground_CC.sqf
deleted file mode 100644
index d042548c4e..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setBackground_CC.sqf
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * fn_setBackground_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_pos","_ctrl","_newBackGround"];
-_deviceName = _this select 0;
-_pos = _this select 1;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-_ctrl = (_display displayCtrl 1);
-
-_newPos = switch (_pos) do {
- case "full": {_settings};
- case "hidden": {[0,0,0,0]};
-};
-
-_newBackGround = "cse\cse_sys_cc\data\empty_background2.paa";
-if (count _this > 2) then {
- _newBackGround = switch (_this select 2) do {
- case "black": {"cse\cse_sys_cc\data\black_background.paa"};
- default {"cse\cse_sys_cc\data\empty_background2.paa"};
- };
-};
-
-_ctrl ctrlSetText _newBackGround;
-_ctrl ctrlsetPosition _newPos;
-_ctrl ctrlCommit 0;
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setBottomBar_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setBottomBar_CC.sqf
deleted file mode 100644
index b15d094f93..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setBottomBar_CC.sqf
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * fn_setBottomBar_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_pos","_ctrl","_newBackGround"];
-_deviceName = _this select 0;
-_pos = _this select 1;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_settings set[1,(_settings select 1) + (_settings select 3) - ((_settings select 3) / 13)];
-_settings set[3,(_settings select 3) / 13];
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-_ctrl = (_display displayCtrl 155);
-
-_newPos = switch (_pos) do {
- case "show": {_settings};
- case "hidden": {[0,0,0,0]};
-};
-_ctrl ctrlsetPosition _newPos;
-_ctrl ctrlCommit 0;
-
-_ctrl = (_display displayCtrl 156);
-_ctrl ctrlsetPosition _newPos;
-_ctrl ctrlSetText "";
-_ctrl ctrlCommit 0;
-
-if (_pos == "Show") then {
- [_deviceName] spawn {
- _deviceName = _this select 0;
- disableSerialization;
- _display = uiNamespace getvariable _deviceName;
- _ctrl = (_display displayCtrl 156);
- _mapCtrl = (_display displayCtrl 10);
- if (isnil "CSE_MOUSE_RELATIVE_POSITION") then {
- CSE_MOUSE_RELATIVE_POSITION = [0,0];
- };
-
- while {([_deviceName] call cse_fnc_isOpenBottomBar_CC)} do {
- if !([_deviceName, "main"] call cse_fnc_isPiPOpen_CC) then {
- _WorldCoord = _mapCtrl posScreenToWorld CSE_MOUSE_RELATIVE_POSITION;
- _WorldCoord set [2, 0];
- _mousePosition = mapGridPosition _WorldCoord;
- _positionPlayer = mapGridPosition player;
- _playerPos = getPos player;
- _playerPos set [2, 0];
- _ctrl ctrlSetText format["CUR: %1 TAG: %2 DIS: %3",_positionPlayer,_mousePosition, _playerPos distance _WorldCoord];
- } else {
- _targetPos = getPos CSE_LIVEFEED_TARGET_CC;
- _targetPos set [2, 0];
- _mousePosition = mapGridPosition _targetPos;
- _positionPlayer = mapGridPosition player;
- _playerPos = getPos player;
- _playerPos set [2, 0];
- _ctrl ctrlSetText format["CUR: %1 TAG: %2 DIS: %3",_positionPlayer,_mousePosition, _playerPos distance _targetPos];
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setMainOptionField_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setMainOptionField_CC.sqf
deleted file mode 100644
index 0ba7c73878..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setMainOptionField_CC.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_setMainOptionField_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_pos","_ctrl","_options","_buttonHeightwithSpacing","_sideBarHeight","_buttonHeight","_buttonSpacing"];
-_deviceName = _this select 0;
-_pos = round(_this select 1);
-_options = _this select 2;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_sideBarRatio = [_deviceName] call cse_fnc_getSideBarRatio_CC;
-_navBarRatio = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-_maxPositions = (_settings select 3) / 0.05;
-_maxPositions = 12;
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setMap_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setMap_CC.sqf
deleted file mode 100644
index 55737c4cbd..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setMap_CC.sqf
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * fn_setMap_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_pos","_ctrl","_newPos"];
-_deviceName = _this select 0;
-_selected = _this select 1;
-_pos = _this select 2;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-
-_idc = switch (_selected) do {
- case "main": {10};
- case "sidebar": {11};
- default {10};
-};
-
-_ctrl = (_display displayCtrl _idc);
-
-_sideBarRatio = [_deviceName] call cse_fnc_getSideBarRatio_CC;
-_navBarRatio = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-_navBarHeight = _navBarRatio select 3;
-_sideBarWidth = _sideBarRatio select 2;
-
-
-_fullScreenSideBar = [_settings select 0,(_settings select 1) + _navBarHeight, (_settings select 2) - _sideBarWidth, (_settings select 3) - (_navBarHeight*2)];
-_fullScreenNoSideBar = [_settings select 0,(_settings select 1) + _navBarHeight, (_settings select 2), (_settings select 3) - (_navBarHeight*2)];
-
-_newPos = switch (_pos) do {
- case "full": {
- [_deviceName,"show"] call cse_fnc_setBottomBar_CC;
- if ([_deviceName] call cse_fnc_isSideBarOpen_CC) then {
- _fullScreenSideBar
- } else {
- _fullScreenNoSideBar
- };
- };
- default { /* includes hidden */
- [_deviceName,"hidden"] call cse_fnc_setBottomBar_CC;
- [0,0,0,0]
- };
-};
-if (_selected == "sidebar") then {
- _sideBarMapWidth = _sideBarWidth - 0.02;
- _sideBarMapHeight = ((_sideBarRatio select 3) / 12) * 2;
- _newPos = switch (_pos) do {
- case "top": {[(_sideBarRatio select 0) + 0.01 , (_settings select 1) + _navBarHeight + _sideBarMapWidth,_sideBarMapWidth, _sideBarMapHeight]};
- case "center": {[(_sideBarRatio select 0) + 0.01, (_settings select 1) + (_sideBarRatio select 3) - _sideBarMapWidth*2,_sideBarMapWidth, _sideBarMapHeight]};
- case "bottom": {[(_sideBarRatio select 0) + 0.01, (_settings select 1) + (_sideBarRatio select 3) - _sideBarMapWidth,_sideBarMapWidth, _sideBarMapHeight]};
- case "hidden": {[0,0,0,0]};
- default {[0,0,0,0]};
- };
- if (_pos == "invisable" || _pos == "visable") then {
- _newPos = ctrlPosition _ctrl;
- if (_pos == "invisable") then {
- _ctrl ctrlShow false;
- } else {
- _ctrl ctrlShow true;
- };
- };
-};
-_ctrl ctrlsetPosition _newPos;
-_ctrl ctrlCommit 0;
-_ctrl ctrlEnable true;
-if (_selected == "sidebar" && !(_pos == "visable" || _pos == "invisable" || _pos == "hidden")) then {
- if ([_deviceName] call cse_fnc_isSideBarOpen_CC) then {
- [_deviceName,"sidebar","visable"] call cse_fnc_setMap_CC;
- } else {
- [_deviceName,"sidebar","invisable"] call cse_fnc_setMap_CC;
- };
-};
-_ctrl
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setNavBar_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setNavBar_CC.sqf
deleted file mode 100644
index 402f494afd..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setNavBar_CC.sqf
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-private ["_deviceName","_settings","_display","_pos","_ctrl", "_moment", "_lastNumber"];
-_deviceName = _this select 0;
-_pos = _this select 1;
-_settings = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-_ctrl = (_display displayCtrl 3);
-
-_newPos = switch (_pos) do {
- case "top": {_settings};
- case "hidden": {[0,0,0,0]};
-};
-_ctrl ctrlsetPosition _newPos;
-_ctrl ctrlCommit 0;
-
-_allowsideBar = {
- private["_deviceName","_cfg","_allowSideBar"];
- _deviceName = _this select 0;
- _allowSidebar = 0;
- if (isnil 'CSE_REGISTERED_DEVICES_CC') then {
- CSE_REGISTERED_DEVICES_CC = [];
- };
-
- {
- if (_x select 0 == _deviceName) exitwith {
- _allowSidebar = _x select 2;
- };
- }foreach CSE_REGISTERED_DEVICES_CC;
- (_allowSidebar > 0)
-};
-
-if ([_deviceName] call _allowsideBar) then {
- _openSideBarCtrl = (_display displayCtrl 4);
- _openSideBarCtrl ctrlSetPosition [
- (_settings select 0) + (( _settings select 2) - (_settings select 3)),
- (_settings select 1),
- (_settings select 3),
- (_settings select 3)
- ];
- _openSideBarCtrl ctrlCommit 0;
- _openSideBarCtrl ctrlSetEventHandler ["ButtonClick", format["['%1','toggle'] call cse_fnc_setSideBar_CC;",_deviceName]];
-};
-
-_navBarIconHomeCtrl = (_display displayCtrl 199);
-_navBarIconHomeCtrl ctrlSetPosition [(_settings select 0),(_settings select 1),(_settings select 3),(_settings select 3)];
-_navBarIconHomeCtrl ctrlSetText "cse\cse_sys_cc\data\home_icon.paa";
-_navBarIconHomeCtrl ctrlCommit 0;
-
-(_display displayCtrl 198) ctrlSetPosition [(_settings select 0),(_settings select 1),(_settings select 3),(_settings select 3)];
-(_display displayCtrl 198) ctrlCommit 0;
-(_display displayCtrl 198) ctrlSetEventHandler ["ButtonClick", format["['%1','home'] call cse_fnc_openScreen_CC;",_deviceName]];
-
-_infoLabelCtrl = (_display displayCtrl 5);
-_infoLabelCtrl ctrlSetPosition [
- (_settings select 0),
- (_settings select 1),(_settings select 2) - (_settings select 3),(_settings select 3)
-];
-_infoLabelCtrl ctrlCommit 0;
-[_infoLabelCtrl] spawn {
- disableSerialization;
- _infoLabelCtrl = _this select 0;
- while {dialog} do {
- _lastNumber = date select 4;
- _moment = format["%1:%2",date select 3, _lastNumber];
- if (_lastNumber < 10) then {
- _moment = format["%1:0%2",date select 3, _lastNumber];
- };
- _infoLabelCtrl ctrlSetText _moment;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setOptionField_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setOptionField_CC.sqf
deleted file mode 100644
index 1acc9cb491..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setOptionField_CC.sqf
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * fn_setOptionField_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_pos","_ctrl","_options","_buttonHeightwithSpacing","_sideBarHeight","_buttonHeight","_buttonSpacing"];
-_deviceName = _this select 0;
-_pos = round(_this select 1);
-_options = _this select 2;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_sideBarRatio = [_deviceName] call cse_fnc_getSideBarRatio_CC;
-_navBarRatio = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-_maxPositions = (_settings select 3) / 0.05;
-_maxPositions = 12;
-
-_sideBarHeight = _sideBarRatio select 3;
-_buttonHeightwithSpacing = _sideBarHeight / _maxPositions;
-_buttonSpacing = _buttonHeightwithSpacing / 20;
-_buttonHeight = _buttonHeightwithSpacing - _buttonSpacing;
-
-_type = _options select 1;
-
-if (((_pos < 0) || _pos >= _maxPositions) && !(_type == "map")) exitwith {};
-
- disableSerialization;
- _display = uiNamespace getvariable _deviceName;
- _ctrlPosition = [(_sideBarRatio select 0) + 0.001, (_sideBarRatio select 1) + (_navBarRatio select 3)/ 1.5, (_sideBarRatio select 2) - 0.002, _buttonHeight];
- _ctrlPosition set[1, (_ctrlPosition select 1) + (_pos * (_buttonHeight + _buttonSpacing))+ 0.002];
- //_ctrlPosition set[2, 0.2];
- //_ctrlPosition set[3,0.04];
-
- _labelText = _options select 0;
-
- [_deviceName,_pos] call cse_fnc_removeOptionField_CC;
- _ctrl = [_deviceName,_type] call cse_fnc_getFirstAvailableOptionField_CC;
- _ctrl ctrlSetPosition _ctrlPosition;
- //_ctrl ctrlSetFontHeight _buttonHeight;
-
- switch (_type) do {
- case "label": {
- _ctrl ctrlSetText _labelText;
- };
- case "edit": {
- _ctrl ctrlSetText "";
- };
- case "drop": {
- private ["_index","_availableSelection"];
- _availableSelection = _options select 3;
- lbClear _ctrl;
- if (count _availableSelection > 0) then {
- _index = 0;
- {
- _ctrl lbadd (_x select 0);
- _ctrl lbSetData [_index, (_x select 1)];
- _index = _index + 1;
- }foreach _availableSelection;
- } else {
- //private ["_refill"];
- //_refill = getText ((_cfg select _i) >> "refill");
- //[_deviceName, _ctrl] call compile _refill;
- };
- _ctrl ctrlSetEventHandler ["LBSelChanged", format["['%1',_this] call %2;",_deviceName,compile (_options select 2)]];
- };
- case "button": {
- _ctrl ctrlSetText _labelText;
- _ctrl ctrlSetEventHandler ["ButtonClick", format["['%1',_this] call %2;",_deviceName,compile (_options select 2)]];
- };
- case "map": {
- [_deviceName,"sidebar","bottom"] call cse_fnc_setMap_CC;
- };
- default {};
- };
- _ctrl ctrlCommit 0;
-_ctrl
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPiP_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPiP_CC.sqf
deleted file mode 100644
index 3f4a671a8e..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPiP_CC.sqf
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * fn_setPiP_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_pos","_ctrl","_newPos"];
-_deviceName = _this select 0;
-_selected = _this select 1;
-_pos = _this select 2;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-
-_idc = switch (_selected) do {
- case "main": {20};
- case "sidebar": {21};
- default {20};
-};
-
-_ctrl = (_display displayCtrl _idc);
-
-_sideBarRatio = [_deviceName] call cse_fnc_getSideBarRatio_CC;
-_navBarRatio = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-_navBarHeight = _navBarRatio select 3;
-_sideBarWidth = _sideBarRatio select 2;
-
-
-_fullScreenSideBar = [_settings select 0,(_settings select 1) + _navBarHeight, (_settings select 2) - _sideBarWidth, (_settings select 3) - (_navBarHeight*2)];
-_fullScreenNoSideBar = [_settings select 0,(_settings select 1) + _navBarHeight, (_settings select 2), (_settings select 3) - (_navBarHeight*2)];
-
-_newPos = switch (_pos) do {
- case "full": {
- [_deviceName,"show"] call cse_fnc_setBottomBar_CC;
- if ([_deviceName] call cse_fnc_isSideBarOpen_CC) then {
- _fullScreenSideBar
- } else {
- _fullScreenNoSideBar
- };
- };
- default { /* includes hidden */
- [_deviceName,"hidden"] call cse_fnc_setBottomBar_CC;
- [0,0,0,0]
- };
-};
-if (_selected == "sidebar") then {
- _sideBarMapWidth = _sideBarWidth - 0.02;
- _sideBarMapHeight = ((_sideBarRatio select 3) / 12) * 2;
- _newPos = switch (_pos) do {
- case "top": {[(_sideBarRatio select 0) + 0.01 , (_settings select 1) + _navBarHeight + _sideBarMapWidth,_sideBarMapWidth, _sideBarMapHeight]};
- case "center": {[(_sideBarRatio select 0) + 0.01, (_settings select 1) + (_sideBarRatio select 3) - _sideBarMapWidth*2,_sideBarMapWidth, _sideBarMapHeight]};
- case "bottom": {[(_sideBarRatio select 0) + 0.01, (_settings select 1) + (_sideBarRatio select 3) - _sideBarMapWidth,_sideBarMapWidth, _sideBarMapHeight]};
- case "hidden": {[0,0,0,0]};
- default {[0,0,0,0]};
- };
- if (_pos == "invisable" || _pos == "visable") then {
- _newPos = ctrlPosition _ctrl;
- if (_pos == "invisable") then {
- _ctrl ctrlShow false;
- } else {
- _ctrl ctrlShow true;
- };
- };
-};
-_ctrl ctrlsetPosition _newPos;
-_ctrl ctrlCommit 0;
-_ctrl ctrlEnable true;
-
-if (_selected == "sidebar" && !(_pos == "visable" || _pos == "invisable" || _pos == "hidden")) then {
- if ([_deviceName] call cse_fnc_isSideBarOpen_CC) then {
- [_deviceName,"sidebar","visable"] call cse_fnc_setPiP_CC;
- } else {
- [_deviceName,"sidebar","invisable"] call cse_fnc_setPiP_CC;
- };
-};
-_ctrl
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPopUpMenu_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPopUpMenu_CC.sqf
deleted file mode 100644
index e16ac1f669..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPopUpMenu_CC.sqf
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * fn_setPopUpMenu_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_toggle","_deviceName","_position","_display","_backGroundCtrl"];
-_deviceName = _this select 0;
-_toggle = _this select 1;
-
-
-//if (([_deviceName] call cse_fnc_isPopUpOpen_CC) && _toggle == "open") exitwith { };
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-_backGroundCtrl = (_display displayCtrl 150);
-_headerCtrl = (_display displayCtrl 151);
-_headerTitle = (_display displayCtrl 152);
-
-_buttonClose = (_display displayCtrl 154);
-_buttonAccept = (_display displayCtrl 153);
-if (_toggle == "open") then {
- disableSerialization;
-
- //_navBarSettings = [_deviceName] call cse_fnc_getNavBarRatio_CC;
- if ([_deviceName] call cse_fnc_isSideBarOpen_CC) then {
- [_deviceName,"hidden"] call cse_fnc_setSideBar_CC;
- };
- (_display displayCtrl 10) ctrlEnable false;
-
- _settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
- _spacingSide = (_settings select 2) / 10;
- _spacingTop = (_settings select 3) / 10;
- _widthOfPopUp = ((_settings select 2)) - (_spacingSide * 2);
- _heightOfPopUp = ((_settings select 3)) - (_spacingTop * 2);
-
- _newPos = [(_settings select 0) + _spacingSide, (_settings select 1) + _spacingTop,_widthOfPopUp, _heightOfPopUp];
- _backGroundCtrl ctrlSetPosition _newPos;
- _backGroundCtrl ctrlCommit 0;
-
- _newPos set [3,_heightOfPopUp / 10];
- _headerCtrl ctrlSetPosition _newPos;
- _headerCtrl ctrlCommit 0;
-
- _headerTitle ctrlSetPosition _newPos;
- _headerTitle ctrlCommit 0;
-
- _newPos set [1, (_newPos select 1) + (_heightOfPopUp - (_heightOfPopUp / 10))];
- _newPos set [2, (_newPos select 2) / 2];
- _buttonClose ctrlSetPosition _newPos;
- _buttonClose ctrlCommit 0;
-
- _newPos set [0, (_newPos select 0) + (_newPos select 2)];
- _buttonAccept ctrlSetPosition _newPos;
- _buttonAccept ctrlCommit 0;
-
- _title = _this select 2;
- if (isnil "_title") then {
- _title = "";
- };
- if (typeName _title != typeName "") then {
- _title = "";
- };
- ctrlSetText[152,_title];
-
-
- _buttonClose ctrlSetEventHandler ["ButtonClick", format["['%1','close'] call cse_fnc_setPopUpMenu_CC",_deviceName]];
-
- _onAccept = (_this select 3);
- if (isnil "_onAccept") then {
- _onAccept = "";
- };
- if (typeName _onAccept != typeName "") then {
- _onAccept = "";
- };
- _buttonAccept ctrlSetEventHandler ["ButtonClick", format["(['%1'] call cse_fnc_popUpAccept_CC) call %2; ['%1','close'] call cse_fnc_setPopUpMenu_CC;",_deviceName,compile _onAccept]];
-
- [_deviceName, (_display displayCtrl 10)] spawn {
- waituntil {!([_this select 0] call cse_fnc_isPopUpOpen_CC)};
- (_this select 1) ctrlEnable true;
- };
-} else {
- _newPos = [0,0,0,0];
- _backGroundCtrl ctrlSetPosition _newPos;
- _backGroundCtrl ctrlCommit 0;
- _headerCtrl ctrlSetPosition _newPos;
- _headerCtrl ctrlCommit 0;
- _headerTitle ctrlSetPosition _newPos;
- _headerTitle ctrlCommit 0;
-
- _buttonClose ctrlSetPosition _newPos;
- _buttonClose ctrlCommit 0;
-
- _buttonAccept ctrlSetPosition _newPos;
- _buttonAccept ctrlCommit 0;
- ctrlSetText[152,""];
- [_deviceName,[]] call cse_fnc_setPopUpOptions_CC;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPopUpOptions_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPopUpOptions_CC.sqf
deleted file mode 100644
index a655ab3ba6..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setPopUpOptions_CC.sqf
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * fn_setPopUpOptions_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_IDC_LABEL 242
-#define START_IDC_COMBO 250
-#define START_IDC_BTN 260
-#define START_IDC_LIST 280
-#define START_IDC_INPUT 270
-
-private["_deviceName","_options","_display","_settings","_spacingSide", "_spacingTop","_positionLeft","_positionRight","_widthOfPopUp","_heightOfPopUp","_ctrl","_ctrlInput", "_select"];
-_deviceName = _this select 0;
-_options = _this select 1;
-
-_settings = ([_deviceName] call cse_fnc_getDeviceSettings_CC);
-_spacingSide = (_settings select 2) / 10;
-_spacingTop = (_settings select 3) / 10;
-_widthOfPopUp = ((_settings select 2)) - (_spacingSide * 2);
-_heightOfPopUp = ((_settings select 3)) - (_spacingTop * 2);
-
-_positionLeft = [(_settings select 0) + _spacingSide + 0.01, (_settings select 1) + _spacingTop + (_heightOfPopUp / 10),(_widthOfPopUp / 2) - 0.02, _heightOfPopUp / 10];
-_positionRight = [(_settings select 0) + _spacingSide + 0.01 + (_widthOfPopUp / 2), (_settings select 1) + _spacingTop + (_heightOfPopUp / 10),(_widthOfPopUp / 2) - 0.02, _heightOfPopUp / 10];
-
-_increasePerTime = (_heightOfPopUp / 10) + 0.01;
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-
-_ctrlBtn = START_IDC_BTN;
-_ctrlLbl = START_IDC_LABEL;
-_ctrlCmbo = START_IDC_COMBO;
-_ctrlInput = START_IDC_INPUT;
-
-{
- _idc = _x;
- for [{_x=_idc},{_x< (_idc + 10)},{_x=_x+1}] do {
- _ctrl = (_display displayCtrl _x);
- _ctrl ctrlSetPosition [100,100,0.1,0.1]; /* Cannot use 0 for editfields */
- _ctrl ctrlCommit 0;
- };
-}foreach [START_IDC_BTN,START_IDC_LABEL,START_IDC_COMBO,START_IDC_INPUT];
-
-CSE_POP_UP_OPTIONS_CC = +_options;
-{
- _name = _x select 0;
- _type = _x select 1;
- _action = _x select 2;
-
- switch (_type) do {
- case "btn": {
- _ctrlRight = (_display displayCtrl _ctrlBtn);
- _ctrlRight ctrlSetPosition _positionRight;
- _ctrlRight ctrlSetText _name;
- _ctrlRight ctrlCommit 0;
- _positionLeft set [ 1, (_positionLeft select 1)+_increasePerTime];
- _positionRight set [ 1, (_positionRight select 1)+_increasePerTime];
- _ctrlBtn = _ctrlBtn + 1;
- };
- case "label": {
- _ctrlRight = (_display displayCtrl _ctrlLbl);
- _ctrlRight ctrlSetPosition _positionRight;
- _ctrlRight ctrlSetText (toUpper _name);
- _ctrlRight ctrlCommit 0;
-
- _positionLeft set [ 1, (_positionLeft select 1)+_increasePerTime];
- _positionRight set [ 1, (_positionRight select 1)+_increasePerTime];
- _ctrlLbl = _ctrlLbl + 1;
- };
- case "combo": {
- private ["_content"];
- _ctrlRight = (_display displayCtrl _ctrlCmbo);
- _ctrlRight ctrlSetPosition _positionRight;
- _ctrlRight ctrlCommit 0;
- _content = (_x select 3);
- _select = -1;
- if (count _x > 3) then {
- _select = _x select 4;
- [format["_select %1",_select]] call cse_fnc_debug;
- };
- if (isnil "_content") then {
- _content = [];
- };
- if (typeName _content != typeName []) then {
- _content = [];
- };
- lbClear _ctrlCmbo;
- {
- _ctrlRight lbadd format["%1",_x];
- }foreach _content;
- if (_select >= 0) then {
- _ctrlRight lbSetCurSel _select;
- };
- _ctrlLeft = (_display displayCtrl _ctrlLbl);
- _ctrlLeft ctrlSetPosition _positionLeft;
- _ctrlLeft ctrlSetText (toUpper _name);
- _ctrlLeft ctrlCommit 0;
-
- _positionLeft set [ 1, (_positionLeft select 1)+_increasePerTime];
- _positionRight set [ 1, (_positionRight select 1)+_increasePerTime];
- _ctrlCmbo = _ctrlCmbo + 1;
- _ctrlLbl = _ctrlLbl + 1;
- };
-
- case "input": {
- _ctrlRight = (_display displayCtrl _ctrlInput);
- _ctrlRight ctrlSetPosition _positionRight;
- if (count _x > 3) then {
- _ctrlRight ctrlSetText (_x select 3);
- } else {
- _ctrlRight ctrlSetText "";
- };
- _ctrlRight ctrlCommit 0;
-
- _ctrlLeft = (_display displayCtrl _ctrlLbl);
- _ctrlLeft ctrlSetPosition _positionLeft;
- _ctrlLeft ctrlSetText (toUpper _name);
- _ctrlLeft ctrlCommit 0;
-
- _positionLeft set [ 1, (_positionLeft select 1)+_increasePerTime];
- _positionRight set [ 1, (_positionRight select 1)+_increasePerTime];
- _ctrlInput = _ctrlInput + 1;
- _ctrlLbl = _ctrlLbl + 1;
- };
- default {};
- };
-
-}foreach _options;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setProgramIcons_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setProgramIcons_CC.sqf
deleted file mode 100644
index d0abef88f3..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setProgramIcons_CC.sqf
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * fn_setProgramIcons_CC.sqf
- * @Descr: Set the program or Application icons on the desktop of a cC device.
- * @Author: Glowbal
- *
- * @Arguments: [deviceName STRING (the classname of the device)]
- * @Return: nil
- * @PublicAPI: false
- */
-
-#define AVAILABLE_ICONS [100,101,102,103,104,105,106,107,108,109,110,111,112]
-#define ICON_WIDTH 0.05
-#define ICON_HEIGHT ICON_WIDTH
-
-private ["_deviceName","_settings","_display","_pos","_ctrl","_newPos","_cfg","_availablePrograms","_displayName","_iconWidth","_startingPos","_maxIconsOnWidth","_currentIconN","_ctrlButton","_ctrlLabel", "_devices"];
-_deviceName = _this select 0;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-
-_availablePrograms = [];
-if (isnil 'CSE_REGISTERED_APPLICATIONS_CC') then {
- CSE_REGISTERED_APPLICATIONS_CC = [];
-};
-
-// Collect all applications that will be displayed on the Desktop and are available for the device.
-{
- // Check if application is hidden (such as main). 0 = show, 1 = hidden.
- if ((_x select 3) == 0) then {
- _devices = _x select 7;
-
- // Check if the device Classname matches any entry in the devices list, to ensure the application is registered for this device.
- if (_deviceName in _devices || "All" in _devices) then {
- // store the: Name, Icon, displayName.
- _option = [_x select 0,_x select 2,_x select 1];
- _availablePrograms pushback _option;
- } else {
- [format["Application %1 is not registered on device %2 | %3", (_x select 0), _deviceName, _devices],3] call cse_fnc_debug;
- };
- };
-}foreach CSE_REGISTERED_APPLICATIONS_CC;
-
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-if (isnil "_display") exitwith {}; // error
-if (isNull _display) exitwith {}; // error
-
-// Set all desktop icons in normal state
-{
- (_display displayCtrl _x) ctrlSetPosition [0,0,0,0];
- (_display displayCtrl _x) ctrlCommit 0;
- (_display displayCtrl (_x + 20)) ctrlSetPosition [0,0,0,0];
- (_display displayCtrl (_x + 20)) ctrlCommit 0;
-}foreach AVAILABLE_ICONS;
-
-// Calculate height width and placement for icons.
-_iconWidth = (_settings select 3) / 10;
-_iconHeight = _iconWidth;
-_startingPos = [(_settings select 0) + (_iconWidth / 4),(_settings select 1) + ((_settings select 3) / 13) + (_iconHeight / 2),_iconHeight,_iconWidth];
-_maxIconsOnWidth = round(((_settings select 2) / _iconWidth) - 1);
-_currentIconN = 1;
-
-{
- // To ensure that we won't accidently try to place down more icons as available.
- if (_foreachIndex < count AVAILABLE_ICONS) then {
- _name = _x select 0;
- _icon = _x select 1;
- _displayName = _x select 2;
-
- // Set icon on correct position.
- _ctrl = (_display displayCtrl (AVAILABLE_ICONS select _foreachIndex));
- _ctrl ctrlSetPosition _startingPos;
- _ctrl ctrlSetText _icon;
- _ctrl ctrlCommit 0;
-
- // Set the button on the correct position with ButtonClick eventhandler.
- _ctrlButton = (_display displayCtrl ((AVAILABLE_ICONS select _foreachIndex) + 20));
- _ctrlButton ctrlSetPosition _startingPos;
- _ctrlButton ctrlCommit 0;
- _ctrlButton ctrlSetEventHandler ["ButtonClick", format["['%1','%2'] call cse_fnc_openScreen_CC",_deviceName,_name]];
-
- // Setting the label underneat the button/icon.
- _ctrlLabel = (_display displayCtrl ((AVAILABLE_ICONS select _foreachIndex) + 40));
- _ctrlLabel ctrlSetPosition [_startingPos select 0, (_startingPos select 1) + (_iconHeight / 1.31), _iconHeight, 0.03];
- _ctrlLabel ctrlSetText format["%1",_displayName];
- _ctrlLabel ctrlSetFontHeight (_iconHeight * 0.35);
- _ctrlLabel ctrlCommit 0;
-
- // calculate position for next icon.
- _startingPos set[0,(_startingPos select 0) + _iconWidth + 0.005];
-
- // Start next row of icons.
- if ((_foreachIndex+1) % _maxIconsOnWidth == 0) then {
- _startingPos set[0,(_startingPos select 0) - (_iconWidth + 0.005) * _maxIconsOnWidth];
- _startingPos set[1,(_startingPos select 1) + (_iconWidth * 1.1)];
- };
- };
-}foreach _availablePrograms;
-
-nil;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setSideBar_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setSideBar_CC.sqf
deleted file mode 100644
index 7b89ebaa90..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setSideBar_CC.sqf
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * fn_setSideBar_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_pos","_ctrl"];
-_deviceName = _this select 0;
-_pos = _this select 1;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_display = uiNamespace getvariable _deviceName;
-
-if (count (call cse_fnc_getSideBarOptionFields_CC) < 1) then {
- _pos = "hidden";
-};
-
-if (_pos == 'toggle') then {
- if ((ctrlPosition ((_display displayCtrl 2)) select 0 == 0) &&
- ((ctrlPosition (_display displayCtrl 2)) select 1 == 0) && (ctrlPosition ((_display displayCtrl 2)) select 2 == 0) && (ctrlPosition ((_display displayCtrl 2)) select 3 == 0)) then {
- _pos = "right";
- } else {
- _pos = "hidden";
- };
-};
-disableSerialization;
-
-_ctrl = (_display displayCtrl 2);
-_newPos = switch (_pos) do {
- //case "left": {[_settings select 0, _settings select 1, (_settings select 2) / 4.5, _settings select 3]};
- case "right": {[_deviceName] call cse_fnc_getSideBarRatio_CC};
- case "hidden": {[0,0,0,0]};
- default {[0,0,0,0]};
-};
-
-
-_ctrl ctrlsetPosition _newPos;
-_ctrl ctrlCommit 0;
-
-
-for [{_i=0},{_i < 20},{_i=_i+1}] do {
- [_deviceName,_i] call cse_fnc_removeOptionField_CC;
-};
-
-if (_pos != "hidden") then {
- {
- _args = [_deviceName] + _x;
- _args call cse_fnc_setOptionField_CC;
- }foreach (call cse_fnc_getSideBarOptionFields_CC);
- [_deviceName,"hidden"] spawn cse_fnc_setPopUpMenu_CC;
- if ([_deviceName,"sidebar"] call cse_fnc_isMapOpen_CC) then {
- if (call cse_fnc_sideBarHasMap_CC) then {
- [_deviceName,"sidebar","visable"] call cse_fnc_setMap_CC;
- } else {
- [_deviceName,"sidebar","hidden"] call cse_fnc_setMap_CC;
- };
- };
-} else {
-
- if ([_deviceName,"sidebar"] call cse_fnc_isMapOpen_CC) then {
- [_deviceName,"sidebar","invisable"] call cse_fnc_setMap_CC;
- };
-};
-if ([_deviceName,"main"] call cse_fnc_isMapOpen_CC) then {
- [_deviceName,"main","full"] call cse_fnc_setMap_CC;
-};
-if ([_deviceName,"main"] call cse_fnc_isPiPOpen_CC) then {
- [_deviceName,"main","full"] call cse_fnc_setPiP_CC;
-};
-if ([_deviceName] call cse_fnc_isSelectMenuOpen_CC) exitwith {
- [_deviceName] call cse_fnc_removeSelectMenu_CC;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setTitle_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setTitle_CC.sqf
deleted file mode 100644
index 139597f9cb..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_setTitle_CC.sqf
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_showLoadingScreen_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_showLoadingScreen_CC.sqf
deleted file mode 100644
index e11187c6cf..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_showLoadingScreen_CC.sqf
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-_deviceName = _this select 0;
-_showTime = _this select 1;
-
-disableSerialization;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_display = uiNamespace getvariable _deviceName;
-_navBarRatio = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-_navBarHeight = _navBarRatio select 3;
-_heightOfLB = (_settings select 3) - (_navBarHeight*2)/2;
-
-_barPosition = [(_settings select 0) + ((_settings select 2) / 4),(_settings select 1) + ((_settings select 3) / 2) - (_navBarHeight/2) , (_settings select 2) / 2, _navBarHeight];
-_labelPosition = [(_settings select 0) + ((_settings select 2) / 4),(_settings select 1) + ((_settings select 3) / 2) - (_navBarHeight * 1.5) , (_settings select 2) / 2, _navBarHeight];
-
-
-_background = _display displayCtrl 607;
-_bar = _display displayCtrl 606;
-_label = _display displayCtrl 608;
-
-_background ctrlSetPosition _settings;
-_background ctrlSetBackgroundColor [0.8,0.8,0.8,1];
-_background ctrlCommit 0;
-
-_loadingText = "LOADING";
-_label ctrlSetText _loadingText;
-_label ctrlSetPosition _labelPosition;
-_label ctrlCommit 0;
-
-_bar ctrlSetPosition _barPosition;
-_bar ctrlCommit 0;
-
-_newStatus = 0;
-_toSleep = (1 / _showTime) / 20;
-_start = time;
-_numOfDots = 0;
-_runs = 0;
-
-while {(_newStatus <= 1.00 && !(isNull _display))} do {
- uisleep 0.01;
- _bar progressSetPosition _newStatus;
- _newStatus = _newStatus + _toSleep;
- if (_runs >= 30) then {
- _runs = 0;
- if (_loadingText == "LOADING") then {
- _loadingText = "PLEASE WAIT";
- } else {
- _loadingText = "LOADING";
- };
- _label ctrlSetText _loadingText;
- } else {
- _runs = _runs + 1;
- };
-};
-
-uisleep 0.5;
-if !(isNull _display) then {
- _background ctrlSetPosition [0,0,0,0];
- _background ctrlCommit 0;
-
- _bar ctrlSetPosition [0,0,0,0];
- _bar ctrlCommit 0;
-
- _label ctrlSetText "";
- _label ctrlSetPosition [0,0,0,0];
- _label ctrlCommit 0;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_sideBarHasMap_CC.sqf b/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_sideBarHasMap_CC.sqf
deleted file mode 100644
index 59e44203a3..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletResources/functions/fn_sideBarHasMap_CC.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_sideBarHasMap_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_currentApp","_cfg","_hasMap","_return"];
-//_currentApp = call cse_fnc_getCurrentApplication_CC;
-_return = false;
-/*_cfg = (missionConfigFile >> "Combat_Space_Enhancement" >> "command_and_control" >> "applications" >> _currentApp >> "sideBar");
-_hasMap = 0;
-if (isClass _cfg) then {
- for [{_i=0},{_i < (count _cfg)},{_i=_i+1}] do {
- if (isClass (_cfg select _i)) then {
- private ["_type"];
- _type = getText ((_cfg select _i) >> "type");
- if (_type == "map") then {
- _hasMap = _hasMap + 1;
- };
- };
- };
-};
-
-if (_hasMap > 0) then {
- _return = true;
-};*/
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_cc_app_CC.sqf b/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_cc_app_CC.sqf
deleted file mode 100644
index 47d3499dae..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_cc_app_CC.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * fn_openScreen_cc_app_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-//_this spawn {
- //[_deviceName] call cse_fnc_clearDeviceScreen_CC;
- private ["_deviceName"];
- _deviceName = _this select 0;
- [_deviceName,"main","full"] call cse_fnc_setMap_CC;
-
- if (isnil "CSE_CURRENT_SELECTED_FILTER_CC_APP_CC") then {
- CSE_CURRENT_SELECTED_FILTER_CC_APP_CC = -1;
- CSE_TOGGLE_ROUTE_LAYER_CC = false;
- CSE_TOGGLE_INTEL_LAYER_CC = false;
- CSE_TOGGLE_CALLSIGNS_CC = false;
- CSE_SELECTED_ICON_CC = "";
- };
-
diff --git a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_home_CC.sqf b/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_home_CC.sqf
deleted file mode 100644
index 9b4b271dd1..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_home_CC.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_openScreen_home_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display"];
-_deviceName = _this select 0;
-
-[_deviceName] call cse_fnc_clearDeviceScreen_CC;
-[_deviceName,"full"] call cse_fnc_setBackground_CC;
-[_deviceName,"top"] call cse_fnc_setNavBar_CC;
-[_deviceName,"hidden"] call cse_fnc_setSideBar_CC;
-[_deviceName,"hidden"] call cse_fnc_setBottomBar_CC;
-[_deviceName] call cse_fnc_setProgramIcons_CC;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_liveFeed_app_CC.sqf b/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_liveFeed_app_CC.sqf
deleted file mode 100644
index 0071c659c4..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_liveFeed_app_CC.sqf
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * fn_openScreen_liveFeed_app_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName", "_allAvailableFeeds"];
-_deviceName = _this select 0;
-
-disableSerialization;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_display = uiNamespace getvariable _deviceName;
-
-_background = _display displayCtrl 602;
-_listBox = _display displayCtrl 601;
-
-_sideBarRatio = [_deviceName] call cse_fnc_getSideBarRatio_CC;
-_navBarRatio = [_deviceName] call cse_fnc_getNavBarRatio_CC;
-_navBarHeight = _navBarRatio select 3;
-_sideBarWidth = _sideBarRatio select 2;
-_heightOfLB = (_settings select 3) - (_navBarHeight*2)/2;
-
-_fullBackground = [_settings select 0,(_settings select 1) + _navBarHeight, (_settings select 2), (_heightOfLB/4)*1.01];
-_background ctrlSetPosition _fullBackground;
-_background ctrlSetBackgroundColor [0.9,0.9,0.9,1];
-_background ctrlCommit 0;
-
-_listBoxPosition = [_settings select 0,(_settings select 1) + _navBarHeight + (_heightOfLB/4), (_settings select 2), ((_heightOfLB)/4)*3];
-_listBox ctrlSetPosition _listBoxPosition;
-_listBox ctrlEnable false;
-_listBox ctrlEnable true;
-_listBox ctrlCommit 0;
-
-_listBox ctrlSetEventHandler ["MouseButtonDblClick", "
- [_this] call cse_fnc_debug;
- _lb = _this select 0;
- _currentSelection = lbCurSel _lb;
- if (_currentSelection >= 0) then {
- _targetArray = CSE_ALL_AVAILABLE_LIVE_FEEDS_AT_MOMENT_CC select _currentSelection;
- _target = _targetArray select 1 select 0;
- [_target] call cse_fnc_setLiveFeedTargetObj_CC;
-
- _lb ctrlSetPosition [0,0,0,0];
- _lb ctrlCommit 0;
- _lb ctrlEnable false;
- [[] call cse_fnc_getCurrentDeviceName_CC] call cse_fnc_openScreen_liveFeed_CC;
- };
-"];
-
-lbclear 601;
-_allAvailableFeeds = [_deviceName] call cse_fnc_getAllViewableFeeds_CC;
-CSE_ALL_AVAILABLE_LIVE_FEEDS_AT_MOMENT_CC = _allAvailableFeeds;
-{
- lbadd [601, (_x select 0)];
- //lbSetData [601, _foreachIndex, str ((_x select 1) select 0)];
-}foreach _allAvailableFeeds;
-
-ctrlSetFocus _listBox;
-_listBox lbSetCurSel 0;
-(_display displayCtrl 603) ctrlSetPosition [_settings select 0,(_settings select 1) + _navBarHeight, (_settings select 2), _navBarHeight];
-(_display displayCtrl 604) ctrlSetPosition [_settings select 0,(_settings select 1) + _navBarHeight + _navBarHeight, (_settings select 2), (_heightOfLB/4)*1.01 - _navBarHeight];
-
-(_display displayCtrl 603) ctrlSetText "TACNET";
-(_display displayCtrl 604) ctrlSetText "Select an feed in the list below. To view the feed, double click on the item.";
-
-
-(_display displayCtrl 603) ctrlCommit 0;
-(_display displayCtrl 604) ctrlCommit 0;
-(_display displayCtrl 604) ctrlEnable false;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_login_CC.sqf b/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_login_CC.sqf
deleted file mode 100644
index 66bf7d109c..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_login_CC.sqf
+++ /dev/null
@@ -1,6 +0,0 @@
-private ["_deviceName"];
-_deviceName = _this select 0;
-hint 'you are required to log in';
-
-[_deviceName,"open","login"] spawn cse_fnc_setPopUpMenu_CC;
-
diff --git a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_notepad_CC.sqf b/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_notepad_CC.sqf
deleted file mode 100644
index 139597f9cb..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_notepad_CC.sqf
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_settings_CC.sqf b/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_settings_CC.sqf
deleted file mode 100644
index 59e3287617..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_settings_CC.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_openScreen_settings_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName"];
-_deviceName = _this select 0;
-[_deviceName] call cse_fnc_clearDeviceScreen_CC;
-[_deviceName,"full","black"] call cse_fnc_setBackground_CC;
-[_deviceName,"top"] call cse_fnc_setNavBar_CC;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_startUp_CC.sqf b/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_startUp_CC.sqf
deleted file mode 100644
index 139597f9cb..0000000000
--- a/TO_MERGE/cse/sys_cc/tabletScreens/functions/fn_openScreen_startUp_CC.sqf
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_clearDeviceScreen_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_clearDeviceScreen_CC.sqf
deleted file mode 100644
index 00886bd2c2..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_clearDeviceScreen_CC.sqf
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * fn_clearDeviceScreen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_cfg","_display","_excludeIDCs"];
-_deviceName = _this select 0;
-_cfg = (MissionconfigFile >> _deviceName >> "controls");
-if (!isClass _cfg) then {
- _cfg = (configFile >> _deviceName >> "controls");
-};
-disableSerialization;
-_display = uiNamespace getvariable _deviceName;
-
-(_display displayCtrl 10) ctrlEnable true;
-
-_excludeIDCs = [-1,0,1,2,3,4,5,6, 606, 607, 608];
-if (isClass _cfg) then {
- for [{_i=0},{_i < count _cfg},{_i=_i+1}] do {
- if (isClass (_cfg select _i)) then {
- private ["_idc","_ctrl"];
- _idc = getNumber ((_cfg select _i) >> "idc");
- if (!(_idc in _excludeIDCs)) then {
- _ctrl = (_display displayCtrl _idc);
-
- //_Ctrl ctrlShow false;
- if (_idc == 601) then {
- _Ctrl ctrlSetPosition [100,100,0.1,0.1]; // lb cannot go for wierd dimensions?
- } else {
- if (_idc > 269 && _idc < 280) then {
- _Ctrl ctrlSetPosition [100,100,0.1,0.1];
- } else {
- _ctrl ctrlSetPosition [0,0,0,0];
- };
- };
- _ctrl ctrlCommit 0;
- };
-
- };
- };
-};
-
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_clickedOnMap_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_clickedOnMap_CC.sqf
deleted file mode 100644
index 80a94d6ac4..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_clickedOnMap_CC.sqf
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-fnc_clickedOnMap.sqf
-Usage: Displays CC Pop-up menu selection
-Author: Glowbal
-
-Arguments: array [position (ARRAY)]
- 0: Position 2D. Format [ X, Y ]
-Returns: void
-
-Affects: Local
-Executes: Local. Default execution when clicked on map in CC App.
-
-Example:
- [0,0] call cse_fnc_clickedOnMap_CC;
-
-*/
-
-private ["_position","_buttonWidth","_nearest","_found","_posTrackerIcon","_text","_ctrlBtn","_lastIDC","_deviceName","_settings","_sideBarRatio","_navBarRatio","_maxPositions","_sideBarHeight","_buttonHeightwithSpacing","_buttonSpacing","_buttonHeight","_display","_optionsPos"];
-//_args = _this;
-_position = [_this, 0, [0,0], [[]],2] call BIS_fnc_param;
-
-[format["fnc_clickedOnMap %1", _this]] call cse_fnc_debug;
-if (typeName _position != typeName []) exitwith {};
-disableSerialization;
-_deviceName = call cse_fnc_getCurrentDeviceName_CC;
-if (_deviceName == "") exitwith {};
-
-if ([_deviceName] call cse_fnc_isSelectMenuOpen_CC) exitwith {
- [_deviceName] call cse_fnc_removeSelectMenu_CC;
-};
-_optionsPos = [(_position select 0), _position select 1];
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_sideBarRatio = [_deviceName] call cse_fnc_getSideBarRatio_CC;
-_maxPositions = (_settings select 3) / 0.05;
-_maxPositions = 12;
-
-_sideBarHeight = _sideBarRatio select 3;
-_buttonHeightwithSpacing = _sideBarHeight / _maxPositions;
-_buttonSpacing = _buttonHeightwithSpacing / 10;
-_buttonHeight = _buttonHeightwithSpacing - _buttonSpacing;
-_buttonWidth = (_sideBarRatio select 2) - 0.002;
- _display = uiNamespace getvariable _deviceName;
-
-(_display displayCtrl 10) ctrlEnable false;
-_position = (_display displayCtrl 10) ctrlMapScreenToWorld _position;
-_position set [2, 0];
-
-if ((_optionsPos select 0) + _buttonWidth > ((_settings select 0) + (_settings select 2))) then {
- _buttonWidth = _buttonWidth - (((_optionsPos select 0) + _buttonWidth - ((_settings select 0) + (_settings select 2))));
-};
-_optionsPos set[2, _buttonWidth];
-_optionsPos set[3,_buttonHeight];
-_lastIDC = 260;
-_nearest = 25;
-_found = [];
-{
- _side = _x select 6;
- if (([_deviceName] call cse_fnc_getDeviceSide_CC) == _side) then {
- _posTrackerIcon = +(_x select 1);
- _posTrackerIcon set [2, 0];
- if ((_posTrackerIcon distance _position) < _nearest) then {
- _nearest = _posTrackerIcon distance _position;
- _found = _x;
- };
- };
-}foreach CSE_TRACKER_ICONS;
-
-
-
-_foudIntelMarker = [];
-if (CSE_TOGGLE_INTEL_LAYER_CC) then {
- _nearest = 25;
- {
- _side =(_x select 3);
- if (([_deviceName] call cse_fnc_getDeviceSide_CC) == _side) then {
- _pos = (_x select 0);
- if ((_pos distance _position) < _nearest) then {
- _nearest = _pos distance _position;
- _foudIntelMarker = _x;
- };
- };
- }foreach CSE_INTEL_MARKER_COLLECTION_CC;
-};
-
-_foudRouteMarker = [];
-if (CSE_TOGGLE_ROUTE_LAYER_CC) then {
- _nearest = 25;
- {
- _side =(_x select 3);
- if (([_deviceName] call cse_fnc_getDeviceSide_CC) == _side) then {
- _pos = (_x select 0);
- if ((_pos distance _position) < _nearest) then {
- _nearest = _pos distance _position;
- _foudRouteMarker = _x;
- };
- };
- }foreach CSE_ROUTE_MARKER_COLLECTION_CC;
-};
-/*
-if (isnil "CSE_CLICKED_ON_MAP_OPTIONS_CC") then {
- CSE_CLICKED_ON_MAP_OPTIONS_CC = [];
-};
-
-{
- if ([_found, _foudIntelMarker, _foudRouteMarker] call (_x select 0)) then {
- _text =[_found, _foudIntelMarker, _foudRouteMarker] call (_x select 1);
- _formattedCode = [_found, _foudIntelMarker, _foudRouteMarker] call (_x select 2);
-
- _ctrlBtn = (_display displayCtrl _lastIDC);
- _ctrlBtn ctrlSetPosition _optionsPos;
- _ctrlBtn ctrlSetText _text;
- _CtrlBtn ctrlSetEventHandler ["ButtonClick", format[_formattedCode, _position,_deviceName]];
- _ctrlBtn ctrlCommit 0;
- _lastIDC = _lastIDC + 1;
- _optionsPos set[1, (_optionsPos select 1) + (_buttonHeight)];
- };
-}foreach CSE_CLICKED_ON_MAP_OPTIONS_CC;*/
-
-if !(_found isEqualTo []) then {
- _ctrlBtn = (_display displayCtrl _lastIDC);
- _ctrlBtn ctrlSetPosition _optionsPos;
- _text = _found select 2;
- if (_text == "") then {
- _text = "icon";
- };
- CSE_CLICKED_ON_MAP_FOUND_CC = _found;
- _ctrlBtn ctrlSetText format["Select: %1",_text];
- _CtrlBtn ctrlSetEventHandler ["ButtonClick", format["['%2'] call cse_fnc_removeSelectMenu_CC; ['%2',%1] call cse_fnc_openIconSelectMenu_CC;", _position,_deviceName]];
- _ctrlBtn ctrlCommit 0;
- _lastIDC = _lastIDC + 1;
- _optionsPos set[1, (_optionsPos select 1) + (_buttonHeight)];
-};
-
-if (true) then {
- _ctrlBtn = (_display displayCtrl _lastIDC);
- _ctrlBtn ctrlSetPosition _optionsPos;
- _ctrlBtn ctrlSetText "SALUTE Report";
- _CtrlBtn ctrlSetEventHandler ["ButtonClick", format["['%2'] call cse_fnc_removeSelectMenu_CC; ['%2',%1] call cse_fnc_openIntelMarkersMenu_CC;", _position,_deviceName]];
- _ctrlBtn ctrlCommit 0;
- _lastIDC = _lastIDC + 1;
- _optionsPos set[1, (_optionsPos select 1) + (_buttonHeight)];
-};
-
-if (true) then {
- _ctrlBtn = (_display displayCtrl _lastIDC);
- _ctrlBtn ctrlSetPosition _optionsPos;
- _ctrlBtn ctrlSetText "Route Planning";
- _CtrlBtn ctrlSetEventHandler ["ButtonClick", format["['%2'] call cse_fnc_removeSelectMenu_CC; ['%2',%1] call cse_fnc_openRouteMarkersMenu_CC;", _position,_deviceName]];
- _ctrlBtn ctrlCommit 0;
- _lastIDC = _lastIDC + 1;
- _optionsPos set[1, (_optionsPos select 1) + (_buttonHeight)];
-};
-
-if !(_foudIntelMarker isEqualTo []) then {
- CSE_CLICKED_ON_MAP_FOUND_INTELMARKER_CC = _position;
-/*
- _ctrlBtn = (_display displayCtrl _lastIDC);
- _ctrlBtn ctrlSetPosition _optionsPos;
- _text = "Edit SALUTE";
- _ctrlBtn ctrlSetText _text;
- _CtrlBtn ctrlSetEventHandler ["ButtonClick", format["['%2'] call cse_fnc_removeSelectMenu_CC;[CSE_CLICKED_ON_MAP_FOUND_INTELMARKER_CC] call cse_fnc_editIntelMarker_CC;", _position,_deviceName,_found]];
- _ctrlBtn ctrlCommit 0;
- _lastIDC = _lastIDC + 1;
- _optionsPos set[1, (_optionsPos select 1) + (_buttonHeight)];
-*/
- /* END */
-
- _ctrlBtn = (_display displayCtrl _lastIDC);
- _ctrlBtn ctrlSetPosition _optionsPos;
- _text = "Remove SALUTE";
- _ctrlBtn ctrlSetText _text;
- _CtrlBtn ctrlSetEventHandler ["ButtonClick", format["['%2'] call cse_fnc_removeSelectMenu_CC;[CSE_CLICKED_ON_MAP_FOUND_INTELMARKER_CC] call cse_fnc_removeIntelMarker_CC;", _position,_deviceName,_found]];
- _ctrlBtn ctrlCommit 0;
- _lastIDC = _lastIDC + 1;
- _optionsPos set[1, (_optionsPos select 1) + (_buttonHeight)];
-};
-if !(_foudRouteMarker isEqualTo []) then {
- _ctrlBtn = (_display displayCtrl _lastIDC);
- _ctrlBtn ctrlSetPosition _optionsPos;
- _text = "Remove Route";
- CSE_CLICKED_ON_MAP_FOUND_ROUTEMARKER_CC = _position;
- _ctrlBtn ctrlSetText _text;
- _CtrlBtn ctrlSetEventHandler ["ButtonClick", format["['%2'] call cse_fnc_removeSelectMenu_CC;[CSE_CLICKED_ON_MAP_FOUND_ROUTEMARKER_CC] call cse_fnc_removeRouteMarker_CC", _position,_deviceName,_found]];
- _ctrlBtn ctrlCommit 0;
- _lastIDC = _lastIDC + 1;
- _optionsPos set[1, (_optionsPos select 1) + (_buttonHeight)];
-};
-(_display displayCtrl 10) ctrlEnable true;
-
-[_position,_display,_deviceName] spawn {
- private ["_originalPos","_display","_position"];
- disableSerialization;
- _position = _this select 0;
- _display = _this select 1;
- _originalPos = +((_display displayCtrl 10) ctrlMapWorldToScreen _position);
-
- waituntil {(((_display displayCtrl 10) ctrlMapWorldToScreen _position) select 0 != (_originalPos select 0))};
- [_this select 2] call cse_fnc_removeSelectMenu_CC;
-};
-
-
-if !(_found isEqualTo []) then {
- if (!CSE_ALLOW_LIVE_FEEDS_CC) exitwith {};
- _ctrlBtn = (_display displayCtrl _lastIDC);
- _ctrlBtn ctrlSetPosition _optionsPos;
- _unit = _found select 5;
-
- if ([_unit, _deviceName] call cse_fnc_canViewFeed_CC) then {
- _text = "View Feed";
- [_unit] call cse_fnc_setLiveFeedTargetObj_CC;
-
- _ctrlBtn ctrlSetText _text;
- _CtrlBtn ctrlSetEventHandler ["ButtonClick", format["['%2'] call cse_fnc_removeSelectMenu_CC; ['%2'] call cse_fnc_openScreen_liveFeed_CC;", _position,_deviceName, _unit]];
- _ctrlBtn ctrlCommit 0;
- _lastIDC = _lastIDC + 1;
- _optionsPos set[1, (_optionsPos select 1) + (_buttonHeight)];
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_getCurrentApplication_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_getCurrentApplication_CC.sqf
deleted file mode 100644
index fa03e0429f..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_getCurrentApplication_CC.sqf
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * fn_getCurrentApplication_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return","_deviceName"];
-
-_deviceName = (call cse_fnc_getCurrentDeviceName_CC);
-_return = "home";
-if (!isnil format["CSE_CURRENT_APPLICATION_%1_CC",_deviceName]) then {
- _return = call compile format["CSE_CURRENT_APPLICATION_%1_CC",_deviceName];
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_getCurrentDeviceName_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_getCurrentDeviceName_CC.sqf
deleted file mode 100644
index f165910456..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_getCurrentDeviceName_CC.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * fn_getCurrentDeviceName_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_display"];
-disableSerialization;
-if (isnil "CSE_CURRENT_DEVICE_NAME_CC") then {
- CSE_CURRENT_DEVICE_NAME_CC = "";
-};
-
- _display = findDisplay 590823;
- if (isNull _display) then {
- CSE_CURRENT_DEVICE_NAME_CC = "";
- } else {
-
-};
-CSE_CURRENT_DEVICE_NAME_CC
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_getDeviceSettings_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_getDeviceSettings_CC.sqf
deleted file mode 100644
index d8a384b8e3..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_getDeviceSettings_CC.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_getDeviceSettings_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_screenName","_settings"];
-_deviceName = _this select 0;
-_settings = [0,0,0,0];
-
-if (isnil 'CSE_REGISTERED_DEVICES_CC') then {
- CSE_REGISTERED_DEVICES_CC = [];
-};
-
-{
- if ((_x select 0) == _deviceName) exitwith {
- _found = _x select 1;
- if (!CSE_DISPLAY_CC_VIEW_FULL_SCREEN_CC) then {
- _settings = [_found select 0, _found select 1, _found select 2,_found select 3];
- } else {
- _settings = [safezoneX, safezoneY, safezoneW, safezoneH];
- };
- };
-}foreach CSE_REGISTERED_DEVICES_CC;
-
-_settings
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_getLastScreen_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_getLastScreen_CC.sqf
deleted file mode 100644
index 49f24f18cc..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_getLastScreen_CC.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_getLastScreen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_lastScreen"];
-_deviceName = _this select 0;
- _lastScreen = player getvariable ["cse_cc_lastScreen_" + _deviceName, "home"];
-
-_lastScreen
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_hasDevice_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_hasDevice_CC.sqf
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_isLoggedIn_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_isLoggedIn_CC.sqf
deleted file mode 100644
index dbe3957220..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_isLoggedIn_CC.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * fn_isLoggedIn_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName"];
-_deviceName = _this select 0;
-_loggedIn = false;
-
-_trackers = [player,_deviceName] call cse_fnc_getAllBFTItemsOfType_CC;
-{
- _info = [_x] call cse_fnc_getTrackerInformation_CC;
- if (_info select 3) then {
- _loggedIn = true;
- };
-}foreach _trackers;
-//_trackerInfo = [_tracker] call cse_fnc_getTrackerInformation_CC;
-
-_loggedIn
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_isSideBarOpen_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_isSideBarOpen_CC.sqf
deleted file mode 100644
index 74e42270c2..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_isSideBarOpen_CC.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_isSideBarOpen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_settings","_display","_return"];
-_deviceName = _this select 0;
-_settings = [_deviceName] call cse_fnc_getDeviceSettings_CC;
-_display = uiNamespace getvariable _deviceName;
-
-!((ctrlPosition ((_display displayCtrl 2)) select 0 == 0) && ((ctrlPosition (_display displayCtrl 2)) select 1 == 0))
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_manageLayers_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_manageLayers_CC.sqf
deleted file mode 100644
index fcfc77f993..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_manageLayers_CC.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * fn_manageLayers_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_device","_position"];
-_device = call cse_fnc_getCurrentDeviceName_CC;
-
-[_device,"open","Manage Layers",format[""]] spawn cse_fnc_setPopUpMenu_CC;
-
-_layerNames = [];
-
-_opt = [
- ["Layer Name:","combo","",_layerNames],
- ["Enable","btn",""]
- ];
-
-[_device,_opt] call cse_fnc_setPopUpOptions_CC;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openDeviceSmall_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_openDeviceSmall_CC.sqf
deleted file mode 100644
index e89122db1d..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openDeviceSmall_CC.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_openDeviceSmall_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-_this spawn {
-if (isnil 'CSE_CC_BFT_LOOP_CC') then {
- CSE_CC_BFT_LOOP_CC = false;
-};
-waituntil {!CSE_CC_BFT_LOOP_CC};
-
-
- _deviceName = "cse_view_small";
- CSE_CURRENT_DEVICE_NAME_CC = _deviceName;
- CSE_SMALL_SCREEN_DISPLAY_CC = true;
- ("CSE_BFT_SMALL_LAYER" call BIS_fnc_rscLayer) cutRsc [_deviceName,"PLAIN",0];
- [_deviceName] spawn cse_fnc_displayBFT_CC;
- //[_deviceName,"top"] call cse_fnc_setNavBar_CC;
- [_deviceName,"main","full"] call cse_fnc_setMap_CC;
-
- disableSerialization;
- _display = uiNamespace getvariable _deviceName;
- _ctrl = (_display displayCtrl 10);
- _ctrl ctrlSetBackgroundColor [1, 1, 1, 0];
- _ctrl ctrlCommit 0;
- while {(!dialog && alive player)} do {
- _pos = getPos player;
- _pos set [1, (_pos select 1) + 300];
- _pos set [0, (_pos select 0) - 350];
- _ctrl ctrlMapAnimAdd [0, 0.3, _pos];
- ctrlMapAnimCommit _ctrl;
- };
- ("CSE_BFT_SMALL_LAYER" call BIS_fnc_rscLayer) cutText ["","PLAIN"];
- CSE_SMALL_SCREEN_DISPLAY_CC = false;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openDevice_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_openDevice_CC.sqf
deleted file mode 100644
index ce074f7bd2..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openDevice_CC.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * fn_openDevice_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName"];
-_deviceName = _this select 0;
-
-disableSerialization;
-createDialog _deviceName;
-CSE_CURRENT_DEVICE_NAME_CC = _deviceName;
-CSE_SMALL_SCREEN_DISPLAY_CC = false;
-// [_deviceName, 1] spawn cse_fnc_showLoadingScreen_CC;
-[_deviceName] call cse_fnc_clearDeviceScreen_CC;
-[_deviceName,"full"] call cse_fnc_setBackground_CC;
-[_deviceName,"top"] call cse_fnc_setNavBar_CC;
-[_deviceName,"hidden"] call cse_fnc_setSideBar_CC;
-[_deviceName,[_deviceName] call cse_fnc_getCurrentApplication_CC] call cse_fnc_openScreen_CC;
-[_deviceName] call cse_fnc_displayBFT_CC;
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openIconSelectMenu_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_openIconSelectMenu_CC.sqf
deleted file mode 100644
index f48409206a..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openIconSelectMenu_CC.sqf
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * fn_openIconSelectMenu_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_device","_position", "_unit", "_currentInfo", "_opt"];
-_device = _this select 0;
-_position = _this select 1;
-
-
-// figure out side with device!
-[_device,"open","SELECTED TRACKER", format["[CSE_CLICKED_ON_MAP_FOUND_CC, _this] call cse_fnc_updateTrackerInfo_CC;"]] call cse_fnc_setPopUpMenu_CC;
-
-_unit = CSE_CLICKED_ON_MAP_FOUND_CC select 5;
-_currentInfo = _unit getvariable ["cse_bft_info_cc",["Infantry"," ",true,false]];
-
-_opt = [
- ["Type:","combo","",
- ["Infantry","Motorized","Plane","Helicopter","Armor","Naval","HQ","Medical","Maintanance","Artillery","Mortar","Service","Recon","Mechanized","uav","Unknown"]
- ],
- [_currentInfo select 0,"input", "", _currentInfo select 1]
- ];
-[_device,_opt] call cse_fnc_setPopUpOptions_CC;
-
-
-cse_fnc_updateTrackerInfo_CC = {
- private ["_unit","_info","_currentInfo","_deviceName","_sideBarN", "_sideBarFullScreen"];
- _unit = CSE_CLICKED_ON_MAP_FOUND_CC select 5;
- _info = _this select 1;
- _currentInfo = _unit getvariable ["cse_bft_info_cc",["Infantry"," ",true,false]];
- _currentInfo set [0, _info select 0];
-
- _deviceName = [] call cse_fnc_getCurrentDeviceName_CC;
- _sideBarFullScreen = {
- private["_deviceName","_cfg","_allowSidebar"];
- _deviceName = _this select 0;
-
- _allowSidebar = 0;
- if (isnil 'CSE_REGISTERED_DEVICES_CC') then {
- CSE_REGISTERED_DEVICES_CC = [];
- };
-
- {
- if (_x select 0 == _deviceName) exitwith {
- _allowSidebar = _x select 2;
- };
- }foreach CSE_REGISTERED_DEVICES_CC;
- _allowSidebar
- };
-
- _sideBarN = ([_deviceName] call _sideBarFullScreen);
-
- if (_unit == player || _sideBarN == 1) then {
- _currentInfo set [1, _info select 1];
- };
- _unit setvariable ["cse_bft_info_cc",_currentInfo, true];
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openIntelMarkersMenu_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_openIntelMarkersMenu_CC.sqf
deleted file mode 100644
index beee9cfc98..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openIntelMarkersMenu_CC.sqf
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * fn_openIntelMarkersMenu_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_device","_position", "_opt"];
-_device = _this select 0;
-_position = _this select 1;
-
-[_device,"open","SALUTE Report",format["[_this,%1,'intel', ([([] call cse_fnc_getCurrentDeviceName_CC)] call cse_fnc_getDeviceSide_CC)] call cse_fnc_placeMarker_CC",_position]] call cse_fnc_setPopUpMenu_CC;
-
-
-_opt = [
- ["Type:","combo","",
- ["Infantry","Motorized","Plane","Helicopter","Armor","Naval","HQ","Medical","Maintanance","Artillery","Mortar","Service","Recon","Mechanized","uav","Installation","Unknown"]
- ],
- ["Side:","combo","",["BLUFOR","OPFOR","GREENFOR","UNKNOWN"]],
- ["direction:","combo","",["Static","North","North East","East","South East","South","South West","West","North West"]],
- ["Size:","combo","",["Pax","Fire Team","Section","Platoon","Company","Battalion","Regiment", "Brigade"]],
- ["","combo","",["1x","2x","3x","4x","5x","6x", "7x"]],
- ["Description:","input",""]
- ];
-[_device,_opt] call cse_fnc_setPopUpOptions_CC;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openLastScreen_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_openLastScreen_CC.sqf
deleted file mode 100644
index 3ccddcfb49..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openLastScreen_CC.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * fn_openLastScreen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName"];
-_deviceName = _this select 0;
-
-[_deviceName,[_deviceName] call cse_fnc_getLastScreen_CC] call cse_fnc_openScreen_CC;
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openRouteMarkersMenu_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_openRouteMarkersMenu_CC.sqf
deleted file mode 100644
index dd271e8408..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openRouteMarkersMenu_CC.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * fn_openRouteMarkersMenu_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_device","_position"];
-_device = _this select 0;
-_position = _this select 1;
-
-[_device,"open","Route Planning",format["[_this,%1,'route', ([([] call cse_fnc_getCurrentDeviceName_CC)] call cse_fnc_getDeviceSide_CC)] call cse_fnc_placeMarker_CC",_position]] call cse_fnc_setPopUpMenu_CC;
-
-if (isnil "_layerNames") then {
- _layerNames = [];
-};
-_opt = [
- ["Type:","combo","",["Dot","Waypoint","ReOrg","Crossing","Ambush","LZ","HLS","Destroy","Capture","Secure","Danger","Avoid","Arrow"]],
- ["Color:","combo","",["blue","red","green", "yellow", "purple", "orange", "white", "black"]],
- ["Text:","input",""]
- ];
-
-if !(_layerNames isEqualTo []) then {
- _opt pushback ["Layer:","combo","",_layerNames];
-};
-
-[_device,_opt] call cse_fnc_setPopUpOptions_CC;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openScreen_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_openScreen_CC.sqf
deleted file mode 100644
index 99056bbb03..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_openScreen_CC.sqf
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * fn_openScreen_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_screenName","_init","_cfg", "_availablePrograms"];
-_deviceName = _this select 0;
-_screenName = _this select 1;
-
-
-[format["CC - openScreen: %1 test",_screenName],2] call cse_fnc_debug;
-[_deviceName,"full"] call cse_fnc_setBackground_CC;
-_availablePrograms = [];
-_cfg = (missionConfigFile >> "Combat_Space_Enhancement" >> "command_and_control" >> "applications" >> _screenName);
-
-_found = false;
-{
- if ((_x select 0) == _screenName) exitwith {
- [_deviceName] call compile (_x select 6);
- _found = true;
- };
-}foreach CSE_REGISTERED_APPLICATIONS_CC;
-
-if (_found) then {
- //_init = getText (_cfg>> "init");
- //[_deviceName] spawn compile _init;
-} else {
- [_deviceName] spawn cse_fnc_openScreen_home_CC;
- _screenName = "home";
- [_deviceName,"show"] call cse_fnc_setBottomBar_CC;
-};
-
-
-CSE_PREVIOUS_APPLICATION_CC = [_deviceName] call cse_fnc_getCurrentApplication_CC;
-//CSE_CURRENT_APPLICATION_CC = _screenName;
-call compile format["CSE_CURRENT_APPLICATION_%1_CC = '%2';",_deviceName,_screenName];
-
-
-//player sidechat format[" Current Application is set to: %1",call compile format["CSE_CURRENT_APPLICATION_%1_CC",_deviceName]];
-if ([_deviceName] call cse_fnc_isSideBarOpen_CC) then {
- [_deviceName,"right"] call cse_fnc_setSideBar_CC;
-};
-//player setvariable ["cse_cc_lastScreen_" + _deviceName, _screenName];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_placeMarkerGlobal_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_placeMarkerGlobal_CC.sqf
deleted file mode 100644
index f98cba36c3..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_placeMarkerGlobal_CC.sqf
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * fn_placeMarker_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_args","_position","_type"];
-_args = (_this select 0);
-_position = _this select 1;
-_type = _this select 2;
-_side = _this select 3;
-
-if (isnil "CSE_SIDE_WEST_COLOR") then {
- _r = profilenamespace getvariable ['Map_BLUFOR_R',0];
- _g = profilenamespace getvariable ['Map_BLUFOR_G',0.8];
- _b = profilenamespace getvariable ['Map_BLUFOR_B',1];
- _a = profilenamespace getvariable ['Map_BLUFOR_A',0.8];
- CSE_SIDE_WEST_COLOR = [_r,_g,_b,_a];
-
- CSE_SIDE_EAST_COLOR =
- [
- profilenamespace getvariable ['Map_OPFOR_R',1],
- profilenamespace getvariable ['Map_OPFOR_G',0.5],
- profilenamespace getvariable ['Map_OPFOR_B',0.5],
- profilenamespace getvariable ['Map_OPFOR_A',0.8]
- ];
-
- _r = profilenamespace getvariable ['Map_Independent_R',0];
- _g = profilenamespace getvariable ['Map_Independent_G',1];
- _b = profilenamespace getvariable ['Map_Independent_B',1];
- _a = profilenamespace getvariable ['Map_OPFOR_A',0.8];
- CSE_SIDE_IND_COLOR = [_r,_g,_b,_a];
-};
-
-if (_type == "intel") exitwith {
- CSE_TOGGLE_INTEL_LAYER_CC = true;
- if (isnil "CSE_INTEL_MARKER_COLLECTION_CC") then {
- CSE_INTEL_MARKER_COLLECTION_CC = [];
- };
- _usedDesc = false;
- _text = "";
- if ((_args select 5) == "") then {
- _text = _text + (_args select 0);
- _text = _text + " / " + (_args select 2);
- _text = _text + " / " + (_args select 4);
- _text = _text + (_args select 3);
- } else {
- _text = _args select 5;
- _usedDesc = true;
- };
- _text = _text + format["(%1:%2)",Date select 3, Date select 4];
-
- _prefix = switch (_args select 1) do {
- case "BLUFOR": {"b_"};
- case "OPFOR": {"o_"};
- case "GREENFOR": {"n_"};
- default {"n_"};
- };
- _prefix = "\A3\ui_f\data\map\markers\nato\" + _prefix;
- _icon = switch (_args select 0) do {
- case "Infantry": {_prefix+"inf.paa"};
- case "Motorized": {_prefix+"motor_inf.paa"};
- case "Plane": {_prefix+"plane.paa"};
- case "Helicopter": {_prefix+"air.paa"};
- case "Armor": {_prefix+"armor.paa"};
- case "Naval": {_prefix+"naval.paa"};
- case "HQ": {_prefix+"hq.paa"};
- case "Medical": {_prefix+"med.paa"};
- case "Maintanance": {_prefix+"maint.paa"};
- case "Artillery": {_prefix+"art.paa"};
- case "Mortar": {_prefix+"mortar.paa"};
- case "Service": {_prefix+"service.paa"};
- case "Recon": {_prefix+"recon.paa"};
- case "Mechanized": {_prefix+"mech_inf.paa"};
- case "uav": {_prefix+"uav.paa"};
- case "Installation": {_prefix+"installation.paa"};
- default {_prefix+"unknown.paa"};
- };
-
-
- _color = switch (_args select 1) do {
- case "BLUFOR": {CSE_SIDE_WEST_COLOR};
- case "OPFOR": {CSE_SIDE_EAST_COLOR};
- case "GREENFOR": {CSE_SIDE_IND_COLOR};
- case "UNKNOWN": {[0.6,0.2,0.1,0.8]};
- default {CSE_SIDE_IND_COLOR};
- };
-
- _placementArgs = [ _icon, _text, +_color];
- [format["Placed a Marker: %1", [_position, _placementArgs, time, _side, _args select 6, _usedDesc]]] call cse_fnc_debug;
- CSE_INTEL_MARKER_COLLECTION_CC pushback [_position,_placementArgs,time, _side, _args select 6, _usedDesc];
-};
-
-if (_type == "route") exitwith {
- CSE_TOGGLE_ROUTE_LAYER_CC = true;
- if (isnil "CSE_ROUTE_MARKER_COLLECTION_CC") then {
- CSE_ROUTE_MARKER_COLLECTION_CC = [];
- };
- _text = "";
- _text = _text + (_args select 2);
- _text = _text + format["(%1:%2)",Date select 3, Date select 4];
-
-
- _prefix = "\A3\ui_f\data\map\markers\military\";
- _icon = switch (_args select 0) do {
- case "waypoint": {"\A3\ui_f\data\map\groupicons\waypoint.paa"};
- case "ReOrg": {"\A3\ui_f\data\map\groupicons\waypoint.paa"};
- case "Crossing": {"\A3\ui_f\data\map\markers\military\pickup_CA.paa"};
- case "Ambush": {"\A3\ui_f\data\map\markers\military\ambush_CA.paa"};
- case "LZ": {"\A3\ui_f\data\map\markers\military\pickup_CA.paa"};
- case "HLS": {"\A3\ui_f\data\map\markers\military\pickup_CA.paa"};
- case "Destory": {"\A3\ui_f\data\map\markers\military\destroy_CA.paa"};
- case "Capture": {"\A3\ui_f\data\map\markers\military\objective_CA.paa"};
- case "Secure": {"\A3\ui_f\data\map\markers\military\objective_CA.paa"};
- case "Danger": {"\A3\ui_f\data\map\markers\military\warning_CA.paa"};
- case "Avoid": {"\A3\ui_f\data\map\markers\military\warning_CA.paa"};
- case "Dot": {"\A3\ui_f\data\map\markers\military\dot_CA.paa"};
- case "Arrow": {"\A3\ui_f\data\map\markers\military\arrow_CA.paa"};
- default {"\A3\ui_f\data\map\groupicons\waypoint.paa"};
- };
-
- _color = switch (_args select 1) do {
- case "blue": {CSE_SIDE_WEST_COLOR};
- case "red": {CSE_SIDE_EAST_COLOR};
- case "green": {CSE_SIDE_IND_COLOR};
- case "yellow": {[0.74, 0.74, 0.08, 0.9]};
- case "orange": {[1, 0.51, 0.08, 0.9]};
- case "white": {[1,1,1, 0.9]};
- case "black": {[0,0,0, 0.9]};
- case "purple": {[0.34,0.6,0.42, 0.9]};
- default {CSE_SIDE_IND_COLOR};
- };
-
- _placementArgs = [ _icon, _text, +_color];
- CSE_ROUTE_MARKER_COLLECTION_CC pushback [_position,_placementArgs,time, _side, _args select 3];
- [format["Placed a Marker: %1", [_position,_placementArgs,time, _side, _args select 3]]] call cse_fnc_debug;
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_placeMarker_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_placeMarker_CC.sqf
deleted file mode 100644
index 5317a1c8ea..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_placeMarker_CC.sqf
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * fn_placeMarker_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-[_this, "cse_fnc_placeMarkerGlobal_CC", true, true] spawn BIS_fnc_MP;
-nil;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_registerApp_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_registerApp_CC.sqf
deleted file mode 100644
index 8cbfc8c731..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_registerApp_CC.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_registerApp_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_name","_displayName","_icon","_hideOnDesktop","_side","_sideBar","_init", "_devices"];
-_name = _this select 0;
-_displayName = _this select 1;
-_icon = _this select 2;
-_hideOnDesktop = _this select 3;
-_sideBar = _this select 4;
-_side = _this select 5;
-_init = _this select 6;
-_devices = _this select 7;
-
-if (isnil 'CSE_REGISTERED_APPLICATIONS_CC') then {
- CSE_REGISTERED_APPLICATIONS_CC = [];
-};
-
-CSE_REGISTERED_APPLICATIONS_CC pushback [_name,_displayName,_icon,_hideOnDesktop,_sideBar,_side,_init, _devices];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_registerDevice_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_registerDevice_CC.sqf
deleted file mode 100644
index 9c2f1ab054..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_registerDevice_CC.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * fn_registerDevice_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_ratio","_typeOfSideBar"];
-_deviceName = _this select 0;
-_ratio = _this select 1;
-_typeOfSideBar = _this select 2;
-_side = _this select 3;
-
-//if (!isclass (ConfigFile >> _deviceName)) exitwith {};
-if (isnil 'CSE_REGISTERED_DEVICES_CC') then {
- CSE_REGISTERED_DEVICES_CC = [];
-};
-if (count _ratio != 4) exitwith {};
-//_navRatio = [_ratio select 0, _ratio select 1, _ratio select 2, (_ratio select 3) / 13];
-
-CSE_REGISTERED_DEVICES_CC pushback [_deviceName,_ratio,_typeOfSideBar,_side];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_setLoggedIn_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_setLoggedIn_CC.sqf
deleted file mode 100644
index d162c11d8d..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_setLoggedIn_CC.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_setLoggedIn_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_loggedIn","_trackers"];
-_deviceName = _this select 0;
-_loggedIn = _this select 1;
-
-_trackers = [player,_deviceName] call cse_fnc_getAllBFTItemsOfType_CC;
-{
- _info = [_x] call cse_fnc_getTrackerInformation_CC;
- _info set [3, _loggedIn];
- [_x, _info] call cse_fnc_setTrackerInformation_CC;
-}foreach _trackers;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/tablets/functions/fn_viewLiveFeed_CC.sqf b/TO_MERGE/cse/sys_cc/tablets/functions/fn_viewLiveFeed_CC.sqf
deleted file mode 100644
index 5d450a2823..0000000000
--- a/TO_MERGE/cse/sys_cc/tablets/functions/fn_viewLiveFeed_CC.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_viewLiveFeed_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_deviceName","_display","_view","_ctrl", "_camera"];
-
-_view = _this select 0;
-
-disableSerialization;
-_deviceName = [] call cse_fnc_getCurrentDeviceName_CC;
-[format["fn_viewLiveFeed_CC %1 %2",_this, _deviceName]] call cse_fnc_debug;
-_display = uiNamespace getvariable _deviceName;
-_ctrl = (_display displayCtrl 20);
-
-if (_view) then {
- _camera = objNull;
- if (isnil "CSE_PIP_CAMERA_CC") then {
- _camera = "camera" camCreate (position player);
- CSE_PIP_CAMERA_CC = _camera;
- _camera cameraEffect ["INTERNAL", "BACK","rendertarget0"];
- } else {
- _camera = CSE_PIP_CAMERA_CC;
- //_camera attachto [vehicle CSE_LIVEFEED_TARGET_CC,[-0.18,0.1,0.1], "head" ];
- };
- [format["VIEW LIVE TARGET: %1 %2", CSE_LIVEFEED_TARGET_CC, _camera]] call cse_fnc_debug;
- "rendertarget0" setPiPEffect [0];
- _ctrl ctrlsettext "#(argb,256,256,1)r2t(rendertarget0,1.0)";
- _ctrl ctrlcommit 0;
-
-} else {
- _ctrl ctrlsettext "";
- _ctrl ctrlcommit 0;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/ui/RscTitles.hpp b/TO_MERGE/cse/sys_cc/ui/RscTitles.hpp
deleted file mode 100644
index 50dd1552ca..0000000000
--- a/TO_MERGE/cse/sys_cc/ui/RscTitles.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-class RscTitles{
- //#include "cse_m_tablet.hpp"
- //#include "cse_view_small.hpp"
-
-
- class cse_future_soldier_blueforce {
- onLoad = "uiNamespace setVariable ['cse_future_soldier_blueforce', _this select 0];";
- duration = 10e10;
- fadein = 0;
- fadeout = 0;
- idd = 590824;
- movingEnable = false;
-
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = 3;
- y = 2;
- w = 1;
- h = 0.5;
- text = "";
- };
- };
-
- class controls {
-
-
-
- class display_hud_backgroundImg: cse_gui_backgroundBase {
- idc = 1;
- x = safezoneX + 0.01;
- y = safezoneY + 0.01;
- w = 0.4;
- h = 0.4;
- text = "cse\cse_sys_cc\data\empty_background2.paa";
- colorText[] = {0, 0, 0, 0.2};
- };
-
-
- class informationDisplay: cse_gui_staticBase {
- idc = 2;
- x = safezoneX + 0.02;
- y = safezoneY + 0.02;
- w = 0.31;
- h = 0.05;
- style = ST_LEFT;
- sizeEx = 0.03921;
- colorText[] = {0.95, 0.95, 0.95, 0.8};
- colorBackground[] = {0, 0, 0, 0};
- text = "LOCAL TIME: 05:21";
- };
- class informationDisplay2: informationDisplay {
- idc = 3;
- //x = safezoneX + 0.05;
- y = safezoneY + 0.07;
- text = "OBJECTIVE: 0534 1235";
- };
- class informationDisplay3: informationDisplay {
- idc = 4;
- //x = safezoneX + 0.05;
- y = safezoneY + 0.12;
- text = "DISTANCE: 1530m";
- };
- class informationDisplay4: informationDisplay {
- idc = 5;
- //x = safezoneX + 0.05;
- y = safezoneY + 0.17;
- text = "SPEED: 10km";
- };
-
-
-
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/ui/cse_m_pda.hpp b/TO_MERGE/cse/sys_cc/ui/cse_m_pda.hpp
deleted file mode 100644
index f8506f6106..0000000000
--- a/TO_MERGE/cse/sys_cc/ui/cse_m_pda.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-
-class cse_m_pda : cse_m_tablet {
- //idd = 590824;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_m_pda', _this select 0]; ['cse_m_pda', true] call cse_fnc_gui_blurScreen;";
- onUnload = " ['cse_m_pda', false] call cse_fnc_gui_blurScreen;";
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = -0.7;
- y = -0.3;
- w = 2.35;
- h = 1.55;
- text = "cse\cse_sys_cc\data\m_pda.paa";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/ui/cse_m_tablet.hpp b/TO_MERGE/cse/sys_cc/ui/cse_m_tablet.hpp
deleted file mode 100644
index f0860bbc3c..0000000000
--- a/TO_MERGE/cse/sys_cc/ui/cse_m_tablet.hpp
+++ /dev/null
@@ -1,776 +0,0 @@
-class cse_m_tablet {
- idd = 590823;
- movingEnable = false;
- onLoad = "uiNamespace setVariable ['cse_m_tablet', _this select 0]; ['cse_m_tablet', true] call cse_fnc_gui_blurScreen;";
- onUnload = "['cse_m_tablet', false] call cse_fnc_gui_blurScreen;";
- duration = 10e10;
- fadein = 0;
- fadeout = 0;
-
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = -0.7;
- y = -0.3;
- w = 2.35;
- h = 1.55;
- text = "cse\cse_sys_cc\data\m_tablet.paa";
- };
- };
-
- class controls {
- class cse_empty_background : cse_gui_backgroundBase {
- idc = 1;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = "cse\cse_sys_cc\data\empty_background2.paa";
- };
-
- class cse_icon1 : cse_gui_backgroundBase {
- idc = 100;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = "";
- };
-
- class cse_icon2 : cse_icon1 {
- idc = 101;
- };
- class cse_icon3 : cse_icon1 {
- idc = 102;
- };
- class cse_icon4 : cse_icon1 {
- idc = 103;
- };
- class cse_icon5 : cse_icon1 {
- idc = 104;
- };
- class cse_icon6 : cse_icon1 {
- idc = 105;
- };
- class cse_icon7 : cse_icon1 {
- idc = 106;
- };
- class cse_icon8 : cse_icon1 {
- idc = 107;
- };
- class cse_icon9 : cse_icon1 {
- idc = 108;
- };
- class cse_icon10 : cse_icon1 {
- idc = 109;
- };
- class cse_icon11 : cse_icon1 {
- idc = 110;
- };
- class cse_icon12 : cse_icon1 {
- idc = 111;
- };
- class cse_icon13 : cse_icon1 {
- idc = 112;
- };
-
- class cse_icon_button1 : cse_gui_buttonBase {
- idc = 120;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- color[] = {1.0, 1.0, 1.0, 0};
- color2[] = {1.0, 1.0, 1.0, 0};
- colorBackground[] = {1.0, 1.0, 1.0, 0};
- colorbackground2[] = {1.0, 1.0, 1.0, 0};
- colorDisabled[] = {1.0, 1.0, 1.0, 0};
- text = "";
- animTextureNormal = "";
- animTextureDisabled = "";
- animTextureOver = "";
- animTextureFocused = "";
- animTexturePressed = "";
- animTextureDefault = "";
- };
-
- class cse_icon_button2 : cse_icon_button1 {
- idc = 121;
- };
- class cse_icon_button3 : cse_icon_button1 {
- idc = 122;
- };
- class cse_icon_button4 : cse_icon_button1 {
- idc = 123;
- };
- class cse_icon_button5 : cse_icon_button1 {
- idc = 124;
- };
- class cse_icon_button6 : cse_icon_button1 {
- idc = 125;
- };
- class cse_icon_button7 : cse_icon_button1 {
- idc = 126;
- };
- class cse_icon_button8 : cse_icon_button1 {
- idc = 127;
- };
- class cse_icon_button9 : cse_icon_button1 {
- idc = 128;
- };
- class cse_icon_button10 : cse_icon_button1 {
- idc = 129;
- };
- class cse_icon_button11 : cse_icon_button1 {
- idc = 130;
- };
- class cse_icon_button12 : cse_icon_button1 {
- idc = 131;
- };
- class cse_icon_button13 : cse_icon_button1 {
- idc = 132;
- };
-
- class cse_icon_label1 : cse_gui_staticBase {
- idc = 140;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- style = ST_CENTER;
- };
- class cse_icon_label2: cse_icon_label1 {
- idc = 141;
- };
- class cse_icon_label3: cse_icon_label1 {
- idc = 142;
- };
- class cse_icon_label4: cse_icon_label1 {
- idc = 143;
- };
- class cse_icon_label5: cse_icon_label1 {
- idc = 144;
- };
- class cse_icon_label6: cse_icon_label1 {
- idc = 145;
- };
-
-
-
- class mapDisplay1: cse_gui_mapBase {
- idc = 10;
- x = 100;
- y = 100;
- w = 0.3;
- h = 0.3;
- type = 101;
- moveOnEdges = 0;
- showCountourInterval = 1;
- };
-
- // 150 t/m 165
- class cse_popUpMenuBackground: cse_gui_backgroundBase {
- idc = 150;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- //text = "cse\cse_sys_cc\data\dropdown_menu2.paa";
- type = CT_STATIC;
- style = ST_LEFT + ST_SHADOW;
- text = "";
- colorText[] = {0.95,0.95,0.95,1};
- colorBackground[] = {0.1,0.1,0.1,1};
- };
- class cse_popUpMenuBackgroundheader: cse_popUpMenuBackground {
- idc = 151;
- colorBackground[] = {0.05,0.05,0.05,1};
- };
- class cse_popUpMenuHeaderTitle: cse_gui_staticBase {
- idc = 152;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- style = ST_CENTER;
- };
- class popUpMenuBtn_accept: cse_gui_buttonBase {
- idc = 153;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- style = ST_CENTER;
- /*animTextureNormal = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureDisabled = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureOver = "cse\cse_sys_cc\data\button_dropdown_menu_hover.paa";
- animTextureFocused = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTexturePressed = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureDefault = "cse\cse_sys_cc\data\button_dropdown_menu.paa";*/
- animTextureNormal = "#(argb,8,8,3)color(0.2,0.2,0.2,1)";
- animTextureDisabled = "#(argb,8,8,3)color(0.4,0.4,0.4,1)";
- animTextureOver = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTextureFocused = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTexturePressed = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTextureDefault = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- colorBackground[] = {0.97,0.97,0.97,1};
- colorbackground2[] = {0.97,0.97,0.97,1};
- colorDisabled[] = {0.97,0.97,0.97,1};
- colorFocused[] = {0.97,0.97,0.97,1};
- colorBackgroundFocused[] = {1,1,1,1};
- text = "Accept";
- };
- class popUpMenuBtn_close: popUpMenuBtn_accept {
- idc = 154;
- text = "Close";
- };
-
- class cse_bottomBar: cse_gui_backgroundBase {
- idc = 155;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- //text = "cse\cse_sys_cc\data\dropdown_menu2.paa";
- type = CT_STATIC;
- style = ST_LEFT + ST_SHADOW;
- text = "";
- colorText[] = {0.95,0.95,0.95,1};
- colorBackground[] = {0.1,0.1,0.1,1};
- };
-
- class bottomBar_Text: cse_gui_staticBase {
- idc = 156;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- style = ST_LEFT;
- sizeEx = 0.025;
- };
-
- class cse_sidebar_background : cse_gui_backgroundBase {
- idc = 2;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- //text = "cse\cse_sys_cc\data\dropdown_menu2.paa";
- type = CT_STATIC;
- style = ST_LEFT + ST_SHADOW;
- text ="";
- colorText[] = {0.95, 0.95, 0.95, 1};
- colorBackground[] = {0.1,0.1,0.1,1};
- };
-
-
- class mapDisplay2: mapDisplay1 {
- idc = 11;
- };
-
- class cse_navBar_background : cse_sidebar_background {
- idc = 3;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- //text = "cse\cse_sys_cc\data\dropdown_menu2.paa";
- text = "";
- colorText[] = {0.95, 0.95, 0.95, 0.75};
- colorBackground[] = {0.1,0.1,0.1,1};
- };
- class cse_toggleSideBar : cse_gui_buttonBase {
- idc = 4;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- color[] = {0.97,0.97,0.97,1};
- color2[] = {0.97,0.97,0.97,1};
- colorBackground[] = {0.97,0.97,0.97,0.7};
- colorbackground2[] = {0.97,0.97,0.97, 0.7};
- colorDisabled[] = {0.97,0.97,0.97, 0.6};
- colorFocused[] = {0.97,0.97,0.97, 1};
- colorBackgroundFocused[] = {0.97,0.97,0.97, 1};
- text = "";
- animTextureNormal = "cse\cse_sys_cc\data\menuIcon.paa";
- animTextureDisabled = "cse\cse_sys_cc\data\menuIcon.paa";
- animTextureOver = "cse\cse_sys_cc\data\menuIcon.paa";
- animTextureFocused = "cse\cse_sys_cc\data\menuIcon.paa";
- animTexturePressed = "cse\cse_sys_cc\data\menuIcon.paa";
- animTextureDefault = "cse\cse_sys_cc\data\menuIcon.paa";
-
- };
-
- class information_label1: cse_gui_staticBase {
- idc = 5;
- style = ST_RIGHT;
- text = "";
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- };
-
- class cse_homeIconNavBarBtn : cse_gui_buttonBase {
- idc = 198;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- color[] = {1.0, 1.0, 1.0, 1};
- color2[] = {1.0, 1.0, 1.0, 1};
- colorBackground[] = {1.0, 1.0, 1.0, 0.7};
- colorbackground2[] = {1.0, 1.0, 1.0, 0.7};
- colorDisabled[] = {1.0, 1.0, 1.0, 0.6};
- colorFocused[] = {1.0, 1.0, 1.0, 1};
- colorBackgroundFocused[] = {1.0, 1.0, 1.0, 1};
- text = "";
- animTextureNormal = "cse\cse_sys_cc\data\home_icon.paa";
- animTextureDisabled = "cse\cse_sys_cc\data\home_icon.paa";
- animTextureOver = "cse\cse_sys_cc\data\home_icon.paa";
- animTextureFocused = "cse\cse_sys_cc\data\home_icon.paa";
- animTexturePressed = "cse\cse_sys_cc\data\home_icon.paa";
- animTextureDefault = "cse\cse_sys_cc\data\home_icon.paa";
-
- };
-
- class cse_navBarIconHome: cse_icon1 {
- idc = 199;
- };
- class cse_navBarIcon1: cse_navBarIconHome {
- idc = 200;
- };
-
-
- class ppDisplay: cse_gui_backgroundBase {
- idc = 20;
- type = 0;
- style = 48;
- text = "";
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- colorText[] = {1,1,1,1};
- colorBackground[] = {0, 0, 0, 0.3};
- font = "TahomaB";
- sizeEx = 0;
- lineSpacing = 0;
- fixedWidth = 0;
- shadow = 0;
- };
- class ppDisplay2: ppDisplay {
- idc = 21;
- };
-
-
- class sideBar_label1: cse_gui_staticBase{
- idc = 40;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = "hi";
- };
- class sideBar_label2: sideBar_label1{
- idc = 41;
- };
- class sideBar_label3: sideBar_label1{
- idc = 42;
- };
- class sideBar_label4: sideBar_label1{
- idc = 43;
- };
- class sideBar_label5: sideBar_label1{
- idc = 44;
- };
- class sideBar_label6: sideBar_label1{
- idc = 45;
- };
- class sideBar_label7: sideBar_label1{
- idc = 46;
- };
- class sideBar_label8: sideBar_label1{
- idc = 47;
- };
- class sideBar_label9: sideBar_label1{
- idc = 48;
- };
- class sideBar_label10: sideBar_label1{
- idc = 49;
- };
-
- class sideBar_cb1: cse_gui_comboBoxBase{
- idc = 50;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- };
- class sideBar_cb2: sideBar_cb1{
- idc = 51;
- };
- class sideBar_lb3: sideBar_cb1{
- idc = 52;
- };
- class sideBar_lb4: sideBar_cb1{
- idc = 53;
- };
- class sideBar_lb5: sideBar_cb1{
- idc = 54;
- };
- class sideBar_lb6: sideBar_cb1{
- idc = 55;
- };
- class sideBar_lb7: sideBar_cb1{
- idc = 56;
- };
- class sideBar_lb8: sideBar_cb1{
- idc = 57;
- };
- class sideBar_lb9: sideBar_cb1{
- idc = 58;
- };
- class sideBar_lb10: sideBar_cb1{
- idc = 59;
- };
-
- class sideBar_button1: cse_gui_buttonBase {
- idc = 60;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- style = ST_CENTER;
- /*animTextureNormal = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureDisabled = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureOver = "cse\cse_sys_cc\data\button_dropdown_menu_hover.paa";
- animTextureFocused = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTexturePressed = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureDefault = "cse\cse_sys_cc\data\button_dropdown_menu.paa";*/
- animTextureNormal = "#(argb,8,8,3)color(0.2,0.2,0.2,1)";
- animTextureDisabled = "#(argb,8,8,3)color(0.4,0.4,0.4,1)";
- animTextureOver = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTextureFocused = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTexturePressed = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTextureDefault = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.9,0.9,0.9,1};
- colorFocused[] = {1,1,1,1};
- color[] = {0.9,0.9,0.9, 1};
- color2[] = {1,1,1, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- };
- class sideBar_button2: sideBar_button1 {
- idc = 61;
- };
- class sideBar_button3: sideBar_button1 {
- idc = 62;
- };
- class sideBar_button4: sideBar_button1 {
- idc = 63;
- };
- class sideBar_button5: sideBar_button1 {
- idc = 64;
- };
- class sideBar_button6: sideBar_button1 {
- idc = 65;
- };
- class sideBar_button7: sideBar_button1 {
- idc = 66;
- };
- class sideBar_button8: sideBar_button1 {
- idc = 67;
- };
- class sideBar_button9: sideBar_button1 {
- idc = 68;
- };
- class sideBar_button10: sideBar_button1 {
- idc = 69;
- };
-
- class main_label1: cse_gui_staticBase{
- idc = 240;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = "";
- style = ST_RIGHT;
- };
- class main_label2: main_label1 {
- idc = 241;
- };
- class main_label3: main_label1 {
- idc = 242;
- };
- class main_label4: main_label1 {
- idc = 243;
- };
- class main_label5: main_label1 {
- idc = 244;
- };
- class main_label6: main_label1 {
- idc = 245;
- };
- class main_label7: main_label1 {
- idc = 246;
- };
- class main_label8: main_label1 {
- idc = 247;
- };
- class main_label9: main_label1 {
- idc = 248;
- };
- class main_label10: main_label1 {
- idc = 249;
- };
-
- class main_combo1: cse_gui_comboBoxBase{
- idc = 250;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- sizeEx = 0.031;
- wholeHeight = 0.9;
- };
- class main_combo2: main_combo1{
- idc = 251;
- };
- class main_combo3: main_combo1{
- idc = 252;
- };
- class main_combo4: main_combo1{
- idc = 253;
- };
- class main_combo5: main_combo1{
- idc = 254;
- };
- class main_combo6: main_combo1{
- idc = 255;
- };
-
- class main_button1: cse_gui_buttonBase {
- idc = 260;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- style = ST_CENTER;
- /*animTextureNormal = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureDisabled = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureOver = "cse\cse_sys_cc\data\button_dropdown_menu_hover.paa";
- animTextureFocused = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTexturePressed = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- animTextureDefault = "cse\cse_sys_cc\data\button_dropdown_menu.paa";
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.9,0.9,0.9,1};
- colorFocused[] = {1,1,1,1};
- color[] = {0.9,0.9,0.9, 1};
- color2[] = {1,1,1, 1};
- colorBackgroundFocused[] = {1,1,1,1};*/
- animTextureNormal = "#(argb,8,8,3)color(0.2,0.2,0.2,1)";
- animTextureDisabled = "#(argb,8,8,3)color(0.4,0.4,0.4,1)";
- animTextureOver = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTextureFocused = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTexturePressed = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- animTextureDefault = "#(argb,8,8,3)color(0.3,0.3,0.3,1)";
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.9,0.9,0.9,1};
- colorFocused[] = {1,1,1,1};
- color[] = {0.9,0.9,0.9, 1};
- color2[] = {1,1,1, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- };
- class main_button2: main_button1 {
- idc = 261;
- };
- class main_button3: main_button1 {
- idc = 262;
- };
- class main_button4: main_button1 {
- idc = 263;
- };
- class main_button5: main_button1 {
- idc = 264;
- };
- class main_button6: main_button1 {
- idc = 265;
- };
- class main_button7: main_button1 {
- idc = 266;
- };
- class main_button8: main_button1 {
- idc = 267;
- };
- class main_button9: main_button1 {
- idc = 268;
- };
- class main_button10: main_button1 {
- idc = 269;
- };
- class main_inputField1: cse_gui_editBase
- {
- idc = 270;
- x = 100;
- y = 100;
- h = 0.05;
- w = 0.05;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- text = "";
- autocomplete = "";
- font = "PuristaMedium";
- colorBackground[] = { 0, 0, 0, 1};
- colorText[] = { 1, 1, 1, 1};
- colorDisabled[] = { 1, 1, 1, 0.25};
- colorSelection[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 1};
- colorActive[] = {1,1,1,1};
- tooltip = "";
- canModify = 1;
- };
- class main_inputField2: main_inputField1
- {
- idc = 271;
- };
- class main_inputField3: main_inputField1
- {
- idc = 272;
- };
- class main_inputField4: main_inputField1
- {
- idc = 273;
- };
- class main_inputField5: main_inputField1
- {
- idc = 274;
- };
- class main_inputField6: main_inputField1
- {
- idc = 275;
- };
-
- class main_lb1: cse_gui_listBoxBase{
- idc = 280;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- };
- class main_lb2: main_lb1{
- idc = 281;
- };
- class main_lb3: main_lb1{
- idc = 282;
- };
- class main_lb4: main_lb1{
- idc = 283;
- };
-
- class listBox_APP1: cse_gui_listBoxBase{
- idc=601;
- x = 100;
- y = 100;
- w = 1;
- h = 1;
- sizeEx = 0.032;
- rowHeight = 0.03;
- color[] = {0.9,0.9,0.9, 1};
- colorText[] = {0.9,0.9,0.9, 1};
- colorScrollbar[] = {0.9,0.9,0.9, 1};
- colorSelect[] = {0.9,0.9,0.9, 1};
- colorSelect2[] = {0.9,0.9,0.9, 1};
- colorSelectBackground[] = {0.2,0.2,0.2, 1};
- colorSelectBackground2[] = {0.2,0.2,0.2, 1};
- colorBackground[] = {0.1, 0.1, 0.1, 1};
- };
- class app_extraBackground: cse_gui_backgroundBase {
- idc = 602;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- type = CT_STATIC;
- style = ST_LEFT + ST_SHADOW;
- text = "";
- colorText[] = {0.95,0.95,0.95,1};
- colorBackground[] = {0.9,0.9,0.9,1};
- };
- class app_labelTitle: cse_gui_staticBase{
- idc = 603;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = "";
- style = ST_CENTER;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.1,0.1,0.1, 1};
- };
-
- class labelDesc: cse_gui_staticBase {
- idc = 604;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = "";
- style = ST_LEFT + ST_MULTI;
- lineSpacing = 1;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.1,0.1,0.1, 1};
- };
-
- class labelNoSignal: cse_gui_staticBase {
- idc = 605;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = "NO SIGNAL";
- style = ST_LEFT;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.1,0.1,0.1, 1};
- };
-
- class loadScreenBackground: cse_gui_backgroundBase {
- idc = 607;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- type = CT_STATIC;
- style = ST_LEFT + ST_SHADOW;
- text = "";
- colorText[] = {0.95,0.95,0.95,1};
- colorBackground[] = {0.9,0.9,0.9,1};
- };
-
- class Progress_Bar1: cse_gui_RscProgress {
- idc = 606;
- x = "100 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "100 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- colorFrame[] = {0,0,0,1};
- colorBar[] = {0.27,0.5,0.31,0.6};
- // colorBar[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- texture = "#(argb,8,8,3)color(1,1,1,0.7)";
- };
- class loadingScreen_Label: cse_gui_staticBase{
- idc = 608;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = "";
- style = ST_CENTER;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.1,0.1,0.1, 1};
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/ui/cse_m_tablet_uk.hpp b/TO_MERGE/cse/sys_cc/ui/cse_m_tablet_uk.hpp
deleted file mode 100644
index 2fd77046bc..0000000000
--- a/TO_MERGE/cse/sys_cc/ui/cse_m_tablet_uk.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-class cse_m_tablet_uk : cse_m_tablet {
- //idd = 590824;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_m_tablet_uk', _this select 0]; ['cse_m_tablet_uk', true] call cse_fnc_gui_blurScreen;";
- onUnload = " ['cse_m_tablet_uk', false] call cse_fnc_gui_blurScreen;";
-
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = -0.7;
- y = -0.3;
- w = 2.35;
- h = 1.55;
- text = "cse\cse_sys_cc\data\uk_tablet.paa";
- };
- };
-};
-
-class cse_m_tablet_o : cse_m_tablet {
- //idd = 590824;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_m_tablet_o', _this select 0]; ['cse_m_tablet_o', true] call cse_fnc_gui_blurScreen;";
- onUnload = " ['cse_m_tablet_o', false] call cse_fnc_gui_blurScreen;";
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = -0.7;
- y = -0.3;
- w = 2.35;
- h = 1.55;
- text = "cse\cse_sys_cc\data\m_tablet.paa";
- };
- };
-};
-
-class cse_m_pda_o : cse_m_pda {
- //idd = 590824;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_m_pda_o', _this select 0]; ['cse_m_pda_o', true] call cse_fnc_gui_blurScreen;";
- onUnload = " ['cse_m_pda_o', false] call cse_fnc_gui_blurScreen;";
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = -0.7;
- y = -0.3;
- w = 2.35;
- h = 1.55;
- text = "cse\cse_sys_cc\data\m_pda.paa";
- };
- };
-};
-
-class cse_m_tablet_g : cse_m_tablet {
- //idd = 590824;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_m_tablet_g', _this select 0]; ['cse_m_tablet_g', true] call cse_fnc_gui_blurScreen;";
- onUnload = " ['cse_m_tablet_g', false] call cse_fnc_gui_blurScreen;";
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = -0.7;
- y = -0.3;
- w = 2.35;
- h = 1.55;
- text = "cse\cse_sys_cc\data\m_tablet.paa";
- };
- };
-};
-
-class cse_m_pda_g : cse_m_pda {
- //idd = 590824;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_m_pda_g', _this select 0]; ['cse_m_pda_g', true] call cse_fnc_gui_blurScreen;";
- onUnload = " ['cse_m_pda_g', false] call cse_fnc_gui_blurScreen;";
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = -0.7;
- y = -0.3;
- w = 2.35;
- h = 1.55;
- text = "cse\cse_sys_cc\data\m_pda.paa";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/ui/cse_view_small.hpp b/TO_MERGE/cse/sys_cc/ui/cse_view_small.hpp
deleted file mode 100644
index b178e66556..0000000000
--- a/TO_MERGE/cse/sys_cc/ui/cse_view_small.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-class cse_view_small: cse_m_tablet {
- onLoad = "uiNamespace setVariable ['cse_view_small', _this select 0];";
- duration = 10e10;
- fadein = 0;
- fadeout = 0;
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = 3;
- y = 2;
- w = 1;
- h = 0.5;
- text = "";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/ui/define.hpp b/TO_MERGE/cse/sys_cc/ui/define.hpp
deleted file mode 100644
index c521de470f..0000000000
--- a/TO_MERGE/cse/sys_cc/ui/define.hpp
+++ /dev/null
@@ -1,797 +0,0 @@
-
-#ifndef CSE_DEFINE_H
-#define CSE_DEFINE_H
-// define.hpp
-
-#define true 1
-#define false 0
-
-#define CT_STATIC 0
-#define CT_BUTTON 1
-#define CT_EDIT 2
-#define CT_SLIDER 3
-#define CT_COMBO 4
-#define CT_LISTBOX 5
-#define CT_TOOLBOX 6
-#define CT_CHECKBOXES 7
-#define CT_PROGRESS 8
-#define CT_HTML 9
-#define CT_STATIC_SKEW 10
-#define CT_ACTIVETEXT 11
-#define CT_TREE 12
-#define CT_STRUCTURED_TEXT 13
-#define CT_CONTEXT_MENU 14
-#define CT_CONTROLS_GROUP 15
-#define CT_SHORTCUTBUTTON 16
-#define CT_XKEYDESC 40
-#define CT_XBUTTON 41
-#define CT_XLISTBOX 42
-#define CT_XSLIDER 43
-#define CT_XCOMBO 44
-#define CT_ANIMATED_TEXTURE 45
-#define CT_OBJECT 80
-#define CT_OBJECT_ZOOM 81
-#define CT_OBJECT_CONTAINER 82
-#define CT_OBJECT_CONT_ANIM 83
-#define CT_LINEBREAK 98
-#define CT_ANIMATED_USER 99
-#define CT_MAP 100
-#define CT_MAP_MAIN 101
-#define CT_LISTNBOX 102
-
-// Static styles
-#define ST_POS 0x0F
-#define ST_HPOS 0x03
-#define ST_VPOS 0x0C
-#define ST_LEFT 0x00
-#define ST_RIGHT 0x01
-#define ST_CENTER 0x02
-#define ST_DOWN 0x04
-#define ST_UP 0x08
-#define ST_VCENTER 0x0c
-
-#define ST_TYPE 0xF0
-#define ST_SINGLE 0
-#define ST_MULTI 16
-#define ST_TITLE_BAR 32
-#define ST_PICTURE 48
-#define ST_FRAME 64
-#define ST_BACKGROUND 80
-#define ST_GROUP_BOX 96
-#define ST_GROUP_BOX2 112
-#define ST_HUD_BACKGROUND 128
-#define ST_TILE_PICTURE 144
-#define ST_WITH_RECT 160
-#define ST_LINE 176
-
-#define ST_SHADOW 0x100
-#define ST_NO_RECT 0x200 // this style works for CT_STATIC in conjunction with ST_MULTI
-#define ST_KEEP_ASPECT_RATIO 0x800
-
-#define ST_TITLE ST_TITLE_BAR + ST_CENTER
-
-// Slider styles
-#define SL_DIR 0x400
-#define SL_VERT 0
-#define SL_HORZ 0x400
-
-#define SL_TEXTURES 0x10
-
-// Listbox styles
-#define LB_TEXTURES 0x10
-#define LB_MULTI 0x20
-#define FontCSE "PuristaMedium"
-
-class cse_gui_backgroundBase {
- type = CT_STATIC;
- idc = -1;
- style = ST_PICTURE;
- colorBackground[] = {0,0,0,0};
- colorText[] = {1, 1, 1, 1};
- font = FontCSE;
- text = "";
- sizeEx = 0.032;
-};
-class cse_gui_editBase
-{
- access = 0;
- type = 2;
- x = 0;
- y = 0;
- h = 0.04;
- w = 0.2;
- colorBackground[] =
- {
- 0,
- 0,
- 0,
- 1
- };
- colorText[] =
- {
- 0.95,
- 0.95,
- 0.95,
- 1
- };
- colorSelection[] =
- {
- "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])",
- 1
- };
- autocomplete = "";
- text = "";
- size = 0.2;
- style = "0x00 + 0x40";
- font = "PuristaMedium";
- shadow = 2;
- sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorDisabled[] =
- {
- 1,
- 1,
- 1,
- 0.25
- };
-};
-
-
-
-class cse_gui_buttonBase {
- idc = -1;
- type = 16;
- style = ST_LEFT;
- text = "";
- action = "";
- x = 0.0;
- y = 0.0;
- w = 0.25;
- h = 0.04;
- size = 0.03921;
- sizeEx = 0.03921;
- color[] = {1.0, 1.0, 1.0, 1};
- color2[] = {1.0, 1.0, 1.0, 1};
- /*colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.5])"};
- colorbackground2[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.4};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- colorFocused[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])", 0.8};
- colorBackgroundFocused[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.8};
- */
-
- colorBackground[] = {1,1,1,0.95};
- colorbackground2[] = {1,1,1,0.95};
- colorDisabled[] = {1,1,1,0.6};
- colorFocused[] = {1,1,1,1};
- colorBackgroundFocused[] = {1,1,1,1};
- periodFocus = 1.2;
- periodOver = 0.8;
- default = false;
- class HitZone {
- left = 0.00;
- top = 0.00;
- right = 0.00;
- bottom = 0.00;
- };
-
- class ShortcutPos {
- left = 0.00;
- top = 0.00;
- w = 0.00;
- h = 0.00;
- };
-
- class TextPos {
- left = 0.002;
- top = 0.0004;
- right = 0.0;
- bottom = 0.00;
- };
- textureNoShortcut = "";
- animTextureNormal = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDisabled = "cse\cse_gui\data\buttonDisabled_gradient.paa";
- animTextureOver = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureFocused = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTexturePressed = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDefault = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- period = 0.5;
- font = FontCSE;
- soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
- soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0};
- soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1};
- soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
- class Attributes {
- font = FontCSE;
- color = "#E5E5E5";
- align = "center";
- shadow = "true";
- };
- class AttributesImage {
- font = FontCSE;
- color = "#E5E5E5";
- align = "left";
- shadow = "true";
- };
-};
-
-class cse_gui_RscProgress {
- type = 8;
- style = 0;
- colorFrame[] = {1,1,1,0.7};
- colorBar[] = {1,1,1,0.7};
- texture = "#(argb,8,8,3)color(1,1,1,0.7)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-};
-
-
-class cse_gui_staticBase {
- idc = -1;
- type = CT_STATIC;
- x = 0.0;
- y = 0.0;
- w = 0.183825;
- h = 0.104575;
- style = ST_LEFT;
- font = FontCSE;
- sizeEx = 0.03921;
- colorText[] = {0.95, 0.95, 0.95, 1.0};
- colorBackground[] = {0, 0, 0, 0};
- text = "";
-};
-
-class RscListBox;
-class cse_gui_listBoxBase : RscListBox{
- type = CT_LISTBOX;
- style = ST_MULTI;
- font = FontCSE;
- sizeEx = 0.03921;
- color[] = {1, 1, 1, 1};
- colorText[] = {0.543, 0.5742, 0.4102, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 1};
- colorSelectBackground2[] = {0.543, 0.5742, 0.4102, 1.0};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- period = 1.2;
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 1};
- maxHistoryDelay = 1.0;
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- soundSelect[] = {"",0.1,1};
- soundExpand[] = {"",0.1,1};
- soundCollapse[] = {"",0.1,1};
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
- class ScrollBar {
- color[] = {1, 1, 1, 0.6};
- colorActive[] = {1, 1, 1, 1};
- colorDisabled[] = {1, 1, 1, 0.3};
- thumb = "";
- arrowFull = "";
- arrowEmpty = "";
- border = "";
- };
-};
-
-
-class cse_gui_listNBox {
- access = 0;
- type = CT_LISTNBOX;// 102;
- style =ST_MULTI;
- w = 0.4;
- h = 0.4;
- font = FontCSE;
- sizeEx = 0.031;
-
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- columns[] = {0.0};
- color[] = {1, 1, 1, 1};
-
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.5};
- colorActive[] = {0,0,0,1};
- colorDisabled[] = {0,0,0,0.3};
- rows = 1;
-
- drawSideArrows = 0;
- idcLeft = -1;
- idcRight = -1;
- maxHistoryDelay = 1;
- soundSelect[] = {"", 0.1, 1};
- period = 1;
- shadow = 2;
- class ScrollBar {
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- border = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- thumb = "#(argb,8,8,3)color(1,1,1,1)";
- };
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-class RscCombo;
-class cse_gui_comboBoxBase: RscCombo {
- idc = -1;
- type = 4;
- style = "0x10 + 0x200";
- x = 0;
- y = 0;
- w = 0.3;
- h = 0.035;
- color[] = {0,0,0,0.6};
- colorActive[] = {1,0,0,1};
- colorBackground[] = {0,0,0,1};
- colorDisabled[] = {1,1,1,0.25};
- colorScrollbar[] = {1,0,0,1};
- colorSelect[] = {0,0,0,1};
- colorSelectBackground[] = {1,1,1,0.7};
- colorText[] = {1,1,1,1};
-
- arrowEmpty = "";
- arrowFull = "";
- wholeHeight = 0.45;
- font = FontCSE;
- sizeEx = 0.031;
- soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1};
- soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1};
- soundCollapse[] = {"\A3\ui_f\data\sound\RscCombo\soundCollapse",0.1,1};
- maxHistoryDelay = 1.0;
- class ScrollBar
- {
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- border = "";
- };
- class ComboScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-
-class cse_gui_mapBase {
- moveOnEdges = 1;
- x = "SafeZoneXAbs";
- y = "SafeZoneY + 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "SafeZoneWAbs";
- h = "SafeZoneH - 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- type = 100; // Use 100 to hide markers
- style = 48;
- shadow = 0;
-
- ptsPerSquareSea = 5;
- ptsPerSquareTxt = 3;
- ptsPerSquareCLn = 10;
- ptsPerSquareExp = 10;
- ptsPerSquareCost = 10;
- ptsPerSquareFor = 9;
- ptsPerSquareForEdge = 9;
- ptsPerSquareRoad = 6;
- ptsPerSquareObj = 9;
- showCountourInterval = 0;
- scaleMin = 0.001;
- scaleMax = 1.0;
- scaleDefault = 0.16;
- maxSatelliteAlpha = 0.85;
- alphaFadeStartScale = 0.35;
- alphaFadeEndScale = 0.4;
- colorBackground[] = {0.969,0.957,0.949,1.0};
- colorSea[] = {0.467,0.631,0.851,0.5};
- colorForest[] = {0.624,0.78,0.388,0.5};
- colorForestBorder[] = {0.0,0.0,0.0,0.0};
- colorRocks[] = {0.0,0.0,0.0,0.3};
- colorRocksBorder[] = {0.0,0.0,0.0,0.0};
- colorLevels[] = {0.286,0.177,0.094,0.5};
- colorMainCountlines[] = {0.572,0.354,0.188,0.5};
- colorCountlines[] = {0.572,0.354,0.188,0.25};
- colorMainCountlinesWater[] = {0.491,0.577,0.702,0.6};
- colorCountlinesWater[] = {0.491,0.577,0.702,0.3};
- colorPowerLines[] = {0.1,0.1,0.1,1.0};
- colorRailWay[] = {0.8,0.2,0.0,1.0};
- colorNames[] = {0.1,0.1,0.1,0.9};
- colorInactive[] = {1.0,1.0,1.0,0.5};
- colorOutside[] = {0.0,0.0,0.0,1.0};
- colorTracks[] = {0.84,0.76,0.65,0.15};
- colorTracksFill[] = {0.84,0.76,0.65,1.0};
- colorRoads[] = {0.7,0.7,0.7,1.0};
- colorRoadsFill[] = {1.0,1.0,1.0,1.0};
- colorMainRoads[] = {0.9,0.5,0.3,1.0};
- colorMainRoadsFill[] = {1.0,0.6,0.4,1.0};
- colorGrid[] = {0.1,0.1,0.1,0.6};
- colorGridMap[] = {0.1,0.1,0.1,0.6};
- colorText[] = {1, 1, 1, 0.85};
-font = "PuristaMedium";
-sizeEx = 0.0270000;
-stickX[] = {0.20, {"Gamma", 1.00, 1.50} };
-stickY[] = {0.20, {"Gamma", 1.00, 1.50} };
-onMouseButtonClick = "";
-onMouseButtonDblClick = "";
-
- fontLabel = "PuristaMedium";
- sizeExLabel = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontGrid = "TahomaB";
- sizeExGrid = 0.02;
- fontUnits = "TahomaB";
- sizeExUnits = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontNames = "PuristaMedium";
- sizeExNames = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2";
- fontInfo = "PuristaMedium";
- sizeExInfo = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontLevel = "TahomaB";
- sizeExLevel = 0.02;
- text = "#(argb,8,8,3)color(1,1,1,1)";
- class ActiveMarker {
- color[] = {0.30, 0.10, 0.90, 1.00};
- size = 50;
- };
- class Legend
- {
- x = "SafeZoneX + ( ((safezoneW / safezoneH) min 1.2) / 40)";
- y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
- h = "3.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- font = "PuristaMedium";
- sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- colorBackground[] = {1,1,1,0.5};
- color[] = {0,0,0,1};
- };
- class Task
- {
- icon = "\A3\ui_f\data\map\mapcontrol\taskIcon_CA.paa";
- iconCreated = "\A3\ui_f\data\map\mapcontrol\taskIconCreated_CA.paa";
- iconCanceled = "\A3\ui_f\data\map\mapcontrol\taskIconCanceled_CA.paa";
- iconDone = "\A3\ui_f\data\map\mapcontrol\taskIconDone_CA.paa";
- iconFailed = "\A3\ui_f\data\map\mapcontrol\taskIconFailed_CA.paa";
- color[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])"};
- colorCreated[] = {1,1,1,1};
- colorCanceled[] = {0.7,0.7,0.7,1};
- colorDone[] = {0.7,1,0.3,1};
- colorFailed[] = {1,0.3,0.2,1};
- size = 27;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- };
- class Waypoint
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class WaypointCompleted
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypointCompleted_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class CustomMark
- {
- icon = "\A3\ui_f\data\map\mapcontrol\custommark_ca.paa";
- size = 24;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {0,0,0,1};
- };
- class Command
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- size = 18;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {1,1,1,1};
- };
- class Bush
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = "14/2";
- importance = "0.2 * 14 * 0.05 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Rock
- {
- icon = "\A3\ui_f\data\map\mapcontrol\rock_ca.paa";
- color[] = {0.1,0.1,0.1,0.8};
- size = 12;
- importance = "0.5 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class SmallTree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.6 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Tree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.9 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class busstop
- {
- icon = "\A3\ui_f\data\map\mapcontrol\busstop_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class fuelstation
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fuelstation_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class hospital
- {
- icon = "\A3\ui_f\data\map\mapcontrol\hospital_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class church
- {
- icon = "\A3\ui_f\data\map\mapcontrol\church_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class lighthouse
- {
- icon = "\A3\ui_f\data\map\mapcontrol\lighthouse_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class power
- {
- icon = "\A3\ui_f\data\map\mapcontrol\power_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powersolar
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powersolar_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwave
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwave_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwind
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwind_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class quay
- {
- icon = "\A3\ui_f\data\map\mapcontrol\quay_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class shipwreck
- {
- icon = "\A3\ui_f\data\map\mapcontrol\shipwreck_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class transmitter
- {
- icon = "\A3\ui_f\data\map\mapcontrol\transmitter_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class watertower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\watertower_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class Cross
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Cross_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Chapel
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Chapel_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Bunker
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 14;
- importance = "1.5 * 14 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fortress
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 16;
- importance = "2 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fountain
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fountain_ca.paa";
- size = 11;
- importance = "1 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Ruin
- {
- icon = "\A3\ui_f\data\map\mapcontrol\ruin_ca.paa";
- size = 16;
- importance = "1.2 * 16 * 0.05";
- coefMin = 1;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Stack
- {
- icon = "\A3\ui_f\data\map\mapcontrol\stack_ca.paa";
- size = 20;
- importance = "2 * 16 * 0.05";
- coefMin = 0.9;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Tourism
- {
- icon = "\A3\ui_f\data\map\mapcontrol\tourism_ca.paa";
- size = 16;
- importance = "1 * 16 * 0.05";
- coefMin = 0.7;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class ViewTower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\viewtower_ca.paa";
- size = 16;
- importance = "2.5 * 16 * 0.05";
- coefMin = 0.5;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
-};
-
-#endif
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/ui/m_flight_display.h b/TO_MERGE/cse/sys_cc/ui/m_flight_display.h
deleted file mode 100644
index 38eb69cbe5..0000000000
--- a/TO_MERGE/cse/sys_cc/ui/m_flight_display.h
+++ /dev/null
@@ -1,62 +0,0 @@
-class cse_m_flight_display {
- idd = 590823;
- movingEnable = false;
- onLoad = "uiNamespace setVariable ['cse_m_flight_display', _this select 0]; ['cse_m_flight_display', true] call cse_fnc_gui_blurScreen;";
- onUnload = "['cse_m_flight_display', false] call cse_fnc_gui_blurScreen;";
-
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = "5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "-1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "30 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "30 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "cse\cse_sys_cc\data\m_flight_display.paa";
- };
- };
- class controls {
-
- class mapDisplay: cse_gui_mapBase {
- idc = 10;
- x = "11.75 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "16.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "22 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- type = 101;
- moveOnEdges = 0;
- showCountourInterval = 1;
- };
- };
-};
-
-
-class cse_m_vehicle_display {
- idd = 590823;
- movingEnable = false;
- onLoad = "uiNamespace setVariable ['cse_m_vehicle_display', _this select 0]; ['cse_m_vehicle_display', true] call cse_fnc_gui_blurScreen;";
- onUnload = "['cse_m_vehicle_display', false] call cse_fnc_gui_blurScreen;";
-
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = "-5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "-1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "55 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "30 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "cse\cse_sys_cc\data\m_vehicle_display.paa";
- };
- };
- class controls {
-
- class mapDisplay: cse_gui_mapBase {
- idc = 10;
- x = "8.75 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "27.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "22 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- type = 101;
- moveOnEdges = 0;
- showCountourInterval = 1;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_canUseOnBoard_BFT_Device_CC.sqf b/TO_MERGE/cse/sys_cc/vehicles/functions/fn_canUseOnBoard_BFT_Device_CC.sqf
deleted file mode 100644
index b37a55d2b9..0000000000
--- a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_canUseOnBoard_BFT_Device_CC.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_canUseOnBoard_BFT_Device_CC.sqf
- * @Descr: Check if unit can use on board BFT device from given vehicle.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, vehicle OBJECT]
- * @Return: BOOL True if unit can use on Board BFT Device from vehicle
- * @PublicAPI: true
- */
-
-private ["_unit", "_vehicle", "_info"];
-_unit = _this select 0;
-_vehicle = _this select 1;
-
-if (_vehicle isKindOf "CAManBase") exitwith {false};
-if !([_unit] call cse_fnc_canInteract) exitwith {false};
-if !([_vehicle] call cse_fnc_hasFlightDisplay_CC) exitwith {false};
-if !(isEngineOn _vehicle) exitwith {false};
-
-(vehicle _unit == _vehicle && {!(_unit in assignedCargo _vehicle)});
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_drawBFTIcons_Vehicles_CC.sqf b/TO_MERGE/cse/sys_cc/vehicles/functions/fn_drawBFTIcons_Vehicles_CC.sqf
deleted file mode 100644
index 95bd2a2b9e..0000000000
--- a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_drawBFTIcons_Vehicles_CC.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * fn_drawBFTIcons_Vehicles_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_trackerInfo", "_icon", "_pos", "_text", "_unit", "_side", "_color", "_map"];
-_trackerInfo = _this select 0;
-_map = _this select 1;
-
-_icon = _trackerInfo select 0;
-_pos = _trackerInfo select 1;
-_text = _trackerInfo select 2;
-_unit = _trackerInfo select 5;
-_side = _trackerInfo select 6;
-
-if ((side CSE_CURRENT_VEHICLE_BFT_DISPLAY_CC) == _side) then {
- if (!CSE_TOGGLE_CALLSIGNS_CC) then {
- _text = "";
- };
- _color = _trackerInfo select 3;
- if (_unit == CSE_CURRENT_VEHICLE_BFT_DISPLAY_CC) then {_color = [0.78,0.8,0.1,1]; };
- _map drawIcon [_icon,_color, _pos, 30, 30, 0, _text, 0, 0.05, 'PuristaMedium', 'right'];
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_drawBFTMarker_Vehicles_CC.sqf b/TO_MERGE/cse/sys_cc/vehicles/functions/fn_drawBFTMarker_Vehicles_CC.sqf
deleted file mode 100644
index 7591f85580..0000000000
--- a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_drawBFTMarker_Vehicles_CC.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_drawBFTMarker_Vehicles_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private [ "_marker", "_map"];
-_marker = _this select 0;
-if !(_marker isEqualTo []) then {
- _pos = _marker select 0;
- _args = _marker select 1;
- _icon = _args select 0;
- _text = _args select 1;
- _color = _args select 2;
-
- _timeOfPlacement = _marker select 2;
- _side = _marker select 3;
- if ((side CSE_CURRENT_VEHICLE_BFT_DISPLAY_CC) == _side) then {
- (_this select 1) drawIcon [_icon,_color, _pos, 30, 30, 0, _text, 0, 0.05, 'PuristaMedium', 'right'];
- };
-};
diff --git a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_hasFlightDisplay_CC.sqf b/TO_MERGE/cse/sys_cc/vehicles/functions/fn_hasFlightDisplay_CC.sqf
deleted file mode 100644
index 90dfc20722..0000000000
--- a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_hasFlightDisplay_CC.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * fn_hasFlightDisplay_CC.sqf
- * @Descr: Check if vehicle has an onboard BFT display. Works for aircraft and other vehicles.
- * @Author: Glowbal
- *
- * @Arguments: [vehicle OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_vehicle"];
-_vehicle = _this select 0;
-
-if (alive _vehicle) then {
- if (_vehicle isKindOf "CAManBase") exitwith {false};
- if (_vehicle getvariable ["cse_disableVehicleDisplay_CC", false]) exitwith {false};
- if !(CSE_ALLOW_VEHICLE_DISPLAYS_CC) exitwith {false};
- _info = _vehicle getvariable "cse_bft_info_cc";
- if (isnil "_info") exitwith {false};
- true;
-} else {
- false;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_openFlight_Display_CC.sqf b/TO_MERGE/cse/sys_cc/vehicles/functions/fn_openFlight_Display_CC.sqf
deleted file mode 100644
index c58d32ecb5..0000000000
--- a/TO_MERGE/cse/sys_cc/vehicles/functions/fn_openFlight_Display_CC.sqf
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * fn_openFlight_Display_CC.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_vehicle", "_displayName"];
-_vehicle = _this select 0;
-
-if !([player, _vehicle] call cse_fnc_canUseOnBoard_BFT_Device_CC) exitWith {};
-
-_displayName = "cse_m_flight_display";
-
-if !(_vehicle isKindOf "Air") then {
- _displayName = "cse_m_vehicle_display";
-};
-
-createDialog _displayName;
-CSE_CURRENT_VEHICLE_BFT_DISPLAY_CC = _vehicle;
-
-if (isnil "CSE_CURRENT_SELECTED_FILTER_CC_APP_CC") then {
- CSE_CURRENT_SELECTED_FILTER_CC_APP_CC = -1;
- CSE_TOGGLE_ROUTE_LAYER_CC = true;
- CSE_TOGGLE_INTEL_LAYER_CC = true;
- CSE_TOGGLE_CALLSIGNS_CC = true;
- CSE_SELECTED_ICON_CC = "";
-};
-
-if (isnil "CSE_INTEL_MARKER_COLLECTION_CC") then {
- CSE_INTEL_MARKER_COLLECTION_CC = [];
-};
-if (isnil "CSE_ROUTE_MARKER_COLLECTION_CC") then {
- CSE_ROUTE_MARKER_COLLECTION_CC = [];
-};
-if (isnil "CSE_TRACKER_ICONS") then {
- CSE_TRACKER_ICONS = [];
-};
-
-CSE_CURRENT_VEHICLE_BFT_DISPLAY_ICON_CC = getText(configFile >> "CfgVehicles" >> typeOf _vehicle >> "icon");
-
-disableSerialization;
-_display = uiNamespace getvariable _displayName;
-
-(_display displayCtrl 10) ctrlAddEventHandler ["draw","
- {[_x,(_this select 0)] call cse_fnc_drawBFTIcons_Vehicles_CC;}foreach CSE_TRACKER_ICONS;
- if (CSE_TOGGLE_INTEL_LAYER_CC) then {{[_x,(_this select 0)] call cse_fnc_drawBFTMarker_Vehicles_CC;}foreach CSE_INTEL_MARKER_COLLECTION_CC;};
- if (CSE_TOGGLE_ROUTE_LAYER_CC) then {{[_x,(_this select 0)] call cse_fnc_drawBFTMarker_Vehicles_CC;}foreach CSE_ROUTE_MARKER_COLLECTION_CC;};
- "];
diff --git a/TO_MERGE/cse/sys_combatdeaf/CfgFunctions.h b/TO_MERGE/cse/sys_combatdeaf/CfgFunctions.h
deleted file mode 100644
index e5c097e69c..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/CfgFunctions.h
+++ /dev/null
@@ -1,18 +0,0 @@
-class CfgFunctions {
- class CSE {
- class combatdeaf {
- file = "cse\cse_sys_combatdeaf\functions";
- class handleFiredNear_DEAF { recompile = 1; };
- class handleFired_DEAF { recompile = 1; };
- class getAttenuation_DEAF { recompile = 1; };
- class applyEletronicEarProtection_DEAF { recompile = 1; };
- class explosion_DEAF { recompile = 1; };
- class handlePressureWave_DEAF { recompile = 1; };
- class getIn_DEAF { recompile = 1; };
- class getOut_DEAF { recompile = 1; };
- class register_ear_protection_actions_DEAF { recompile = 1; };
- class getMuzzleAccessory_DEAF { recompile = 1; };
- class hasMuzzleAccessory_DEAF { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/CfgSounds.h b/TO_MERGE/cse/sys_combatdeaf/CfgSounds.h
deleted file mode 100644
index 6230b98a63..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/CfgSounds.h
+++ /dev/null
@@ -1,9 +0,0 @@
-class CfgSounds
-{
- class cse_combatdeaf_ear_ringing
- {
- name="cse_combatdeaf_ear_ringing";
- sound[]={"\cse\cse_sys_combatdeaf\sound\ear_ringing.ogg",1,1};
- titles[]={};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/CfgVehicles.h b/TO_MERGE/cse/sys_combatdeaf/CfgVehicles.h
deleted file mode 100644
index c844679424..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/CfgVehicles.h
+++ /dev/null
@@ -1,85 +0,0 @@
-class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class cse_sys_combatdeaf: Module_F {
- scope = 2;
- displayName = "Combat Deafness [CSE]";
- icon = "\cse\cse_main\data\cse_earmuffs_module.paa";
- category = "cseModules";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- class DEAFNESS_EFFECT_INTENSITY {
- displayName = "Deafness effect intensity";
- description = "Allows to tune down the deafness effect (2.0 - dual intensity, 1.0 - default intensity, 0.5 - half intensity)";
- typeName = "NUMBER";
- defaultValue = 1;
- };
- class DISABLE_EAR_RINGING {
- displayName = "Disable ear ringing";
- description = "Disables the ear ringing effect";
- typeName = "BOOL";
- defaultValue = 0;
- };
- };
- class ModuleDescription {
- description = "Combat deafness";
- };
- };
-
- class Item_Base_F;
- class cse_earplugsItem: Item_Base_F
- {
- scope = 2;
- scopeCurator = 2;
- displayName = "Earplugs";
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_earplugs
- {
- name = "cse_earplugs";
- count = 1;
- };
- };
- };
- class cse_earplugs_electronicItem: cse_earplugsItem
- {
- class TransportItems
- {
- class cse_earplugs_electronic
- {
- name = "cse_earplugs_electronic";
- count = 1;
- };
- };
- };
-
- class NATO_Box_Base;
- class cse_crateCombatDeafness: NATO_Box_Base
- {
- scope = 2;
- displayName = "Earplugs Crate [CSE]";
- author = "Combat Space Enhancement";
- model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
- class TransportWeapons
- {
- class _xx_cse_earplugs
- {
- weapon="cse_earplugs";
- count=50;
- };
- class _xx_cse_earplugs_electronic
- {
- weapon="cse_earplugs_electronic";
- count=10;
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_combatdeaf/CfgWeapons.h b/TO_MERGE/cse/sys_combatdeaf/CfgWeapons.h
deleted file mode 100644
index e7568824b0..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/CfgWeapons.h
+++ /dev/null
@@ -1,27 +0,0 @@
-class CfgWeapons {
- class ItemCore;
- class InventoryItem_Base_F;
- class cse_earplugs: ItemCore
- {
- scope=2;
- value = 1;
- count = 1;
- type = 16;
- displayName="Earplugs";
- model="\cse\cse_sys_combatdeaf\equipment\earplugs_simple.p3d";
- picture="\cse\cse_sys_combatdeaf\equipment\icons\earplugs_simple_icon.paa";
- descriptionShort="Earplugs";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=0.01;
- type=201;
- };
- };
- class cse_earplugs_electronic: cse_earplugs
- {
- displayName="Electronic earplugs";
- model="\cse\cse_sys_combatdeaf\equipment\earplugs_electronic.p3d";
- picture="\cse\cse_sys_combatdeaf\equipment\icons\earplugs_electronic_icon.paa";
- descriptionShort="Eletronic earplugs";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_combatdeaf/Combat_Space_Enhancement.h
deleted file mode 100644
index 3efadef3bd..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,14 +0,0 @@
-class Combat_Space_Enhancement {
- class CfgModules {
- class cse_sys_combatdeaf {
- init = "call compile preprocessFile 'cse\cse_sys_combatdeaf\init_sys_combatdeaf.sqf';";
- name = "Combat Deafness";
- class EventHandlers {
- class AllVehicles {
- GetIn = "call cse_fnc_getIn_DEAF; false";
- GetOut = "call cse_fnc_getOut_DEAF; false";
- };
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/config.cpp b/TO_MERGE/cse/sys_combatdeaf/config.cpp
deleted file mode 100644
index 372d5fa9ae..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/config.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-class CfgPatches {
- class cse_sys_combatdeaf {
- units[] = {"cse_crateCombatDeafness", "cse_earplugsItem", "cse_earplugs_electronicItem"};
- weapons[] = {};
- requiredVersion = 1.0;
- requiredAddons[] = {"cse_f_eh","cse_main"};
- versionDesc = "CSE Combat Deafness";
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-class cse_sys_combatdeaf {
- class PreloadAddons {
- class cse_sys_combatdeaf {
- list[] = {"cse_sys_combatdeaf"};
- };
- };
-};
-
-#include "CfgVehicles.h"
-#include "CfgWeapons.h"
-#include "CfgSounds.h"
-#include "CfgFunctions.h"
-#include "Combat_Space_Enhancement.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/data/cse_combatdeaf_deafness.paa b/TO_MERGE/cse/sys_combatdeaf/data/cse_combatdeaf_deafness.paa
deleted file mode 100644
index 8cd1069a64..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/data/cse_combatdeaf_deafness.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic.rvmat b/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic.rvmat
deleted file mode 100644
index 5743771bbe..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic.rvmat
+++ /dev/null
@@ -1,92 +0,0 @@
-ambient[]={1.000000,1.000000,1.000000,1.000000};
-diffuse[]={1.000000,1.000000,1.000000,1.000000};
-forcedDiffuse[]={0.000000,0.000000,0.000000,0.000000};
-emmisive[]={0.000000,0.000000,0.000000,1.000000};
-specular[]={0.703999,0.703999,0.703999,0.000000};
-specularPower=70.000000;
-PixelShaderID="Super";
-VertexShaderID="Super";
-class Stage1
-{
- texture="cse\cse_sys_combatdeaf\equipment\data\earplugs_electronic_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage2
-{
- texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage3
-{
- texture="#(argb,8,8,3)color(0,0,0,0,MC)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage4
-{
- texture="#(argb,8,8,3)color(1,1,1,1,AS)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage5
-{
- texture="#(argb,8,8,3)color(0,0.05,1,1,SMDI)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage6
-{
- texture="#(ai,32,128,1)fresnel(0.98,1.02)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage7
-{
- texture="cse\cse_sys_medical\equipment\data\env_co.tga";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic_co.paa b/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic_co.paa
deleted file mode 100644
index 5a8aa676b4..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic_nohq.paa b/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic_nohq.paa
deleted file mode 100644
index 4d29071c01..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_electronic_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple.rvmat b/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple.rvmat
deleted file mode 100644
index deb96f14e8..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple.rvmat
+++ /dev/null
@@ -1,92 +0,0 @@
-ambient[]={1.000000,1.000000,1.000000,1.000000};
-diffuse[]={1.000000,1.000000,1.000000,1.000000};
-forcedDiffuse[]={0.000000,0.000000,0.000000,0.000000};
-emmisive[]={0.000000,0.000000,0.000000,1.000000};
-specular[]={0.703999,0.703999,0.703999,0.000000};
-specularPower=70.000000;
-PixelShaderID="Super";
-VertexShaderID="Super";
-class Stage1
-{
- texture="cse\cse_sys_combatdeaf\equipment\data\earplugs_simple_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage2
-{
- texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage3
-{
- texture="#(argb,8,8,3)color(0,0,0,0,MC)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage4
-{
- texture="#(argb,8,8,3)color(1,1,1,1,AS)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage5
-{
- texture="#(argb,8,8,3)color(0,0.05,1,1,SMDI)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage6
-{
- texture="#(ai,32,128,1)fresnel(0.98,1.02)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage7
-{
- texture="cse\cse_sys_medical\equipment\data\env_co.tga";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple_co.paa b/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple_co.paa
deleted file mode 100644
index bd7904b497..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple_nohq.paa b/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple_nohq.paa
deleted file mode 100644
index 1e4d3ea283..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/equipment/data/earplugs_simple_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/earplugs_electronic.p3d b/TO_MERGE/cse/sys_combatdeaf/equipment/earplugs_electronic.p3d
deleted file mode 100644
index 4020a0e801..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/equipment/earplugs_electronic.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/earplugs_simple.p3d b/TO_MERGE/cse/sys_combatdeaf/equipment/earplugs_simple.p3d
deleted file mode 100644
index 472c83259f..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/equipment/earplugs_simple.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/icons/earplugs_electronic_icon.paa b/TO_MERGE/cse/sys_combatdeaf/equipment/icons/earplugs_electronic_icon.paa
deleted file mode 100644
index f401554c5d..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/equipment/icons/earplugs_electronic_icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/equipment/icons/earplugs_simple_icon.paa b/TO_MERGE/cse/sys_combatdeaf/equipment/icons/earplugs_simple_icon.paa
deleted file mode 100644
index 30154b3e5b..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/equipment/icons/earplugs_simple_icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/defines.h b/TO_MERGE/cse/sys_combatdeaf/functions/defines.h
deleted file mode 100644
index 8ee75925fc..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/defines.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define EARPLUGS_ID 18312
-#define NO_EARPLUGS 0
-#define STANDARD_EARPLUGS 1
-#define ELECTRONIC_EARPLUGS 2
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_applyEletronicEarProtection_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_applyEletronicEarProtection_DEAF.sqf
deleted file mode 100644
index 0022ac97f1..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_applyEletronicEarProtection_DEAF.sqf
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "defines.h"
-
-private ["_audibleFire", "_attenuation", "_totalAttenuation", "_ID"];
-_audibleFire = _this;
-
-if (_audibleFire < 1) exitWith {};
-
-_totalAttenuation = 1;
-
-if (_audibleFire > 1) then {
- // TODO: Use a headgear config entry instead
- if (headgear player == "H_Cap_headphones") then {
- _attenuation = 0.25 max (1 / _audibleFire) min 1; // max. -20 dB
- _totalAttenuation = _totalAttenuation * _attenuation;
- _audibleFire = _audibleFire * _attenuation;
- };
-};
-
-if (_audibleFire > 1) then {
- if (player getVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS] == ELECTRONIC_EARPLUGS) then {
- _attenuation = 0.125 max (1 / _audibleFire) min 1; // max. -30 dB
- _totalAttenuation = _totalAttenuation * _attenuation;
- _audibleFire = _audibleFire * _attenuation;
- };
-};
-
-if (_totalAttenuation < 1) then {
- _ID = floor(random 1000000);
- [format["electronicHearingProtection_%1", _ID], _totalAttenuation, true] call cse_fnc_setHearingCapability;
- _ID spawn {
- sleep 2;
- [format["electronicHearingProtection_%1", _this], 1, false] call cse_fnc_setHearingCapability;
- };
-};
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_explosion_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_explosion_DEAF.sqf
deleted file mode 100644
index b7a85bcad9..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_explosion_DEAF.sqf
+++ /dev/null
@@ -1,8 +0,0 @@
-private ["_unit", "_damage", "_attenuation", "_sp"];
-_unit = _this select 0;
-_damage = _this select 1;
-
-_attenuation = player call cse_fnc_getAttenuation_DEAF;
-
-_sp = _attenuation * _damage * 500;
-_sp call cse_fnc_handlePressureWave_DEAF;
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_getAttenuation_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_getAttenuation_DEAF.sqf
deleted file mode 100644
index c440e1e1f9..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_getAttenuation_DEAF.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "defines.h"
-
-private ["_unit", "_attenuation"];
-_unit = _this;
-
-_attenuation = 1;
-
-if (player getVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS] != NO_EARPLUGS) then {
- _attenuation = _attenuation * 0.125; // -30 dB
-};
-// TODO: Use a headgear config entry instead
-if (headgear player == "H_Cap_headphones") then {
- _attenuation = _attenuation * 0.25; // -20 dB
-};
-
-_attenuation
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_getIn_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_getIn_DEAF.sqf
deleted file mode 100644
index 55173940c9..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_getIn_DEAF.sqf
+++ /dev/null
@@ -1,9 +0,0 @@
-private ["_vehicle", "_position", "_unit", "_handle"];
-_vehicle = _this select 0;
-_position = _this select 1;
-_unit = _this select 2;
-
-if (_unit != player) exitWith {};
-_handle = _vehicle addEventHandler ["Fired", {_this call cse_fnc_handleFired_DEAF}];
-
-_vehicle setVariable ["cse_combat_deaf_fired_event_handler", _handle];
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_getMuzzleAccessory_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_getMuzzleAccessory_DEAF.sqf
deleted file mode 100644
index 01f70f32e5..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_getMuzzleAccessory_DEAF.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_getMuzzleAccessory_DEAF.sqf
- * @Descr: N/A Throws exception NO_WEAPON_UNIT
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: STRING classname. Empty string if no assescory for Muzzle
- * @PublicAPI: false
- */
-
- private ["_unit"];
-_unit = _this select 0;
-_accessories = [_unit] call cse_fnc_getWeaponItems_F;
-_items = switch (currentWeapon _unit) do {
- case (primaryWeapon _unit): { _accessories select 0 };
- case (secondaryWeapon _unit): { _accessories select 1 };
- case (handgunWeapon _unit): { _accessories select 2 };
- default { throw "NO_WEAPON_UNIT"; };
-};
-(_items select 0);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_getOut_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_getOut_DEAF.sqf
deleted file mode 100644
index 8345953097..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_getOut_DEAF.sqf
+++ /dev/null
@@ -1,12 +0,0 @@
-private ["_vehicle", "_position", "_unit", "_handle"];
-_vehicle = _this select 0;
-_position = _this select 1;
-_unit = _this select 2;
-
-if (_unit != player) exitWith {};
-_handle = _vehicle getVariable "cse_combat_deaf_fired_event_handler";
-
-if (!isNil "_handle") then {
- _vehicle removeEventHandler ["Fired", _handle];
- _vehicle setVariable ["cse_combat_deaf_fired_event_handler", nil];
-};
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_handleFiredNear_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_handleFiredNear_DEAF.sqf
deleted file mode 100644
index 984fba7f55..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_handleFiredNear_DEAF.sqf
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * fn_handleFiredNear_DEAF.sqf
- * @Descr: N/A
- * @Author: Ruthberg
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define MAX_DISTANCE 10
-#define BLUR_DELAY 0.1
-#define SPEED_OF_SOUND 340.29
-
-private ["_unit", "_firer", "_distance", "_weapon", "_ammo", "_pressureRatio", "_audibleFire", "_audibleFireToSPL", "_audibleFireDistanceCorrected", "_accessoryConfig", "_sp"];
-_unit = _this select 0;
-_firer = _this select 1;
-_distance = _this select 2;
-_weapon = _this select 3;
-_ammo = _this select 6;
-
-if (_distance > MAX_DISTANCE) exitWith {};
-if (_weapon in ["Throw", "Put"]) exitWith {};
-if (getNumber (configFile >> "CfgWeapons" >> _weapon >> "type") == 0) exitWith {
- [format["Weapon type was 0. Exiting (%1)", _weapon]] call cse_fnc_debug;
-};
-
-_pressureRatio = 1 / 3;
-if ([_unit] call cse_fnc_isInBuilding && [_firer] call cse_fnc_isInBuilding) then {
- _pressureRatio = 1.0;
-} else {
- if (_unit != _firer) then {
- // calculate direction deviation (shotdirection - (firer -> unit direction))
- _shotDirection = _firer weaponDirection currentWeapon _firer;
- _hearerDirection = (getPosASL _firer) vectorFromTo (getPosASL _unit);
- _cosOfAngle = _shotDirection vectorCos _hearerDirection; // -1 .. +1
- _pressureRatio = (1 / 3) * (2 + _cosOfAngle); // 0.333 .. 1
- if (lineIntersects [eyePos _firer, eyePos _unit, _firer, _unit]) then {
- _pressureRatio = _pressureRatio / 2;
- };
- };
-};
-
-try {
- _audibleFire = getNumber(configFile >> "CfgAmmo" >> _ammo >> "audibleFire");
- _accessoryConfig = (configFile >> "CfgWeapons" >> ([_firer] call cse_fnc_getMuzzleAccessory_DEAF));
- if (isClass _accessoryConfig) then {
- _audibleFire = (getNumber (_accessoryConfig >> "ItemInfo" >> "AmmoCoef" >> "audibleFire")) * _audibleFire;
- };
-
- _distance = 1 max _distance;
- _audibleFireToSPL = abs(10 * log(1 / (4 * PI * _distance^2)));
- _audibleFireDistanceCorrected = 0 max (_audibleFire / 2^(_audibleFireToSPL / 10));
- _sp = _pressureRatio * (_unit call cse_fnc_getAttenuation_DEAF) * _audibleFireDistanceCorrected / 3;
- hintSilent format["%1, %2, %3, %4, %5, %6", _distance, _pressureRatio, (_unit call cse_fnc_getAttenuation_DEAF), _sp, _audibleFire, _audibleFireDistanceCorrected];
-
- _sp call cse_fnc_handlePressureWave_DEAF;
- _audibleFireDistanceCorrected call cse_fnc_applyEletronicEarProtection_DEAF;
-
- if (_sp > 1 && goggles _unit == "" && _unit != _firer) then {
- [_distance, _sp] spawn {
- private ["_distance", "_blur"];
- _distance = _this select 0;
- _blur = (sqrt(_this select 1) / 5) min 2;
- sleep (_distance / SPEED_OF_SOUND);
- cse_sys_combatdeaf_blurEffect ppEffectEnable true;
- cse_sys_combatdeaf_blurEffect ppEffectAdjust [_blur / (_distance^2)];
- cse_sys_combatdeaf_blurEffect ppEffectCommit BLUR_DELAY;
- sleep BLUR_DELAY;
- for "_i" from floor(_distance) to MAX_DISTANCE do {
- cse_sys_combatdeaf_blurEffect ppEffectAdjust [_blur * (MAX_DISTANCE - _i)];
- cse_sys_combatdeaf_blurEffect ppEffectCommit (_blur * (BLUR_DELAY / 2));
- sleep (_blur * (BLUR_DELAY / 2));
- };
- cse_sys_combatdeaf_blurEffect ppEffectEnable false;
- };
- };
-}catch {
- // This should never happen.
- if (_exception == "NO_WEAPON_UNIT") then {
- [format["Unit (%1) that fired has no weapon. Cannot retrieve silencer accessory", _firer]] call cse_fnc_debug;
- } else {
- [_exception] call cse_fnc_debug;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_handleFired_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_handleFired_DEAF.sqf
deleted file mode 100644
index 4d07b1fccb..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_handleFired_DEAF.sqf
+++ /dev/null
@@ -1,8 +0,0 @@
-private ["_unit", "_weapon", "_muzzle", "_mode", "_ammo"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-_mode = _this select 3;
-_ammo = _this select 4;
-
-[_unit, _unit, 0, _weapon, _muzzle, _mode, _ammo] call cse_fnc_handleFiredNear_DEAF;
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_handlePressureWave_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_handlePressureWave_DEAF.sqf
deleted file mode 100644
index 32324b6ce8..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_handlePressureWave_DEAF.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-#define PAIN_THRESHOLD 5
-#define DAMAGE_THRESHOLD 40
-#define HEARING_CAPABILITY_MAP_ID 1713
-
-private ["_sp", "_deafness"];
-_sp = _this;
-
-if !(alive player) exitWith {};
-
-if (_sp > 0.5 && cse_DeafnessIntensity > 0.0) then {
- _deafness = ((player getVariable ["cse_combatdeaf_deafness", 0]) + _sp) min (DAMAGE_THRESHOLD / cse_DeafnessIntensity);
- player setVariable ["cse_combatdeaf_deafness", _deafness, false];
-
- if (!cse_sys_combatdeaf_deafness_running) then {
- [] spawn {
- private ["_deafness", "_ringing", "_ringingStart", "_img", "_volume"];
- cse_sys_combatdeaf_deafness_running = true;
- _deafness = player getVariable ["cse_combatdeaf_deafness", 0];
- _ringing = false;
- _ringingStart = time - 120;
- while {alive player && _deafness > 0.01} do {
- if (_deafness > DAMAGE_THRESHOLD / cse_DeafnessIntensity) then {
- ["cse_sys_combatdeaf_deafIcon", true, "cse\cse_sys_combatdeaf\data\cse_combatdeaf_deafness.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
- } else {
- ["cse_sys_combatdeaf_deafIcon", false, "", [1,1,1,1]] call cse_fnc_gui_displayIcon;
- if (!cse_DisableEarRinging && _deafness > PAIN_THRESHOLD / cse_DeafnessIntensity) then {
- if (!_ringing || time - _ringingStart > 120) then {
- playSound "cse_combatdeaf_ear_ringing";
- _ringingStart = time;
- _ringing = true;
- };
- } else {
- _ringing = false;
- };
- };
- _deafness = player getVariable ["cse_combatdeaf_deafness", 0];
- _volume = 0 max (1 - (_deafness / (DAMAGE_THRESHOLD / cse_DeafnessIntensity)));
- [format["hearingCapability_%1", HEARING_CAPABILITY_MAP_ID], _volume, true] call cse_fnc_setHearingCapability;
- player setVariable ["cse_combatdeaf_deafness", 0 max (_deafness - 0.5 / (1 max _deafness min (DAMAGE_THRESHOLD / cse_DeafnessIntensity))), false];
- sleep 1;
- };
- cse_sys_combatdeaf_deafness_running = false;
- [format["hearingCapability_%1", HEARING_CAPABILITY_MAP_ID], 1, false] call cse_fnc_setHearingCapability;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_hasMuzzleAccessory_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_hasMuzzleAccessory_DEAF.sqf
deleted file mode 100644
index 616f3d0ad6..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_hasMuzzleAccessory_DEAF.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_hasMuzzleAccessory_DEAF.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
- private ["_unit"];
-_unit = _this select 0;
-_accessories = [_unit] call cse_fnc_getWeaponItems_F;
-_items = switch (currentWeapon _unit) do {
- case (primaryWeapon _unit): { _accessories select 0 };
- case (secondaryWeapon _unit): { _accessories select 1 };
- case (handgunWeapon _unit): { _accessories select 2 };
- default { throw "NO_WEAPON_UNIT"; };
-};
-(_items select 0) != "";
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/functions/fn_register_ear_protection_actions_DEAF.sqf b/TO_MERGE/cse/sys_combatdeaf/functions/fn_register_ear_protection_actions_DEAF.sqf
deleted file mode 100644
index 2c5351e7fd..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/functions/fn_register_ear_protection_actions_DEAF.sqf
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "defines.h"
-
-if (isDedicated) exitwith{};
-CSE_ICON_PATH = "cse\cse_gui\radialmenu\data\icons\";
-
-cse_hearingProtectionDisplaySubMenu = {
- [_this] call cse_fnc_Debug;
-
- private ["_subMenus"];
- _subMenus = [];
-
- // Put on standard earplugs
- if (player getVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS] == NO_EARPLUGS && [player, "cse_earplugs"] call cse_fnc_hasItem) then {
- _subMenus pushBack ["Use earplugs", CSE_ICON_PATH + "icon_earplugs_standard.paa", {
- closeDialog 0;
- player setVariable ["cse_combatdeaf_earplugs", STANDARD_EARPLUGS, false];
- player removeItem "cse_earplugs";
- [format["earplugsAttenuation_ID_%1", EARPLUGS_ID], 0.125] call cse_fnc_setHearingCapability;
- }, true, "Use standard earplugs"];
- };
-
- // Put on electronic earplugs
- if (player getVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS] == NO_EARPLUGS && [player, "cse_earplugs_electronic"] call cse_fnc_hasItem) then {
- _subMenus pushBack ["Use earplugs", CSE_ICON_PATH + "icon_earplugs_electronic.paa", {
- closeDialog 0;
- player setVariable ["cse_combatdeaf_earplugs", ELECTRONIC_EARPLUGS, false];
- player removeItem "cse_earplugs_electronic";
- }, true, "Use electronic earplugs"];
- };
-
- // Remove earplugs
- if (player getVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS] != NO_EARPLUGS) then {
- switch (player getVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS]) do {
- case STANDARD_EARPLUGS: {
- _subMenus pushBack ["Earplugs out", CSE_ICON_PATH + "icon_earplugs_remove.paa", {
- closeDialog 0;
- player setVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS, false];
- player addItem "cse_earplugs";
- [format["earplugsAttenuation_ID_%1", EARPLUGS_ID], 1, false] call cse_fnc_setHearingCapability;
- }, true, "Remove standard earplugs"];
- };
- case ELECTRONIC_EARPLUGS: {
- _subMenus pushBack ["Earplugs out", CSE_ICON_PATH + "icon_earplugs_remove.paa", {
- closeDialog 0;
- player setVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS, false];
- player addItem "cse_earplugs_electronic";
- }, true, "Remove electronic earplugs"];
- };
- };
- };
-
- [_this select 3, _subMenus, _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true] call cse_fnc_openRadialSecondRing_GUI;
-};
-
-
-_entries = [
- ["Hearing", {((player getVariable ["cse_combatdeaf_earplugs", NO_EARPLUGS] != NO_EARPLUGS) || (([player, "cse_earplugs_electronic"] call cse_fnc_hasItem) || ([player, "cse_earplugs"] call cse_fnc_hasItem)))}, CSE_ICON_PATH + "icon_ear_protection.paa", cse_hearingProtectionDisplaySubMenu, "Show available hearing protections"]
-];
-["ActionMenu","equipment", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
diff --git a/TO_MERGE/cse/sys_combatdeaf/init_sys_combatdeaf.sqf b/TO_MERGE/cse/sys_combatdeaf/init_sys_combatdeaf.sqf
deleted file mode 100644
index a8bd8fcd8d..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/init_sys_combatdeaf.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "functions\defines.h"
-
-if (!hasInterface) exitwith {};
-waituntil{!isnil "cse_gui" && !isnil "cse_main"};
-
-waitUntil {!isNull player};
-
-private ["_args"];
-_args = _this;
-{
- _varName = "cse_"+(_x select 0);
- missionNamespace setVariable[_varName, _x select 1];
-} forEach _args;
-
-if (isNil "cse_DeafnessIntensity") then { cse_DeafnessIntensity = cse_DEAFNESS_EFFECT_INTENSITY };
-if (isNil "cse_DisableEarRinging") then { cse_DisableEarRinging = cse_DISABLE_EAR_RINGING };
-
-["cse_combatdeaf_deafness", 0, false, "cd"] call cse_fnc_defineVariable;
-["cse_combatdeaf_earplugs", NO_EARPLUGS, false, "cd"] call cse_fnc_defineVariable;
-
-call cse_fnc_register_ear_protection_actions_DEAF;
-
-player addEventHandler ["FiredNear", {_this call cse_fnc_handleFiredNear_DEAF}];
-player addEventHandler ["Explosion", {_this call cse_fnc_explosion_DEAF}];
-
-cse_sys_combatdeaf_blurEffect = ppEffectCreate ["dynamicBlur", -11723];
-cse_sys_combatdeaf_deafness_running = false;
-
-cse_sys_combatdeaf = true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_combatdeaf/sound/ear_ringing.ogg b/TO_MERGE/cse/sys_combatdeaf/sound/ear_ringing.ogg
deleted file mode 100644
index 9bbc7b504b..0000000000
Binary files a/TO_MERGE/cse/sys_combatdeaf/sound/ear_ringing.ogg and /dev/null differ
diff --git a/TO_MERGE/cse/sys_combatdeaf/stringtable.xml b/TO_MERGE/cse/sys_combatdeaf/stringtable.xml
deleted file mode 100644
index 0c3a9168de..0000000000
--- a/TO_MERGE/cse/sys_combatdeaf/stringtable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/CfgAmmo.h b/TO_MERGE/cse/sys_equipment/CfgAmmo.h
deleted file mode 100644
index f73b099245..0000000000
--- a/TO_MERGE/cse/sys_equipment/CfgAmmo.h
+++ /dev/null
@@ -1,159 +0,0 @@
-#define FUSEE_TIME_TO_LIVE 600
-#define FUSEE_FLARE_SIZE 2
-#define FUSEE_INTENSITY 3000
-
-#define FLARE_TIME_TO_LIVE 60
-#define FLARE_SIZE 10
-#define FLARE_INTENSITY 4000
-
-class cfgAmmo {
- class F_20mm_White;
- class F_20mm_Red: F_20mm_White {};
- class F_20mm_Yellow: F_20mm_White {};
- class F_20mm_Green: F_20mm_White {};
-
- class CSE_FuseeWhite: F_20mm_White {
- intensity = FUSEE_INTENSITY;
- flareSize = FUSEE_FLARE_SIZE;
- timeToLive = FUSEE_TIME_TO_LIVE;
- airFriction = -0.0005;
- thrust = 210;
- thrustTime = 1.5;
- };
- class CSE_FuseeRed: F_20mm_Red {
- intensity = FUSEE_INTENSITY;
- flareSize = FUSEE_FLARE_SIZE;
- timeToLive = FUSEE_TIME_TO_LIVE;
- airFriction = -0.0005;
- thrust = 210;
- thrustTime = 1.5;
- };
- class CSE_FuseeYellow: F_20mm_Yellow {
- intensity = FUSEE_INTENSITY;
- flareSize = FUSEE_FLARE_SIZE;
- timeToLive = FUSEE_TIME_TO_LIVE;
- airFriction = -0.0005;
- thrust = 210;
- thrustTime = 1.5;
- };
- class CSE_FuseeGreen: F_20mm_Green {
- intensity = FUSEE_INTENSITY;
- flareSize = FUSEE_FLARE_SIZE;
- timeToLive = FUSEE_TIME_TO_LIVE;
- airFriction = -0.0005;
- thrust = 210;
- thrustTime = 1.5;
- };
-
-
- class CSE_FlareWhite: F_20mm_White {
- intensity = FLARE_INTENSITY;
- flareSize = FLARE_SIZE;
- timeToLive = FLARE_TIME_TO_LIVE;
- airFriction = -0.0005;
- thrust = 210;
- thrustTime = 1.5;
- };
- class CSE_FlareRed: F_20mm_Red {
- intensity = FLARE_INTENSITY;
- flareSize = FLARE_SIZE;
- timeToLive = FLARE_TIME_TO_LIVE;
- airFriction = -0.0005;
- thrust = 210;
- thrustTime = 1.5;
- };
- class CSE_FlareYellow: F_20mm_Yellow {
- intensity = FLARE_INTENSITY;
- flareSize = FLARE_SIZE;
- timeToLive = FLARE_TIME_TO_LIVE;
- airFriction = -0.0005;
- thrust = 210;
- thrustTime = 1.5;
- };
- class CSE_FlareGreen: F_20mm_Green {
- intensity = FLARE_INTENSITY;
- flareSize = FLARE_SIZE;
- timeToLive = FLARE_TIME_TO_LIVE;
- airFriction = -0.0005;
- thrust = 210;
- thrustTime = 1.5;
- };
-};
-
-
-class CfgMagazines {
- class HandGrenade;
- class CSE_Flare_Base: HandGrenade {
- value = 2;
- nameSoundWeapon = "smokeshell";
- nameSound = "smokeshell";
- mass = 4;
- initSpeed = 22;
- };
- class CSE_FlareWhite: CSE_Flare_Base {
- ammo = "CSE_FlareWhite";
- displayname = $STR_CSE_FLARE_WHITE;
- descriptionshort = $STR_CSE_FLARE_WHITE;
- displayNameShort = $STR_CSE_FLARE_WHITE;
- model = "\A3\weapons_f\ammo\flare_white";
- picture = "\A3\Weapons_F\Data\UI\gear_flare_white_ca.paa";
- };
- class CSE_FlareRed: CSE_Flare_Base {
- ammo = "CSE_FlareRed";
- displayname = $STR_CSE_FLARE_RED;
- descriptionshort = $STR_CSE_FLARE_RED;
- displayNameShort = $STR_CSE_FLARE_RED;
- model = "\A3\weapons_f\ammo\flare_red";
- picture = "\A3\Weapons_F\Data\UI\gear_flare_red_ca.paa";
- };
- class CSE_FlareYellow: CSE_Flare_Base {
- ammo = "CSE_FlareYellow";
- displayname = $STR_CSE_FLARE_YELLOW;
- descriptionshort = $STR_CSE_FLARE_YELLOW;
- displayNameShort = $STR_CSE_FLARE_YELLOW;
- model = "\A3\weapons_f\ammo\flare_yellow";
- picture = "\A3\Weapons_F\Data\UI\gear_flare_yellow_ca.paa";
- };
- class CSE_FlareGreen: CSE_Flare_Base {
- ammo = "CSE_FlareGreen";
- displayname = $STR_CSE_FLARE_GREEN;
- descriptionshort = $STR_CSE_FLARE_GREEN;
- displayNameShort = $STR_CSE_FLARE_GREEN;
- model = "\A3\weapons_f\ammo\flare_green";
- picture = "\A3\Weapons_F\Data\UI\gear_flare_green_ca.paa";
- };
-
-
- class CSE_RoadFlareWhite: CSE_Flare_Base {
- ammo = "CSE_FuseeWhite";
- displayname = $STR_CSE_ROAD_FLARE_WHITE;
- descriptionshort = $STR_CSE_ROAD_FLARE_WHITE;
- displayNameShort = $STR_CSE_ROAD_FLARE_WHITE;
- model = "\A3\weapons_f\ammo\flare_white";
- picture = "\A3\Weapons_F\Data\UI\gear_flare_white_ca.paa";
- };
- class CSE_RoadFlareRed: CSE_Flare_Base {
- ammo = "CSE_FuseeRed";
- displayname = $STR_CSE_ROAD_FLARE_RED;
- descriptionshort = $STR_CSE_ROAD_FLARE_RED;
- displayNameShort = $STR_CSE_ROAD_FLARE_RED;
- model = "\A3\weapons_f\ammo\flare_red";
- picture = "\A3\Weapons_F\Data\UI\gear_flare_red_ca.paa";
- };
- class CSE_RoadFlareYellow: CSE_Flare_Base {
- ammo = "CSE_FuseeYellow";
- displayname = $STR_CSE_ROAD_FLARE_YELLOW;
- descriptionshort = $STR_CSE_ROAD_FLARE_YELLOW;
- displayNameShort = $STR_CSE_ROAD_FLARE_YELLOW;
- model = "\A3\weapons_f\ammo\flare_yellow";
- picture = "\A3\Weapons_F\Data\UI\gear_flare_yellow_ca.paa";
- };
- class CSE_RoadFlareGreen: CSE_Flare_Base {
- ammo = "CSE_FuseeGreen";
- displayname = $STR_CSE_ROAD_FLARE_GREEN;
- descriptionshort = $STR_CSE_ROAD_FLARE_GREEN;
- displayNameShort = $STR_CSE_ROAD_FLARE_GREEN;
- model = "\A3\weapons_f\ammo\flare_green";
- picture = "\A3\Weapons_F\Data\UI\gear_flare_green_ca.paa";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/CfgFactionClasses.h b/TO_MERGE/cse/sys_equipment/CfgFactionClasses.h
deleted file mode 100644
index 3eed8715b8..0000000000
--- a/TO_MERGE/cse/sys_equipment/CfgFactionClasses.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgFactionClasses
-{
- class NO_CATEGORY;
- class cse_equipment: NO_CATEGORY {
- displayName = "CSE Equipment";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/CfgFunctions.h b/TO_MERGE/cse/sys_equipment/CfgFunctions.h
deleted file mode 100644
index 0112eaf16b..0000000000
--- a/TO_MERGE/cse/sys_equipment/CfgFunctions.h
+++ /dev/null
@@ -1,49 +0,0 @@
-class CfgFunctions {
- class CSE {
- class Equipment {
- file = "cse\cse_sys_equipment\functions";
- class hasAttachableItem_EQ { recompile = 1; };
- class attachItem_EQ { recompile = 1; };
- class detachItem_EQ { recompile = 1; };
- class isAttachableItem_EQ { recompile = 1; };
- class hasItemAttached_EQ { recompile = 1; };
- class getAllEquipmentOptions_EQ { recompile = 1; };
- class registerNewEquipmentOption_EQ { recompile = 1; };
- class areEquipmentOptionsAvailable_EQ { recompile = 1; };
- class dropFlare_EQ { recompile = 1; };
- class moduleFlare_EQ { recompile = 1; };
- class hasFlare_EQ { recompile = 1; };
- class isFlare_EQ { recompile = 1; };
- class putWeaponOnBack_EQ { recompile = 1; };
- class getPercentageAmmoMagazine_EQ { recompile = 1; };
- class hideUnitInfoAmmo_EQ { recompile = 1; };
- };
- class WeaponRest {
- file = "cse\cse_sys_equipment\weaponresting\functions";
- class keyPressed_WR { recompile = 1; };
- class canRestWeapon_WR { recompile = 1; };
- class canDeployBipod_WR { recompile = 1; };
- class restWeapon_WR { recompile = 1; };
- class unrestWeapon_WR { recompile = 1; };
- class deployWeapon_WR { recompile = 1; };
- class undeployWeapon_WR { recompile = 1; };
- class actionReleaseWeapon_WR { recompile = 1; };
- class hasBipod_WR { recompile = 1; };
- };
- class WeaponSafety {
- file = "cse\cse_sys_equipment\weaponsafety\functions";
- class safetyOff_ws { recompile = 1; };
- class safetyOn_ws { recompile = 1; };
- };
- class nightVisionModule {
- file = "cse\cse_sys_equipment\nvg\functions";
- class adjustBrightness_NVG { recompile = 1; };
- };
-
- class MagazineRepack {
- file = "cse\cse_sys_equipment\magazineRepack\functions";
- class repackMagazines { recompile = 1; };
- class repackMagazinesAll { recompile = 1; };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_equipment/CfgMovesBasic.h b/TO_MERGE/cse/sys_equipment/CfgMovesBasic.h
deleted file mode 100644
index af719e15fc..0000000000
--- a/TO_MERGE/cse/sys_equipment/CfgMovesBasic.h
+++ /dev/null
@@ -1,277 +0,0 @@
-// Adpated from: https://github.com/Taosenai/tmr/blob/master/tmr_autorest/config.cpp
-
-#define CSE_DEPLOYED_TURNSPEED 0.1
-
-class CfgMovesBasic {
- class Default;
-
- class Actions {
- class RifleStandActions;
- class RifleStandActions_cse_deployed : RifleStandActions {
- stop = "AmovPercMstpSrasWrflDnon_cse_deployed";
- default = "AmovPercMstpSrasWrflDnon_cse_deployed";
- turnL = "AmovPercMstpSrasWrflDnon_cse_deployed";
- turnR = "AmovPercMstpSrasWrflDnon_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLStandActions;
- class RifleAdjustLStandActions_cse_deployed : RifleAdjustLStandActions {
- stop = "AadjPercMstpSrasWrflDleft_cse_deployed";
- default = "AadjPercMstpSrasWrflDleft_cse_deployed";
- AdjustL = "AadjPercMstpSrasWrflDleft_cse_deployed";
- turnL = "AadjPercMstpSrasWrflDleft_cse_deployed";
- turnR = "AadjPercMstpSrasWrflDleft_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRStandActions;
- class RifleAdjustRStandActions_cse_deployed : RifleAdjustRStandActions {
- stop = "AadjPercMstpSrasWrflDright_cse_deployed";
- default = "AadjPercMstpSrasWrflDright_cse_deployed";
- AdjustRight = "AadjPercMstpSrasWrflDright_cse_deployed";
- turnL = "AadjPercMstpSrasWrflDright_cse_deployed";
- turnR = "AadjPercMstpSrasWrflDright_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFStandActions;
- class RifleAdjustFStandActions_cse_deployed : RifleAdjustFStandActions {
- stop = "AadjPercMstpSrasWrflDup_cse_deployed";
- default = "AadjPercMstpSrasWrflDup_cse_deployed";
- AdjustF = "AadjPercMstpSrasWrflDup_cse_deployed";
- turnL = "AadjPercMstpSrasWrflDup_cse_deployed";
- turnR = "AadjPercMstpSrasWrflDup_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBStandActions;
- class RifleAdjustBStandActions_cse_deployed : RifleAdjustBStandActions {
- stop = "AadjPercMstpSrasWrflDdown_cse_deployed";
- default = "AadjPercMstpSrasWrflDdown_cse_deployed";
- AdjustB = "AadjPercMstpSrasWrflDdown_cse_deployed";
- turnR = "AadjPercMstpSrasWrflDdown_cse_deployed";
- turnL = "AadjPercMstpSrasWrflDdown_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLKneelActions;
- class RifleAdjustLKneelActions_cse_deployed : RifleAdjustLKneelActions {
- stop = "AadjPknlMstpSrasWrflDleft_cse_deployed";
- default = "AadjPknlMstpSrasWrflDleft_cse_deployed";
- turnL = "AadjPknlMstpSrasWrflDleft_cse_deployed";
- turnR = "AadjPknlMstpSrasWrflDleft_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRKneelActions;
- class RifleAdjustRKneelActions_cse_deployed : RifleAdjustRKneelActions {
- stop = "AadjPknlMstpSrasWrflDright_cse_deployed";
- default = "AadjPknlMstpSrasWrflDright_cse_deployed";
- turnL = "AadjPknlMstpSrasWrflDright_cse_deployed";
- turnR = "AadjPknlMstpSrasWrflDright_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFKneelActions;
- class RifleAdjustFKneelActions_cse_deployed : RifleAdjustFKneelActions {
- stop = "AadjPknlMstpSrasWrflDup_cse_deployed";
- default = "AadjPknlMstpSrasWrflDup_cse_deployed";
- turnL = "AadjPknlMstpSrasWrflDup_cse_deployed";
- turnR = "AadjPknlMstpSrasWrflDup_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBKneelActions;
- class RifleAdjustBKneelActions_cse_deployed : RifleAdjustBKneelActions {
- stop = "AadjPknlMstpSrasWrflDdown_cse_deployed";
- default = "AadjPknlMstpSrasWrflDdown_cse_deployed";
- turnL = "AadjPknlMstpSrasWrflDdown_cse_deployed";
- turnR = "AadjPknlMstpSrasWrflDdown_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleKneelActions;
- class RifleKneelActions_cse_deployed : RifleKneelActions {
- stop = "AmovPknlMstpSrasWrflDnon_cse_deployed";
- default = "AmovPknlMstpSrasWrflDnon_cse_deployed";
- crouch = "AmovPknlMstpSrasWrflDnon_cse_deployed";
- turnL = "AmovPknlMstpSrasWrflDnon_cse_deployed";
- turnR = "AmovPknlMstpSrasWrflDnon_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleProneActions;
- class RifleProneActions_cse_deployed : RifleProneActions {
- stop = "AmovPpneMstpSrasWrflDnon_cse_deployed";
- default = "AmovPpneMstpSrasWrflDnon_cse_deployed";
- turnL = "AmovPpneMstpSrasWrflDnon_cse_deployed";
- turnR = "AmovPpneMstpSrasWrflDnon_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFProneActions;
- class RifleAdjustFProneActions_cse_deployed : RifleAdjustFProneActions {
- stop = "aadjppnemstpsraswrfldup_cse_deployed";
- default = "aadjppnemstpsraswrfldup_cse_deployed";
- turnL = "aadjppnemstpsraswrfldup_cse_deployed";
- turnR = "aadjppnemstpsraswrfldup_cse_deployed";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleStandActions_cse_rested : RifleStandActions {
- stop = "AmovPercMstpSrasWrflDnon_cse_rested";
- default = "AmovPercMstpSrasWrflDnon_cse_rested";
- turnL = "AmovPercMstpSrasWrflDnon_cse_rested";
- turnR = "AmovPercMstpSrasWrflDnon_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLStandActions_cse_rested : RifleAdjustLStandActions {
- stop = "AadjPercMstpSrasWrflDleft_cse_rested";
- default = "AadjPercMstpSrasWrflDleft_cse_rested";
- AdjustL = "AadjPercMstpSrasWrflDleft_cse_rested";
- turnL = "AadjPercMstpSrasWrflDleft_cse_rested";
- turnR = "AadjPercMstpSrasWrflDleft_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRStandActions_cse_rested : RifleAdjustRStandActions {
- stop = "AadjPercMstpSrasWrflDright_cse_rested";
- default = "AadjPercMstpSrasWrflDright_cse_rested";
- AdjustRight = "AadjPercMstpSrasWrflDright_cse_rested";
- turnL = "AadjPercMstpSrasWrflDright_cse_rested";
- turnR = "AadjPercMstpSrasWrflDright_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFStandActions_cse_rested : RifleAdjustFStandActions {
- stop = "AadjPercMstpSrasWrflDup_cse_rested";
- default = "AadjPercMstpSrasWrflDup_cse_rested";
- AdjustF = "AadjPercMstpSrasWrflDup_cse_rested";
- turnL = "AadjPercMstpSrasWrflDup_cse_rested";
- turnR = "AadjPercMstpSrasWrflDup_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBStandActions_cse_rested : RifleAdjustBStandActions {
- stop = "AadjPercMstpSrasWrflDdown_cse_rested";
- default = "AadjPercMstpSrasWrflDdown_cse_rested";
- AdjustB = "AadjPercMstpSrasWrflDdown_cse_rested";
- turnR = "AadjPercMstpSrasWrflDdown_cse_rested";
- turnL = "AadjPercMstpSrasWrflDdown_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLKneelActions_cse_rested : RifleAdjustLKneelActions {
- stop = "AadjPknlMstpSrasWrflDleft_cse_rested";
- default = "AadjPknlMstpSrasWrflDleft_cse_rested";
- turnL = "AadjPknlMstpSrasWrflDleft_cse_rested";
- turnR = "AadjPknlMstpSrasWrflDleft_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRKneelActions_cse_rested : RifleAdjustRKneelActions {
- stop = "AadjPknlMstpSrasWrflDright_cse_rested";
- default = "AadjPknlMstpSrasWrflDright_cse_rested";
- turnL = "AadjPknlMstpSrasWrflDright_cse_rested";
- turnR = "AadjPknlMstpSrasWrflDright_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFKneelActions_cse_rested : RifleAdjustFKneelActions {
- stop = "AadjPknlMstpSrasWrflDup_cse_rested";
- default = "AadjPknlMstpSrasWrflDup_cse_rested";
- turnL = "AadjPknlMstpSrasWrflDup_cse_rested";
- turnR = "AadjPknlMstpSrasWrflDup_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBKneelActions_cse_rested : RifleAdjustBKneelActions {
- stop = "AadjPknlMstpSrasWrflDdown_cse_rested";
- default = "AadjPknlMstpSrasWrflDdown_cse_rested";
- turnL = "AadjPknlMstpSrasWrflDdown_cse_rested";
- turnR = "AadjPknlMstpSrasWrflDdown_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleKneelActions_cse_rested : RifleKneelActions {
- stop = "AmovPknlMstpSrasWrflDnon_cse_rested";
- default = "AmovPknlMstpSrasWrflDnon_cse_rested";
- crouch = "AmovPknlMstpSrasWrflDnon_cse_rested";
- turnL = "AmovPknlMstpSrasWrflDnon_cse_rested";
- turnR = "AmovPknlMstpSrasWrflDnon_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleProneActions_cse_rested : RifleProneActions {
- stop = "AmovPpneMstpSrasWrflDnon_cse_rested";
- default = "AmovPpneMstpSrasWrflDnon_cse_rested";
- turnL = "AmovPpneMstpSrasWrflDnon_cse_rested";
- turnR = "AmovPpneMstpSrasWrflDnon_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLProneActions;
- class RifleAdjustLProneActions_cse_rested : RifleAdjustLProneActions {
- stop = "aadjppnemstpsraswrfldleft_cse_rested";
- default = "aadjppnemstpsraswrfldleft_cse_rested";
- turnL = "aadjppnemstpsraswrfldleft_cse_rested";
- turnR = "aadjppnemstpsraswrfldleft_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRProneActions;
- class RifleAdjustRProneActions_cse_rested : RifleAdjustRProneActions {
- stop = "aadjppnemstpsraswrfldright_cse_rested";
- default = "aadjppnemstpsraswrfldright_cse_rested";
- turnL = "aadjppnemstpsraswrfldright_cse_rested";
- turnR = "aadjppnemstpsraswrfldright_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBProneActions;
- class RifleAdjustBProneActions_cse_rested : RifleAdjustBProneActions {
- stop = "aadjppnemstpsraswrflddown_cse_rested";
- default = "aadjppnemstpsraswrflddown_cse_rested";
- turnL = "aadjppnemstpsraswrflddown_cse_rested";
- turnR = "aadjppnemstpsraswrflddown_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFProneActions_cse_rested : RifleAdjustFProneActions {
- stop = "aadjppnemstpsraswrfldup_cse_rested";
- default = "aadjppnemstpsraswrfldup_cse_rested";
- turnL = "aadjppnemstpsraswrfldup_cse_rested";
- turnR = "aadjppnemstpsraswrfldup_cse_rested";
- turnSpeed = CSE_DEPLOYED_TURNSPEED;
- limitFast = 1;
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_equipment/CfgMovesMaleSdr.h b/TO_MERGE/cse/sys_equipment/CfgMovesMaleSdr.h
deleted file mode 100644
index 207622724a..0000000000
--- a/TO_MERGE/cse/sys_equipment/CfgMovesMaleSdr.h
+++ /dev/null
@@ -1,403 +0,0 @@
-// Adpated from: https://github.com/Taosenai/tmr/blob/master/tmr_autorest/config.cpp
-
-#define CSE_SWAY_DEPLOYED 0.06
-#define CSE_SWAY_DEPLOYED_PRONE 0.03
-#define CSE_SWAY_RESTED 0.30
-#define CSE_SWAY_RESTED_PRONE 0.10
-
-class CfgMovesMaleSdr : CfgMovesBasic {
- class States {
- class AmovPercMstpSrasWrflDnon;
- class AmovPercMstpSrasWrflDnon_cse_deployed : AmovPercMstpSrasWrflDnon {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleStandActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"AmovPercMstpSrasWrflDnon_cse_deployed", 0.02};
- ConnectFrom[] = {"AmovPercMstpSrasWrflDnon_cse_deployed", 0.02};
- InterpolateFrom[] = {"AmovPercMstpSrasWrflDnon", 0.02};
- InterpolateTo[] = {"AmovPercMstpSrasWrflDnon", 0.02};
- };
-
- class aadjpercmstpsraswrfldup;
- class aadjpercmstpsraswrfldup_cse_deployed : aadjpercmstpsraswrfldup {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleAdjustFStandActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldup_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldup_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldup", 0.02};
- };
-
- class aadjpercmstpsraswrflddown;
- class aadjpercmstpsraswrflddown_cse_deployed : aadjpercmstpsraswrflddown {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleAdjustBStandActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrflddown_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrflddown_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrflddown", 0.02};
- };
-
- class aadjpercmstpsraswrfldright;
- class aadjpercmstpsraswrfldright_cse_deployed : aadjpercmstpsraswrfldright {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleAdjustRStandActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldright_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldright_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldright", 0.02};
- };
-
- class aadjpercmstpsraswrfldleft;
- class aadjpercmstpsraswrfldleft_cse_deployed : aadjpercmstpsraswrfldleft {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleAdjustLStandActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldleft_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldleft_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldleft", 0.02};
- };
-
- class aadjpknlmstpsraswrfldup;
- class aadjpknlmstpsraswrfldup_cse_deployed : aadjpknlmstpsraswrfldup {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleAdjustFKneelActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldup_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldup_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldup", 0.02};
- };
-
- class amovpknlmstpsraswrfldnon;
- class amovpknlmstpsraswrfldnon_cse_deployed : amovpknlmstpsraswrfldnon {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleKneelActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"amovpknlmstpsraswrfldnon_cse_deployed", 0.02};
- ConnectFrom[] = {"amovpknlmstpsraswrfldnon_cse_deployed", 0.02};
- InterpolateFrom[] = {"amovpknlmstpsraswrfldnon", 0.02};
- InterpolateTo[] = {"amovpknlmstpsraswrfldnon", 0.02};
- };
-
- class aadjpknlmstpsraswrflddown;
- class aadjpknlmstpsraswrflddown_cse_deployed : aadjpknlmstpsraswrflddown {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleAdjustBKneelActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrflddown_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrflddown_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrflddown", 0.02};
- };
-
- class aadjpknlmstpsraswrfldleft;
- class aadjpknlmstpsraswrfldleft_cse_deployed : aadjpknlmstpsraswrfldleft {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleAdjustLKneelActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldleft_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldleft_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldleft", 0.02};
- };
-
- class aadjpknlmstpsraswrfldright;
- class aadjpknlmstpsraswrfldright_cse_deployed : aadjpknlmstpsraswrfldright {
- aimPrecision = CSE_SWAY_DEPLOYED;
- actions = "RifleAdjustRKneelActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldright_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldright_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldright", 0.02};
- };
-
- class aadjppnemstpsraswrfldup;
- class aadjppnemstpsraswrfldup_cse_deployed : aadjppnemstpsraswrfldup {
- aimPrecision = CSE_SWAY_DEPLOYED_PRONE;
- actions = "RifleAdjustFProneActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldup_cse_deployed", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldup_cse_deployed", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldup", 0.02};
- };
-
- class amovppnemstpsraswrfldnon;
- class amovppnemstpsraswrfldnon_cse_deployed : amovppnemstpsraswrfldnon {
- aimPrecision = CSE_SWAY_DEPLOYED_PRONE;
- actions = "RifleProneActions_cse_deployed";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"amovppnemstpsraswrfldnon_cse_deployed", 0.02};
- ConnectFrom[] = {"amovppnemstpsraswrfldnon_cse_deployed", 0.02};
- InterpolateFrom[] = {"amovppnemstpsraswrfldnon", 0.02};
- InterpolateTo[] = {"amovppnemstpsraswrfldnon", 0.02};
- };
-
- class AmovPercMstpSrasWrflDnon_cse_rested : AmovPercMstpSrasWrflDnon {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleStandActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"AmovPercMstpSrasWrflDnon_cse_rested", 0.02};
- ConnectFrom[] = {"AmovPercMstpSrasWrflDnon_cse_rested", 0.02};
- InterpolateFrom[] = {"AmovPercMstpSrasWrflDnon", 0.02};
- InterpolateTo[] = {"AmovPercMstpSrasWrflDnon", 0.02};
- };
-
- class aadjpercmstpsraswrfldup_cse_rested : aadjpercmstpsraswrfldup {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleAdjustFStandActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldup_cse_rested", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldup_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldup", 0.02};
- };
-
- class aadjpercmstpsraswrflddown_cse_rested : aadjpercmstpsraswrflddown {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleAdjustBStandActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrflddown_cse_rested", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrflddown_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrflddown", 0.02};
- };
-
- class aadjpercmstpsraswrfldright_cse_rested : aadjpercmstpsraswrfldright {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleAdjustRStandActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldright_cse_rested", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldright_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldright", 0.02};
- };
-
- class aadjpercmstpsraswrfldleft_cse_rested : aadjpercmstpsraswrfldleft {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleAdjustLStandActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldleft_cse_rested", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldleft_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldleft", 0.02};
- };
-
- class aadjpknlmstpsraswrfldup_cse_rested : aadjpknlmstpsraswrfldup {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleAdjustFKneelActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldup_cse_rested", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldup_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldup", 0.02};
- };
-
- class amovpknlmstpsraswrfldnon_cse_rested : amovpknlmstpsraswrfldnon {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleKneelActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"amovpknlmstpsraswrfldnon_cse_rested", 0.02};
- ConnectFrom[] = {"amovpknlmstpsraswrfldnon_cse_rested", 0.02};
- InterpolateFrom[] = {"amovpknlmstpsraswrfldnon", 0.02};
- InterpolateTo[] = {"amovpknlmstpsraswrfldnon", 0.02};
- };
-
- class aadjpknlmstpsraswrflddown_cse_rested : aadjpknlmstpsraswrflddown {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleAdjustBKneelActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrflddown_cse_rested", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrflddown_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrflddown", 0.02};
- };
-
- class aadjpknlmstpsraswrfldleft_cse_rested : aadjpknlmstpsraswrfldleft {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleAdjustLKneelActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldleft_cse_rested", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldleft_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldleft", 0.02};
- };
-
- class aadjpknlmstpsraswrfldright_cse_rested : aadjpknlmstpsraswrfldright {
- aimPrecision = CSE_SWAY_RESTED;
- actions = "RifleAdjustRKneelActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldright_cse_rested", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldright_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldright", 0.02};
- };
-
- class aadjppnemstpsraswrfldup_cse_rested : aadjppnemstpsraswrfldup {
- aimPrecision = CSE_SWAY_RESTED_PRONE;
- actions = "RifleAdjustFProneActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldup_cse_rested", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldup_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldup", 0.02};
- };
-
- class aadjppnemstpsraswrfldleft;
- class aadjppnemstpsraswrfldleft_cse_rested : aadjppnemstpsraswrfldleft {
- aimPrecision = CSE_SWAY_RESTED_PRONE;
- actions = "RifleAdjustLProneActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldleft_cse_rested", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldleft_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldleft", 0.02};
- };
-
- class aadjppnemstpsraswrfldright;
- class aadjppnemstpsraswrfldright_cse_rested : aadjppnemstpsraswrfldright {
- aimPrecision = CSE_SWAY_RESTED_PRONE;
- actions = "RifleAdjustRProneActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldright_cse_rested", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldright_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldright", 0.02};
- };
-
- class aadjppnemstpsraswrflddown;
- class aadjppnemstpsraswrflddown_cse_rested : aadjppnemstpsraswrflddown {
- aimPrecision = CSE_SWAY_RESTED_PRONE;
- actions = "RifleAdjustBProneActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrflddown_cse_rested", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrflddown_cse_rested", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrflddown", 0.02};
- };
-
- class amovppnemstpsraswrfldnon_cse_rested : amovppnemstpsraswrfldnon {
- aimPrecision = CSE_SWAY_RESTED_PRONE;
- actions = "RifleProneActions_cse_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"amovppnemstpsraswrfldnon_cse_rested", 0.02};
- ConnectFrom[] = {"amovppnemstpsraswrfldnon_cse_rested", 0.02};
- InterpolateFrom[] = {"amovppnemstpsraswrfldnon", 0.02};
- InterpolateTo[] = {"amovppnemstpsraswrfldnon", 0.02};
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/CfgSounds.h b/TO_MERGE/cse/sys_equipment/CfgSounds.h
deleted file mode 100644
index 87c417cc0e..0000000000
--- a/TO_MERGE/cse/sys_equipment/CfgSounds.h
+++ /dev/null
@@ -1,28 +0,0 @@
-class CfgSounds
-{
- class cse_magrepack_finished
- {
- name="cse_magrepack_finished";
- sound[]={"\cse\cse_sys_equipment\magazineRepack\sound\magrepack_finished.wav",1,1};
- titles[]={};
- };
- class cse_magrepack_single
- {
- name="cse_magrepack_single";
- sound[]={"\cse\cse_sys_equipment\magazineRepack\sound\magrepack_single.wav",1,1};
- titles[]={};
- };
-
- class cse_weaponrest_rest
- {
- name="cse_weaponrest_rest";
- sound[]={"\cse\cse_sys_equipment\weaponresting\sound\weaponrest_rest.wav",1,1};
- titles[]={};
- };
- class cse_weaponrest_unrest
- {
- name="cse_weaponrest_unrest";
- sound[]={"\cse\cse_sys_equipment\weaponresting\sound\weaponrest_unrest.wav",1,1};
- titles[]={};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/CfgVehicles.h b/TO_MERGE/cse/sys_equipment/CfgVehicles.h
deleted file mode 100644
index f37c4dd6e9..0000000000
--- a/TO_MERGE/cse/sys_equipment/CfgVehicles.h
+++ /dev/null
@@ -1,224 +0,0 @@
-class CfgVehicles
-{
- class Land_HelipadEmpty_F;
- class cse_LogicDummy: Land_HelipadEmpty_F
- {
- scope = 1;
- slx_xeh_disabled = 1;
- class EventHandlers {
- init = "(_this select 0) enableSimulation false";
- };
- };
-
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
-
- class cse_sys_equipment: Module_F {
- scope = 2;
- displayName = "Equipment Options [CSE]";
- icon = "\cse\cse_main\data\cse_basic_module.paa";
- category = "cse_equipment";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- class magazineRepack {
- displayName = "Magazine Repack";
- description = "Lets players repack their magazines in the field";
- typeName = "BOOL";
- defaultValue = true;
- };
- class attachableItems {
- displayName = "Attachable Items";
- description = "Allows for attaching chemlights, IR strobes and the like";
- typeName = "BOOL";
- defaultValue = true;
- };
- class weaponResting {
- displayName = "Weapon Resting";
- description = "Allow players to rest their weapons and deploy bipods.";
- typeName = "BOOL";
- defaultValue = true;
- };
- class weaponSafety {
- displayName = "Weapon Safety";
- description = "Allow players to put their weapons on safe.";
- typeName = "BOOL";
- defaultValue = true;
- };
- class adjustableNVG {
- displayName = "NVG Adjustments";
- description = "Allow players to adjust their NVG brightness";
- typeName = "BOOL";
- defaultValue = true;
- };
- class allowWeaponSelect {
- displayName = "Weapon selection";
- description = "Allow players to select weapons through keybindings";
- typeName = "BOOL";
- defaultValue = true;
- };
- class allowAmmoChecking {
- displayName = "Ammo Checking";
- description = "Allow players to check their Ammunition";
- typeName = "BOOL";
- defaultValue = true;
- };
- class hideAmmoValues {
- displayName = "Hide Ammo";
- description = "Hide the Ammunition counter for players";
- typeName = "NUMBER";
- defaultValue = 0;
- class values {
- class enable {
- name = "Yes";
- value = 1;
- };
- class disable {
- name = "No";
- value = 0;
- default = 1;
- };
- };
- };
- };
- class ModuleDescription {
- description = "Various actions/equipment settings.";
- sync[] = {};
- };
- };
-
- // BACKWARDS COMPATABILITY MODULES PRESSENCE
- class cse_sys_magazineRepack: Module_F {
- scope = 1; // hidden for backwards compatability
- displayName = "Magazine Repack [CSE]";
- icon = "\cse\cse_main\data\cse_basic_module.paa";
- category = "cse_equipment";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- };
- class ModuleDescription {
- description = "Lets players repack their magazines in the field";
- sync[] = {};
- };
- };
- class cse_sys_attachableItems: Module_F {
- scope = 1; // hidden for backwards compatability
- displayName = "Attachable Items [CSE]";
- icon = "\cse\cse_main\data\cse_basic_module.paa";
- category = "cse_equipment";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- };
- class ModuleDescription {
- description = "Allows for attaching chemlights, IR strobes and the like";
- sync[] = {};
- };
- };
-
- class cse_sys_weaponrest: Module_F {
- scope = 1; // hidden for backwards compatability
- displayName = "Weapon Resting [CSE]";
- icon = "\cse\cse_main\data\cse_rifle_module.paa";
- category = "cse_equipment";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments
- {
-
- };
- };
-
- class cse_sys_weaponsafety: Module_F {
- scope = 1; // hidden for backwards compatability
- displayName = "Weapon Safety [CSE]";
- icon = "\cse\cse_main\data\cse_rifle_module.paa";
- category = "cse_equipment";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments
- {
-
- };
- };
-
- class cse_sys_nightvision: Module_F {
- scope = 1; // hidden for backwards compatability
- displayName = "Night Vision [CSE]";
- icon = "\cse\cse_main\data\cse_nvg_module.paa";
- category = "cse_equipment";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- };
- };
- // END BACKWARDS COMPATABILITY
-
-
- // curator modules
- class cse_moduleGroundFlare_White: Module_F {
- scope = 1;
- scopeCurator = 2;
- displayName = "White Flare (Ground)";
- icon = "\a3\Modules_F_Curator\Data\iconFlare_ca.paa";
- category = "Effects";
- function = "cse_fnc_moduleFlare_EQ";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- ammo = "CSE_FlareWhite";
- class Arguments {
- };
- class ModuleDescription {
- description = "Places a white flare on the ground";
- sync[] = {};
- };
- };
- class cse_moduleGroundFlare_Red: cse_moduleGroundFlare_White {
- displayName = "Red Flare (Ground)";
- ammo = "CSE_FlareRed";
- class Arguments {
- };
- class ModuleDescription {
- description = "Places a red flare on the ground";
- sync[] = {};
- };
- };
- class cse_moduleGroundFlare_Yellow: cse_moduleGroundFlare_White {
- displayName = "Yellow Flare (Ground)";
- ammo = "CSE_FlareYellow";
- class Arguments {
- };
- class ModuleDescription {
- description = "Places a yellow flare on the ground";
- sync[] = {};
- };
- };
- class cse_moduleGroundFlare_Green: cse_moduleGroundFlare_White {
- displayName = "Green Flare (Ground)";
- ammo = "CSE_FlareGreen";
- class Arguments {
- };
- class ModuleDescription {
- description = "Places a green flare on the ground";
- sync[] = {};
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/CfgWeapons.h b/TO_MERGE/cse/sys_equipment/CfgWeapons.h
deleted file mode 100644
index 2aa1cb1840..0000000000
--- a/TO_MERGE/cse/sys_equipment/CfgWeapons.h
+++ /dev/null
@@ -1,56 +0,0 @@
-class CfgWeapons {
- class GrenadeLauncher;
- class Throw: GrenadeLauncher {
- muzzles[] += {"CSE_FlareWhiteMuzzle", "CSE_FlareRedMuzzle", "CSE_FlareGreenMuzzle", "CSE_FlareYellowMuzzle", "CSE_RoadFlareWhiteMuzzle", "CSE_RoadFlareRedMuzzle", "CSE_RoadFlareGreenMuzzle", "CSE_RoadFlareYellowMuzzle"};
- class ThrowMuzzle;
- class CSE_FlareWhiteMuzzle: ThrowMuzzle {
- magazines[] = {"CSE_FlareWhite"};
- };
- class CSE_FlareRedMuzzle: ThrowMuzzle {
- magazines[] = {"CSE_FlareRed"};
- };
- class CSE_FlareGreenMuzzle: ThrowMuzzle {
- magazines[] = {"CSE_FlareGreen"};
- };
- class CSE_FlareYellowMuzzle: ThrowMuzzle {
- magazines[] = {"CSE_FlareYellow"};
- };
-
- class CSE_RoadFlareWhiteMuzzle: ThrowMuzzle {
- magazines[] = {"CSE_RoadFlareWhite"};
- };
- class CSE_RoadFlareRedMuzzle: ThrowMuzzle {
- magazines[] = {"CSE_RoadFlareRed"};
- };
- class CSE_RoadFlareGreenMuzzle: ThrowMuzzle {
- magazines[] = {"CSE_RoadFlareGreen"};
- };
- class CSE_RoadFlareYellowMuzzle: ThrowMuzzle {
- magazines[] = {"CSE_RoadFlareYellow"};
- };
- };
-
- class Rifle_Base_F;
- class Rifle_Long_Base_F;
- class arifle_MX_Base_F;
- class arifle_MX_SW_F: arifle_MX_Base_F
- {
- cse_bipod = 1;
- };
- class LMG_Mk200_F: Rifle_Base_F
- {
- cse_bipod = 1;
- };
- class LMG_Zafir_F: Rifle_Base_F
- {
- cse_bipod = 1;
- };
- class LRR_base_F: Rifle_Long_Base_F
- {
- cse_bipod = 1;
- };
- class GM6_base_F: Rifle_Long_Base_F
- {
- cse_bipod = 1;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_equipment/Combat_Space_Enhancement.h
deleted file mode 100644
index e1ae338102..0000000000
--- a/TO_MERGE/cse/sys_equipment/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#define MENU_KEYBINDING 1
-#define ACTION_KEYBINDING 2
-#define CLIENT_SETTING 3
-
-class Combat_Space_Enhancement {
- class EventHandlers {
- class PostInit_EventHandlers {
- class cse_sys_equipment {
- // init = " call compile preprocessFile 'cse\cse_sys_equipment\init_sys_equipment.sqf';";
- };
- };
- };
- class cfgModules {
- class cse_sys_equipment {
- init = "call compile preprocessFile 'cse\cse_sys_equipment\init_sys_equipment.sqf';";
- name = "Equipment Module";
- class EventHandlers {
- class AllVehicles {
- GetOut = "if (CSE_HIDE_AMMO_COUNTERS_EQ> 0) then { if (_this select 2 == player) then {0 = [] spawn { waituntil {vehicle player == player}; [true] call cse_fnc_hidEUnitInfoAmmo_EQ;};};};";
- };
- };
- };
-
- // BACKWARDS COMPATABILITY MODULES
- // Have to stay put, as cse_sys_equipment will make use of them.
- // The modules themselves will be hidden.
- class cse_sys_magazineRepack {
- init = "call compile preprocessFile 'cse\cse_sys_equipment\scripts\register_magazine_repack_actions.sqf';";
- name = "Magazine Repack";
- disableConfigExecution = 1;
- };
- class cse_sys_attachableItems {
- init = "call compile preprocessFile 'cse\cse_sys_equipment\scripts\register_attachable_items_actions.sqf';";
- name = "Attachable Items";
- disableConfigExecution = 1;
- };
-
- class cse_sys_weaponrest {
- init = "call compile preprocessFile 'cse\cse_sys_equipment\weaponresting\init_sys_weaponrest.sqf';";
- name = "Weapon Resting & Bipods";
- disableConfigExecution = 1;
- class Configurations {
- class cse_sys_weaponRestAction {
- type = ACTION_KEYBINDING;
- title = $STR_DEPLOY_WEAPON_REST_TTTLE;
- description = $STR_DEPLOY_WEAPON_REST_DESC;
- value[] = {56,1,2,2};
- onPressed = "[] call cse_fnc_keyPressed_WR;";
- };
- class cse_sys_weaponUnrestAction {
- type = ACTION_KEYBINDING;
- title = $STR_DEPLOY_WEAPON_UNREST_TTTLE;
- description = $STR_DEPLOY_WEAPON_UNREST_DESC;
- value[] = {0,0,0,0};
- onPressed = "[] call cse_fnc_actionReleaseWeapon_WR;";
- };
- };
- };
- class cse_sys_weaponsafety {
- init = "call compile preprocessFile 'cse\cse_sys_equipment\weaponsafety\init_sys_weaponsafety.sqf';";
- name = "Weapon Safety";
- disableConfigExecution = 1;
- };
- class cse_sys_nightvision {
- init = "call compile preprocessFile 'cse\cse_sys_equipment\nvg\init_sys_nightvision.sqf';";
- name = "Night Vision";
- disableConfigExecution = 1;
- class Configurations {
- class cse_sys_nvgAdjustBrightness_UP {
- type = ACTION_KEYBINDING;
- title = $STR_INCREASE_NVG_BIRGHTNESS_TITLE;
- description = $STR_INCREASE_NVG_BIRGHTNESS_DESC;
- value[] = {201,0,0,1};
- onPressed = "[player,0.1] call cse_fnc_adjustBrightness_NVG;";
- };
- class cse_sys_nvgAdjustBrightness_DOWN {
- type = ACTION_KEYBINDING;
- title = $STR_DECREASE_NVG_BIRGHTNESS_TITLE;
- description = $STR_DECREASE_NVG_BIRGHTNESS_DESC;
- value[] = {209,0,0,1};
- onPressed = "[player,-0.1] call cse_fnc_adjustBrightness_NVG;";
- };
- };
- };
-
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/UI.h b/TO_MERGE/cse/sys_equipment/UI.h
deleted file mode 100644
index 11255d108c..0000000000
--- a/TO_MERGE/cse/sys_equipment/UI.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "ui\rscTitles.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/config.cpp b/TO_MERGE/cse/sys_equipment/config.cpp
deleted file mode 100644
index 106d0e6b37..0000000000
--- a/TO_MERGE/cse/sys_equipment/config.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-class CfgPatches {
- class cse_sys_equipment {
- units[] = {"cse_moduleGroundFlare_White", "cse_moduleGroundFlare_Red","cse_moduleGroundFlare_Green","cse_moduleGroundFlare_Yellow"};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"A3_Modules_F", "A3_UI_F", "cse_main", "cse_gui", "cse_f_eh"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- website = "csemod.com";
- };
- class cse_sys_magazineRepack {
- units[] = {};
- weapons[] = {};
- requiredVersion = 1.0;
- requiredAddons[] = {"cse_f_eh","cse_main"};
- versionDesc = "CSE Magazine Repack";
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
- class cse_sys_weaponrest {
- units[] = {};
- weapons[] = {};
- requiredVersion = 1.0;
- requiredAddons[] = {"cse_f_eh","cse_main", "A3_Weapons_F", "A3_Weapons_F_Rifles_MX"};
- versionDesc = "CSE Weapon Resting";
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement", "Tupolov", "Glowbal"};
- authorUrl = "http://csemod.com";
- };
- class cse_sys_nightvision {
- units[] = {};
- weapons[] = {};
- requiredVersion = 1.0;
- requiredAddons[] = {"cse_f_eh","cse_main"};
- versionDesc = "CSE Night Vision";
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_equipment {
- list[] = {"cse_sys_equipment", "cse_sys_magazineRepack", "cse_sys_weaponrest", "cse_sys_nightvision"};
- };
- };
-};
-#include "Combat_Space_Enhancement.h"
-#include "CfgFactionClasses.h"
-#include "CfgVehicles.h"
-#include "CfgFunctions.h"
-#include "CfgSounds.h"
-#include "CfgAmmo.h"
-#include "CfgWeapons.h"
-#include "CfgMovesBasic.h"
-#include "CfgMovesMaleSdr.h"
-#include "UI.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_areEquipmentOptionsAvailable_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_areEquipmentOptionsAvailable_EQ.sqf
deleted file mode 100644
index 4a805582ce..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_areEquipmentOptionsAvailable_EQ.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_areEquipmentOptionsAvailable_EQ.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return","_equipOpt"];
-_return = false;
-_equipOpt = ([] call cse_fnc_getAllEquipmentOptions_EQ);
-{
- if (_this call (_x select 1)) exitwith {
- _return = true;
- };
-}foreach _equipOpt;
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_attachItem_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_attachItem_EQ.sqf
deleted file mode 100644
index 570bc37d33..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_attachItem_EQ.sqf
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * fn_attachItem_EQ.sqf
- * @Descr: Attach an item of given classname.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, item STRING (Classname of magazine item)]
- * @Return: nil
- * @PublicAPI: true
- */
-
-private ["_unit","_chemlight","_isStrobeLight", "_light"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-_item = [_this, 1, "", [""]] call BIS_fnc_Param;
-
-[format["Attach item: %1",_this]] call cse_fnc_debug;
-
-if (!isNull(_unit getvariable ["cse_attachedItem_EQ",objNull])) exitwith {};
-if !([_unit,_item] call cse_fnc_hasMagazine) exitwith{};
-if !([_item] call cse_fnc_isAttachableItem_EQ) exitwith{};
-
-_unit setvariable ["cse_attachedItemClassName_EQ", _item];
-
-_isStrobeLight = switch (_item) do {
- case "B_IR_Grenade": {true};
- case "I_IR_Grenade": {true};
- case "O_IR_Grenade": {true};
- default {false};
-};
-if (_isStrobeLight) then {
- _light = (toString [(toArray _item) select 0] + "_IRStrobe") createVehicle (getPos _unit);
-} else {
- _light = _item createVehicle (getPos _unit);
-};
-
-if (!isNull _light) then {
- [_unit,_item] call cse_fnc_useMagazine;
- _light attachTo [_unit,[0.1,-0.1,-0.1],"head"];
- _unit setvariable["cse_attachedItem_EQ",_light,true];
-};
-
-
-
-[_unit, _light] spawn {
- _unit = _this select 0;
- _light = _this select 1;
- while {((alive _light) && !isNull(_unit getvariable ["cse_attachedItem_EQ",objNull]) && alive _unit)} do {
- if (vehicle _unit != _unit) then {
- _positionInWorld = _unit modelToWorld (_unit selectionPosition "head");
- _vehPos = (vehicle _unit) worldToModel _positionInWorld;
- _light attachTo [(vehicle _unit),_vehPos];
- } else {
- _light attachTo [_unit,[0.1,-0.1,-0.1],"head"];
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_detachItem_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_detachItem_EQ.sqf
deleted file mode 100644
index e962f9b2ea..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_detachItem_EQ.sqf
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * fn_detachItem_EQ.sqf
- * @Descr: Detach current attached item and add it back to the magazines list of the unit.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL True if succesful.
- * @PublicAPI: true
- */
-
-private ["_unit","_chemlight","_isStrobeLight", "_light","_item", "_originalCount"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-
-_item = _unit getvariable ["cse_attachedItem_EQ",objNull];
-_unit setvariable["cse_attachedItem_EQ",nil,true];
-
-if (isNull _item) exitwith {true};
-_isStrobeLight = switch (typeOf _item) do {
- case "B_IRStrobe": {true};
- case "I_IRStrobe": {true};
- case "O_IRStrobe": {true};
- default {false};
-};
-if (_isStrobeLight) then {
- _light = switch (typeOf _item) do {
- case "B_IRStrobe": {"B_IR_Grenade"};
- case "I_IRStrobe": {"I_IR_Grenade"};
- case "O_IRStrobe": {"O_IR_Grenade"};
- };
-} else {
- _light = typeOf _item;
-};
-[format ["Detaching %1 %2", _unit, _light]] call cse_fnc_debug;
- _originalCount = ({_x == _light} count magazines _unit);
-
-_unit addMagazine [_light, 1];
-if ((_originalCount + 1) < ({_x == _light} count magazines _unit)) then {
- _unit removeMagazine _light;
-};
-detach _item;
-
-if (_isStrobeLight) then {
- _item setPos [-10000,-10000,-10000];
-
- // sleeping to ensure the IR strobe effect is properly gone before we delete the source.
- sleep 5;
-};
-deleteVehicle _item;
-true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_dropFlare_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_dropFlare_EQ.sqf
deleted file mode 100644
index b7e94e91f0..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_dropFlare_EQ.sqf
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * fn_dropFlare_EQ.sqf
- * @Descr: Drop a flare object
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, flare STRING (Classname of the flare or fusee)]
- * @Return: OBJECT The created flare. Objnull if failure.
- * @PublicAPI: true
- */
-
-private ["_unit", "_item", "_flareObj"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-_item = [_this, 1, "", [""]] call BIS_fnc_Param;
-
-_continue = switch (_item) do {
- case "CSE_FlareWhite": {true};
- case "CSE_FlareRed": {true};
- case "CSE_FlareGreen": {true};
- case "CSE_FlareYellow": {true};
- case "CSE_RoadFlareWhite": {true};
- case "CSE_RoadFlareRed": {true};
- case "CSE_RoadFlareGreen": {true};
- case "CSE_RoadFlareYellow": {true};
- default {false};
-};
-if (!_continue) exitwith {objNull};
-if (_unit isKindof "CAManBAse") then {
- [_unit, _item] call cse_fnc_useMagazine;
-};
-_flareObj = _item createVehicle getPos _unit;
-
-_flareObj
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_getAllEquipmentOptions_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_getAllEquipmentOptions_EQ.sqf
deleted file mode 100644
index ad4d42b68e..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_getAllEquipmentOptions_EQ.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_getAllEquipmentOptions_EQ.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private["_return"];
-_return = [];
-if (isnil "CSE_EQUIPMENT_OPTIONS_EQ") then {
- CSE_EQUIPMENT_OPTIONS_EQ = _return;
-};
-/*
-{
- _return set [count _return, _x];
-}foreach CSE_EQUIPMENT_OPTIONS_EQ;
-*/
-_return = + CSE_EQUIPMENT_OPTIONS_EQ;
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_getPercentageAmmoMagazine_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_getPercentageAmmoMagazine_EQ.sqf
deleted file mode 100644
index 46455c4066..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_getPercentageAmmoMagazine_EQ.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_getPercentageAmmoMagazine_EQ.sqf
- * @Descr: Get percentage of ammo in currentMagazine left.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: NUMBER A number between 100 and 0, with 100 being a full magazine and 0 being empty (No ammo left).
- * @PublicAPI: true
- */
-
-private ["_unit", "_percentage", "_maxAmmoCount", "_currentAmmoCount"];
-_unit = _this select 0;
-_percentage = 0;
-
-if (currentWeapon _unit != "") then {
- {
- if (_x select 4 == currentMuzzle _unit) exitWith {
- _currentAmmoCount = _x select 1;
- _maxAmmoCount = getNumber(configFile >> "CfgMagazines" >> (_x select 0) >> "count");
- if (_maxAmmoCount > 0) then {
- _percentage = (_currentAmmoCount / _maxAmmoCount) * 100;
- };
- };
- } forEach (magazinesAmmoFull _unit);
-};
-
-_percentage
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_hasAttachableItem_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_hasAttachableItem_EQ.sqf
deleted file mode 100644
index a130e32ef6..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_hasAttachableItem_EQ.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_hasAttachableItem_EQ.sqf
- * @Descr: Check if unit has an attachable Item.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_unit","_return"];
-_unit = _this select 0;
-_return = false;
-{
- if ([_x] call cse_fnc_isAttachableItem_EQ) exitwith {
- _return = true;
- };
-}foreach (magazines _unit);
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_hasFlare_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_hasFlare_EQ.sqf
deleted file mode 100644
index f8579d2f97..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_hasFlare_EQ.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_hasFlare_EQ.sqf
- * @Descr: Check if given unit has a flare.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private[ "_unit", "_return"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-if !(_unit isKindof "CAManBase") exitwith {false};
-_return = false;
-{
- if ([_x] call cse_fnc_isFlare_EQ) exitwith {_return = true;};
-}foreach (magazines _unit);
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_hasItemAttached_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_hasItemAttached_EQ.sqf
deleted file mode 100644
index 2a32cd4d8a..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_hasItemAttached_EQ.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_hasItemAttached_EQ.sqf
- * @Descr: Check if unit has an item attached
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_unit", "_item"];
-_unit = _this select 0;
-_item = _unit getvariable ["cse_attachedItem_EQ",objNull];
-
-(!isNull _item);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_hideUnitInfoAmmo_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_hideUnitInfoAmmo_EQ.sqf
deleted file mode 100644
index 233709a562..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_hideUnitInfoAmmo_EQ.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_hideUnitInfoAmmo_EQ.sqf
- * @Descr: Hide the unitInfo ammo related parts. Credits Vladimir Hynek (BI Dev) for original code from BIS_fnc_showUnitInfo
- * @Author: Glowbal
- *
- * @Arguments: [hide BOOL]
- * @Return: nil
- * @PublicAPI: true
- */
-
-private ["_hide"];
-_hide = [_this, 0, true, [true]] call BIS_fnc_param;
-[format["Hiding unitAmmoInfo %1", _hide]] call cse_fnc_debug;
-disableSerialization;
-{
- if((ctrlIDD _x) == 300) then
- {
- private ["_unitInfoDisplay"];
- _unitInfoDisplay = _x;
-
- {
- if (_x in [184, 185, 151]) then {
- private ["_ctrl"];
- _ctrl = _unitInfoDisplay displayCtrl _x;
-
- if(_hide) then
- {
- _ctrl ctrlSetFade 1;
- }
- else
- {
- _ctrl ctrlSetFade 0;
- };
-
- _ctrl ctrlCommit 0;
- };
- } foreach ([(configfile >> "RscInGameUI" >> "RscUnitInfo"), 0] call bis_fnc_displaycontrols);
- };
-} foreach (uinamespace getvariable "IGUI_displays"); //RscUnitInfo can be present several times for some reason
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_isAttachableItem_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_isAttachableItem_EQ.sqf
deleted file mode 100644
index 74bb063199..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_isAttachableItem_EQ.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * fn_isAttachableItem_EQ.sqf
- * @Descr: Check if item is an attachable Item.
- * @Author: Glowbal
- *
- * @Arguments: [item STRING (Classname of item)]
- * @Return: BOOL
- * @PublicAPI: false
- */
-
-private ["_chemlight","_return"];
-_chemlight = _this select 0;
-_return = switch (_chemlight) do {
- case "Chemlight_blue": {true};
- case "Chemlight_red": {true};
- case "Chemlight_green": {true};
- case "Chemlight_yellow": {true};
- case "B_IR_Grenade": {true};
- case "I_IR_Grenade": {true};
- case "O_IR_Grenade": {true};
- default {false};
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_isFlare_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_isFlare_EQ.sqf
deleted file mode 100644
index 5445e191be..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_isFlare_EQ.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_isFlare_EQ.sqf
- * @Descr: Check if given classname is a CSE Flare
- * @Author: Glowbal
- *
- * @Arguments: [classname STRING (Magazine classname to check)]
- * @Return: BOOL True if classname is a flare.
- * @PublicAPI: true
- */
-
-private ["_classname", "_return"];
-_classname = [_this, 0, "", [""]] call BIS_fnc_Param;
-_return = switch (_classname) do {
- case "CSE_FlareWhite": {true};
- case "CSE_FlareRed": {true};
- case "CSE_FlareGreen": {true};
- case "CSE_FlareYellow": {true};
- case "CSE_RoadFlareWhite": {true};
- case "CSE_RoadFlareRed": {true};
- case "CSE_RoadFlareGreen": {true};
- case "CSE_RoadFlareYellow": {true};
- default {false};
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_moduleFlare_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_moduleFlare_EQ.sqf
deleted file mode 100644
index 82a43966ee..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_moduleFlare_EQ.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_moduleFlare_EQ.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_logic", "_className", "_cfg", "_ammo", "_flare"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-
-if (!isNull _logic) then {
- _className = typeOf _logic;
- _cfg = (ConfigFile >> "CfgVehicles" >> _className);
- _ammo = getText(_cfg >> "ammo");
- if (_ammo != "") then {
- _flare = [_logic, _ammo] call cse_fnc_dropFlare_EQ;
- if (isnull _flare) then {
- deleteVehicle _logic;
- deleteVehicle _flare;
- } else {
- _logic setvariable ["cse_droppedFlare", _flare];
-
- {
- if !(_x getvariable ["CSE_CURATOR_ADDITIONAL_EQ", false]) then {
- _x setvariable ["CSE_CURATOR_ADDITIONAL_EQ", true];
- _X addEventHandler["CuratorObjectDeleted", {
- _obj = _this select 1;
- if !(isNull (_obj getvariable ["cse_droppedFlare", objNull])) then {
- deleteVehicle (_obj getvariable ["cse_droppedFlare", objNull]);
- };
- }];
- };
- }foreach objectCurators _logic;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_putWeaponOnBack_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_putWeaponOnBack_EQ.sqf
deleted file mode 100644
index 63d1af890b..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_putWeaponOnBack_EQ.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * fn_putWeaponOnBack_EQ.sqf
- * @Descr: Put unit weapon on the back.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: void
- * @PublicAPI: true
- */
-
-#define MUZZLE_INDEX 100
-
-private ["_unit"];
-_unit = _this select 0;
-_unit action ["SwitchWeapon", _unit, _unit, MUZZLE_INDEX];
-
-nil;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/functions/fn_registerNewEquipmentOption_EQ.sqf b/TO_MERGE/cse/sys_equipment/functions/fn_registerNewEquipmentOption_EQ.sqf
deleted file mode 100644
index 8754bbdc24..0000000000
--- a/TO_MERGE/cse/sys_equipment/functions/fn_registerNewEquipmentOption_EQ.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * fn_registerNewEquipmentOption_EQ.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_name","_condition","_code"];
-_name = _this select 0;
-_condition = _this select 1;
-_code = _this select 2;
-
-if (typeName _name != typeName "" || typeName _condition != typeName {} || typeName _code != typeName{}) exitwith {};
-
-if (isnil "CSE_REGISTERING_EQUIPMENT_OPTION") then {
- CSE_REGISTERING_EQUIPMENT_OPTION = false;
-};
-sleep (random(0.5));
-waituntil {!CSE_REGISTERING_EQUIPMENT_OPTION};
-CSE_REGISTERING_EQUIPMENT_OPTION = true;
-
-if (isnil "CSE_EQUIPMENT_OPTIONS_EQ") then {
- CSE_EQUIPMENT_OPTIONS_EQ = [];
-};
-CSE_EQUIPMENT_OPTIONS_EQ pushback [_name,_condition,_code];
-
-CSE_REGISTERING_EQUIPMENT_OPTION = false;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/init_sys_equipment.sqf b/TO_MERGE/cse/sys_equipment/init_sys_equipment.sqf
deleted file mode 100644
index a5687141eb..0000000000
--- a/TO_MERGE/cse/sys_equipment/init_sys_equipment.sqf
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- NAME: init
- USAGE:
- AUTHOR: Glowbal
- RETURN: void
-
-*/
-
-waituntil{!isnil "cse_gui"};
-cse_equip_module = true;
-_allowMagazineRepack = true;
-_haveAttachableItems = true;
-_allowWeaponRest = false;
-_allowWeaponSafety = false;
-_nvgBrightness = false;
-_allowSelectWeaponKeybindings = false;
-_allowCheckAmmoKeybindings = false;
-CSE_HIDE_AMMO_COUNTERS_EQ = 0;
-
-_args = _this;
-{
- _value = _x select 1;
- if (!isnil "_value") then {
- _name = _x select 0;
- if (_name == "magazineRepack") exitwith {
- _allowMagazineRepack = _value;
- };
- if (_name == "attachableItems") exitwith {
- _haveAttachableItems = _value;
- };
- if (_name == "weaponResting") exitwith {
- _allowWeaponRest = _value;
- };
- if (_name == "weaponSafety") exitwith {
- _allowWeaponSafety = _value;
- };
- if (_name == "adjustableNVG") exitwith {
- _nvgBrightness = _value;
- };
- if (_name == "allowWeaponSelect") exitwith {
- _allowSelectWeaponKeybindings = _value;
- };
- if (_name == "allowAmmoChecking") exitwith {
- _allowCheckAmmoKeybindings = _value;
- };
- if (_name == "hideAmmoValues") exitwith {
- CSE_HIDE_AMMO_COUNTERS_EQ = _value;
- };
- };
-}foreach _args;
-
-if (_allowSelectWeaponKeybindings) then {
- #include "scripts\select_weapon_keybindings.sqf"
-};
-
-if (_allowCheckAmmoKeybindings) then {
- #include "scripts\check_ammo_keybindings.sqf"
-};
-
-if (_haveAttachableItems) then {
- #include "scripts\register_attachable_items_actions.sqf"
-};
-
-if (_allowMagazineRepack) then {
- #include "scripts\register_magazine_repack_actions.sqf"
-};
-
-if (_allowWeaponSafety) then {
- ["cse_sys_weaponsafety", []] call cse_fnc_enableModule_f;
-};
-
-if (_allowWeaponRest) then {
- ["cse_sys_weaponrest", []] call cse_fnc_enableModule_f;
-};
-
-if (_nvgBrightness) then {
- ["cse_sys_nightvision", []] call cse_fnc_enableModule_f;
-};
-
-[format["EQUIP - EQUIPMENT module initialised"],2] call cse_fnc_debug;
-
-if (CSE_HIDE_AMMO_COUNTERS_EQ > 0) then {
- waituntil {!isnil "cse_gui"};
- sleep 0.5;
- if (vehicle player == player) then {
- [true] call cse_fnc_hideUnitInfoAmmo_EQ;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/magazineRepack/functions/fn_repackMagazines.sqf b/TO_MERGE/cse/sys_equipment/magazineRepack/functions/fn_repackMagazines.sqf
deleted file mode 100644
index 24224a01c7..0000000000
--- a/TO_MERGE/cse/sys_equipment/magazineRepack/functions/fn_repackMagazines.sqf
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * fn_repackMagazines.sqf
- * @Descr: Repacks all magazines of given type for a unit
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, classname STRING]
- * @Return:
- * @PublicAPI: true
- */
-
-#define MAGAZINE_ACCESS_DELAY 3.0
-#define AMMO_REPACK_DELAY 2.0
-
-private ["_unit", "_className", "_magazineCapacity", "_magazines", "_repackableAmmoCount", "_repackableMagazinesCount", "_repackableMagazinesAmmoCounts", "_magazineClassName", "_magazineAmmoCount", "_amountOfFillableMagazines", "_workLoad", "_totalRepackTime", "_firstIndex", "_lastIndex", "_startTime", "_greatestAmmoCount", "_smallestAmmoCount"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
-_className = [_this, 1, "", [""]] call bis_fnc_param;
-
-if (isNull _unit || _className == "") exitwith {};
-if (vehicle _unit != _unit && {driver (vehicle _unit) == _unit || commander (vehicle _unit) == _unit || gunner (vehicle _unit) == _unit}) exitWith {};
-
-if (vehicle _unit == _unit && currentWeapon _unit != "" && !(weaponLowered _unit) && (stance player != "PRONE")) then {
- _unit action ["WeaponOnBack", _unit];
- waitUntil { weaponLowered _unit }; // probably evil
-};
-
-_magazineCapacity = getNumber(configFile >> "CfgMagazines" >> _className >> "count");
-
-_magazines = magazinesAmmo _unit;
-_repackableAmmoCount = 0;
-_repackableMagazinesCount = 0;
-_repackableMagazinesAmmoCounts = [];
-{
- _magazineClassName = (_x select 0);
- _magazineAmmoCount = (_x select 1);
- if (_magazineClassName == _className && _magazineAmmoCount < _magazineCapacity) then {
- // sums the amount of remaining ammo in all used magazines
- _repackableAmmoCount = _repackableAmmoCount + _magazineAmmoCount;
- _repackableMagazinesCount = _repackableMagazinesCount + 1;
- _repackableMagazinesAmmoCounts pushBack _magazineAmmoCount;
- };
-} forEach _magazines;
-
-if (_repackableMagazinesCount < 2) exitWith {};
-
-[getText(configFile >> "CfgMagazines" >> _className >> "displayName"), ["Starting magazine repack"], 0] call cse_fnc_gui_displayInformation;
-
-_amountOfFillableMagazines = floor(_repackableAmmoCount / _magazineCapacity);
-
-_repackableMagazinesAmmoCounts = [_repackableMagazinesAmmoCounts, false] call cse_fnc_insertionSort;
-
-_workLoad = 0; // amount of ammo that needs to be repacked
-for "_i" from 0 to _amountOfFillableMagazines - 1 do {
- _workLoad = _workLoad + (_magazineCapacity - (_repackableMagazinesAmmoCounts select _i));
-};
-
-CSE_ORIGINAL_POSITION_MAG_REPACK_EQ = getPos _unit;
-CSE_CONDITION_MAG_REPACK_EQ = {((vehicle player != player && driver (vehicle player) != player && commander (vehicle player) != player && gunner (vehicle player) != player) || (((getPos player) distance CSE_ORIGINAL_POSITION_MAG_REPACK_EQ) < 1 && (weaponLowered player) || (stance player == "PRONE")))};
-CSE_RUNNING_MAG_REPACK_EQ = true;
-_totalRepackTime = MAGAZINE_ACCESS_DELAY * (count _repackableMagazinesAmmoCounts) + AMMO_REPACK_DELAY * _workLoad;
-_totalRepackTime spawn {
- CSE_RUNNING_MAG_REPACK_EQ = [_this, CSE_CONDITION_MAG_REPACK_EQ] call cse_fnc_gui_loadingBar;
-};
-
-_startTime = diag_tickTime; waitUntil {diag_tickTime - _startTime > MAGAZINE_ACCESS_DELAY};
-_firstIndex = 0;
-_lastIndex = _repackableMagazinesCount - 1;
-while {CSE_RUNNING_MAG_REPACK_EQ && _lastIndex > _firstIndex} do {
- _greatestAmmoCount = _repackableMagazinesAmmoCounts select _firstIndex;
- _smallestAmmoCount = _repackableMagazinesAmmoCounts select _lastIndex;
-
- _startTime = diag_tickTime; waitUntil {diag_tickTime - _startTime > AMMO_REPACK_DELAY / 2.0};
- if (!CSE_RUNNING_MAG_REPACK_EQ) exitWith {};
- playSound "cse_magrepack_single";
- _repackableMagazinesAmmoCounts set [_lastIndex, _smallestAmmoCount - 1];
- _startTime = diag_tickTime; waitUntil {diag_tickTime - _startTime > AMMO_REPACK_DELAY / 2.0};
- if (!CSE_RUNNING_MAG_REPACK_EQ) exitWith {};
- playSound "cse_magrepack_finished";
- _repackableMagazinesAmmoCounts set [_firstIndex, _greatestAmmoCount + 1];
-
- // Skip full magazines
- if (_repackableMagazinesAmmoCounts select _firstIndex == _magazineCapacity) then {
- _startTime = diag_tickTime; waitUntil {diag_tickTime - _startTime > MAGAZINE_ACCESS_DELAY};
- _firstIndex = _firstIndex + 1;
- [getText(configFile >> "CfgMagazines" >> _className >> "displayName"), [format["Finished repacking (%1/%2) magazines", _firstIndex, _amountOfFillableMagazines]], 0] call cse_fnc_gui_displayInformation;
- };
- // Skip empty magazines
- if (_repackableMagazinesAmmoCounts select _lastIndex == 0) then {
- _startTime = diag_tickTime; waitUntil {diag_tickTime - _startTime > MAGAZINE_ACCESS_DELAY};
- _lastIndex = _lastIndex - 1;
- };
-};
-
-// Apply changes
-for "_i" from 1 to _repackableMagazinesCount do {
- _unit removeMagazine _className;
-};
-for "_i" from 0 to _lastIndex do {
- _unit addMagazine [_className, _repackableMagazinesAmmoCounts select _i];
-};
-
-if (_firstIndex >= _lastIndex) then {
- [getText(configFile >> "CfgMagazines" >> _className >> "displayName"), ["Completed magazine repack"], 0] call cse_fnc_gui_displayInformation;
-} else {
- [getText(configFile >> "CfgMagazines" >> _className >> "displayName"), ["Aborted magazine repack"], 0] call cse_fnc_gui_displayInformation;
-};
diff --git a/TO_MERGE/cse/sys_equipment/magazineRepack/functions/fn_repackMagazinesAll.sqf b/TO_MERGE/cse/sys_equipment/magazineRepack/functions/fn_repackMagazinesAll.sqf
deleted file mode 100644
index 5de419f683..0000000000
--- a/TO_MERGE/cse/sys_equipment/magazineRepack/functions/fn_repackMagazinesAll.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_repackMagazinesAll.sqf
- * @Descr: Repacks all magazines of a unit
- * @Author: Glowbal, Ruthberg
- *
- * @Arguments: [unit OBJECT]
- * @Return: nil
- * @PublicAPI: true
- */
-
-private ["_unit", "_passedMags"];
-_unit = _this select 0;
-
-_passedMags = [];
-{
- if (!((_x select 0) in _passedMags)) then {
- _passedMags pushback (_x select 0);
- [_unit, (_x select 0)] call cse_fnc_repackMagazines;
- };
-} forEach (magazinesAmmo _unit);
diff --git a/TO_MERGE/cse/sys_equipment/magazineRepack/sound/magrepack_finished.wav b/TO_MERGE/cse/sys_equipment/magazineRepack/sound/magrepack_finished.wav
deleted file mode 100644
index ab73615a55..0000000000
Binary files a/TO_MERGE/cse/sys_equipment/magazineRepack/sound/magrepack_finished.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_equipment/magazineRepack/sound/magrepack_single.wav b/TO_MERGE/cse/sys_equipment/magazineRepack/sound/magrepack_single.wav
deleted file mode 100644
index 5d94e215fd..0000000000
Binary files a/TO_MERGE/cse/sys_equipment/magazineRepack/sound/magrepack_single.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_equipment/nvg/functions/fn_adjustBrightness_NVG.sqf b/TO_MERGE/cse/sys_equipment/nvg/functions/fn_adjustBrightness_NVG.sqf
deleted file mode 100644
index f75fd52c9f..0000000000
--- a/TO_MERGE/cse/sys_equipment/nvg/functions/fn_adjustBrightness_NVG.sqf
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * fn_adjustBrightness_NVG.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_increase","_currentBrightness","_newBrightness"];
-_unit = [_this,0,ObjNull,[ObjNUll]] call BIS_fnc_Param;
-_increase = [_this, 1, 0,[0]] call BIS_fnc_Param;
-_currentBrightness = _unit getVariable ["cse_sys_nightvision_brightness", 1];
-
-_newBrightness = _currentBrightness + _increase;
-if (_newBrightness < -0.1) then {
- _newBrightness = -0.1;
-} else {
- if (_newBrightness > 2) then {
- _newBrightness = 2;
- };
-};
-_unit setVariable ["cse_sys_nightvision_brightness", _newBrightness];
-
-if (_newBrightness != _currentBrightness) then {
- if (_increase > 0) then {
- hintSilent "Increased NVG Brightness";
- } else {
- hintSilent "decreased NVG Brightness";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/nvg/init_sys_nightvision.sqf b/TO_MERGE/cse/sys_equipment/nvg/init_sys_nightvision.sqf
deleted file mode 100644
index 9df0185f27..0000000000
--- a/TO_MERGE/cse/sys_equipment/nvg/init_sys_nightvision.sqf
+++ /dev/null
@@ -1,51 +0,0 @@
-#define PP_EFFECT_GRAIN_INTENSITVE 0.25 // 0 to 1
-#define PP_EFFECT_GRAIN_SHARPNESS 1 // 0 to 20
-#define PP_EFFECT_GRAIN_SIZE 2.5 // 1 to 8
-#define PP_EFFECT_GRAIN_INTENSITY_X0 0.2 // float, No range
-#define PP_EFFECT_GRAIN_INTENSITY_X1 0.2 // float, No range
-#define PP_EFFECT_GRAIN_MONOCHROMATIC false // bool
-
-
-if (!hasInterface) exitwith {};
-CSE_SYS_NVG_GRAIN_EFFECT_DISPLAY = false;
-// need to add some key handlers
-
- waituntil{!isnil "cse_gui" && !isnil "cse_main"};
- ["Enabling CSE NVG systems",2] call cse_fnc_debug;
- _ppEffect_NVGAdjustBrightness = ppEffectCreate ["ColorCorrections", 1587];
- _ppEffect_NVGAdjustBrightness ppEffectForceInNVG true;
- _ppEffect_NVGAdjustBrightness ppEffectAdjust [1, 1, 0, [0, 0, 0, 0], [0, 0, 0, 1], [0, 0, 0, 1]];
- _ppEffect_NVGAdjustBrightness ppEffectCommit 0;
-
-
- _ppEffect_NVGAdjustEffect = ppEffectCreate ["FilmGrain", 2451];
- _ppEffect_NVGAdjustEffect ppEffectForceInNVG true;
- _ppEffect_NVGAdjustEffect ppEffectAdjust [PP_EFFECT_GRAIN_INTENSITVE, PP_EFFECT_GRAIN_SHARPNESS, PP_EFFECT_GRAIN_SIZE, PP_EFFECT_GRAIN_INTENSITY_X0, PP_EFFECT_GRAIN_INTENSITY_X1, PP_EFFECT_GRAIN_MONOCHROMATIC];
- _ppEffect_NVGAdjustEffect ppEffectCommit 0;
-
-
- // Refactor this
- ["cse_sys_nightvision", [_ppEffect_NVGAdjustBrightness, _ppEffect_NVGAdjustEffect], {
- _ppEffect_NVGAdjustBrightness = _this select 0;
- _ppEffect_NVGAdjustEffect = _this select 1;
-
- if (((currentVisionMode player == 1) || (currentVisionMode (vehicle player) == 1))&& !isNull(findDisplay 46)) then {
- _ppEffect_NVGAdjustBrightness ppEffectEnable true;
- _newBrightness = player getvariable ["cse_sys_nightvision_brightness", 1];
- _ppEffect_NVGAdjustBrightness ppEffectAdjust [1, _newBrightness, 0, [0, 0, 0, 0], [0, 0, 0, 1], [0, 0, 0, 1]];
- _ppEffect_NVGAdjustBrightness ppEffectCommit 0;
- if (CSE_SYS_NVG_GRAIN_EFFECT_DISPLAY) then {
- _ppEffect_NVGAdjustEffect ppEffectEnable true;
- };
- } else {
- _ppEffect_NVGAdjustBrightness ppEffectEnable false;
- _ppEffect_NVGAdjustEffect ppEffectEnable false;
- };
-
- }] call cse_fnc_addTaskToPool_f;
-
-["cse_sys_nightvision_grain_effect_display", ["Enable", "Disable"], (["cse_sys_nightvision_grain_effect_display", 0] call cse_fnc_getClientSideOptionFromProfile_F), {
- CSE_SYS_NVG_GRAIN_EFFECT_DISPLAY = (_this select 1) == 0;
-}] call cse_fnc_addClientSideOptions_f;
-
-["cse_sys_nightvision_grain_effect_display","option","Use Grain effect","Use grain effect for nightvision"] call cse_fnc_settingsDefineDetails_F;
diff --git a/TO_MERGE/cse/sys_equipment/scripts/check_ammo_keybindings.sqf b/TO_MERGE/cse/sys_equipment/scripts/check_ammo_keybindings.sqf
deleted file mode 100644
index 86483ca444..0000000000
--- a/TO_MERGE/cse/sys_equipment/scripts/check_ammo_keybindings.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-["check_current_magazine_count_eq", (["check_current_magazine_count_eq","action",[0,0,0,0]] call cse_fnc_getKeyBindingFromProfile_F), {
- private ["_percentage", "_text"];
-
- if (currentWeapon player != "" && currentMagazine player != "") then {
- _percentage = [player] call cse_fnc_getPercentageAmmoMagazine_EQ;
- _text = switch true do {
- case (_percentage >= 75) : { "Heavy weight" };
- case (_percentage >= 35) : { "Medium weight" };
- case (_percentage >= 15) : { "Light weight" };
- case (_percentage >= 0 ) : { "Very light weight" };
- default { "Unknown" };
- };
- ["Magazine weight", [_text], 0] call cse_fnc_gui_displayInformation;
- };
-
-}] call cse_fnc_addKeyBindingForAction_F;
-["check_current_magazine_count_eq","action","Check Ammo","Check your current ammo count"] call cse_fnc_settingsDefineDetails_F;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/scripts/register_attachable_items_actions.sqf b/TO_MERGE/cse/sys_equipment/scripts/register_attachable_items_actions.sqf
deleted file mode 100644
index c94f70758e..0000000000
--- a/TO_MERGE/cse/sys_equipment/scripts/register_attachable_items_actions.sqf
+++ /dev/null
@@ -1,45 +0,0 @@
-if (isDedicated) exitwith{};
-CSE_ICON_PATH = "cse\cse_gui\radialmenu\data\icons\";
-
-cse_attachMagazinesDisplaySubMenu = {
- [_this] call cse_fnc_Debug;
- private ["_subMenus","_passedMags","_magsAmmo"];
- _subMenus = [];
- _passedMags = [];
- _magsAmmo = magazinesAmmo player;
- if ([player] call cse_fnc_hasItemAttached_EQ) then {
- _subMenus set [ count _subMenus,
- call compile format['["Detach", getText(configFile >> "CfgMagazines" >> "%1" >> "picture"),
- {
- closeDialog 0;
- [player,"%1",20] spawn cse_fnc_detachItem_EQ;
- }, true, "Detach " + getText(configFile >> "CfgMagazines" >> "%1" >> "displayName")
- ]', player getvariable ["cse_attachedItemClassName_EQ", ""]]
- ];
- } else {
- {
- if (!((_x select 0) in _passedMags)) then {
- _passedMags set [ count _passedMags, (_x select 0)];
- if ([_x select 0] call cse_fnc_isAttachableItem_EQ) then
- {
- _subMenus set [ count _subMenus,
- call compile format['[getText(configFile >> "CfgMagazines" >> "%1" >> "displayName"), getText(configFile >> "CfgMagazines" >> "%1" >> "picture"),
- {
- closeDialog 0;
- [player, "%1"] call cse_fnc_attachItem_EQ;
- }, true, "Attach " + getText(configFile >> "CfgMagazines" >> "%1" >> "displayName")
- ]',(_x select 0)]
- ];
- };
- };
- }foreach _magsAmmo;
- };
-
- [ _this select 3, _subMenus, _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true] call cse_fnc_openRadialSecondRing_GUI;
-};
-
-
-_entries = [
- ["Attach", {(([player] call cse_fnc_hasItemAttached_EQ) || [player] call cse_fnc_hasAttachableItem_EQ)}, CSE_ICON_PATH + "icon_magazines.paa", cse_attachMagazinesDisplaySubMenu, "Attach Item(s)"]
-];
-["ActionMenu","equipment", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/scripts/register_magazine_repack_actions.sqf b/TO_MERGE/cse/sys_equipment/scripts/register_magazine_repack_actions.sqf
deleted file mode 100644
index 73b2d8ef09..0000000000
--- a/TO_MERGE/cse/sys_equipment/scripts/register_magazine_repack_actions.sqf
+++ /dev/null
@@ -1,59 +0,0 @@
-if (isDedicated) exitwith{};
-CSE_ICON_PATH = "cse\cse_gui\radialmenu\data\icons\";
-
-cse_fnc_repackableMagazineTypes = {
- private ["_magazines", "_repackableMagazines", "_repackableMagazineTypes", "_className", "_magazineAmmoCount", "_magazineCapacity", "_repackableMagazinesOfTypeX", "_result"];
- _magazines = magazinesAmmo player;
- _result = [];
- _repackableMagazines = [];
- _repackableMagazineTypes = [];
- {
- _className = _x select 0;
- _magazineAmmoCount = _x select 1;
- _magazineCapacity = getNumber(configFile >> "CfgMagazines" >> _className >> "count");
- if (_magazineCapacity - _magazineAmmoCount > 0) then {
- _repackableMagazines pushBack _x;
- if (!(_className in _repackableMagazineTypes)) then {
- _repackableMagazineTypes pushBack _className;
- };
- };
- } forEach _magazines;
-
- {
- _magazineType = _x;
- _repackableMagazinesOfTypeX = {_magazineType == (_x select 0)} count _repackableMagazines;
- if (_repackableMagazinesOfTypeX > 1) then {
- _result pushBack _magazineType;
- };
- } forEach _repackableMagazineTypes;
-
- _result
-};
-
-cse_repackMagazinesDisplaySubMenu = {
- [_this] call cse_fnc_Debug;
-
- private ["_subMenus", "_repackableMagazineTypes"];
- _subMenus = [];
- _repackableMagazineTypes = call cse_fnc_repackableMagazineTypes;
-
- {
- _subMenus pushBack
- call compile format['[getText(configFile >> "CfgMagazines" >> "%1" >> "displayName"), getText(configFile >> "CfgMagazines" >> "%1" >> "picture"),
- {
- closeDialog 0;
- [player,"%1",20] spawn cse_fnc_repackMagazines;
- }, true, "Repack " + getText(configFile >> "CfgMagazines" >> "%1" >> "displayName")
- ]', _x];
- } forEach _repackableMagazineTypes;
-
- [_this select 3, _subMenus, _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true] call cse_fnc_openRadialSecondRing_GUI;
-};
-
-
-_entries = [
- ["Repack", {count (call cse_fnc_repackableMagazineTypes) > 0}, CSE_ICON_PATH + "icon_magazines.paa", cse_repackMagazinesDisplaySubMenu, "Show magazines that can be repacked"]
-];
-["ActionMenu","equipment", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
diff --git a/TO_MERGE/cse/sys_equipment/scripts/select_weapon_keybindings.sqf b/TO_MERGE/cse/sys_equipment/scripts/select_weapon_keybindings.sqf
deleted file mode 100644
index 2cb89a7c38..0000000000
--- a/TO_MERGE/cse/sys_equipment/scripts/select_weapon_keybindings.sqf
+++ /dev/null
@@ -1,28 +0,0 @@
-
-["place_Weapon_onBack", (["place_Weapon_onBack","action",[0,0,0,0]] call cse_fnc_getKeyBindingFromProfile_F), {
- if (currentWeapon player != "") then {
- [player] call cse_fnc_putWeaponOnBack_EQ;
- };
-}] call cse_fnc_addKeyBindingForAction_F;
-["place_Weapon_onBack","action","Weapon on Back","Place rifle on back or holster pistol"] call cse_fnc_settingsDefineDetails_F;
-
-["select_primairy_weapon", (["select_primairy_weapon","action",[0,0,0,0]] call cse_fnc_getKeyBindingFromProfile_F), {
- if (primaryWeapon player != "") then {
- player selectWeapon primaryWeapon player;
- };
-}] call cse_fnc_addKeyBindingForAction_F;
-["select_primairy_weapon","action","Select Primairy weapon","Select your primary weapon."] call cse_fnc_settingsDefineDetails_F;
-
-["select_secondairy_weapon", (["select_secondairy_weapon","action",[0,0,0,0]] call cse_fnc_getKeyBindingFromProfile_F), {
- if (secondaryWeapon player != "") then {
- player selectWeapon secondaryWeapon player;
- };
-}] call cse_fnc_addKeyBindingForAction_F;
-["select_secondairy_weapon","action","Select Secondairy Weapon","Select your secondairy weapon."] call cse_fnc_settingsDefineDetails_F;
-
-["select_handgun_weapon", (["select_handgun_weapon","action",[0,0,0,0]] call cse_fnc_getKeyBindingFromProfile_F), {
- if (handgunWeapon player != "") then {
- player selectWeapon handgunWeapon player;
- };
-}] call cse_fnc_addKeyBindingForAction_F;
-["select_handgun_weapon","action","Select handgun","Select your pistol."] call cse_fnc_settingsDefineDetails_F;
diff --git a/TO_MERGE/cse/sys_equipment/stringtable.xml b/TO_MERGE/cse/sys_equipment/stringtable.xml
deleted file mode 100644
index dd082b5b55..0000000000
--- a/TO_MERGE/cse/sys_equipment/stringtable.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
- White Flare
- Bengala Blanca
-
-
- Red Flare
- Bengala Roja
-
-
- Yellow Flare
- Bengala Amarilla
-
-
- Green Flare
- Bengala Verde
-
-
-
-
- White Road Flare
- Bengala de Carretera Blanca
-
-
- Red Road Flare
- Bengala de Carretera Roja
-
-
- Yellow Road Flare
- Bengala de Carretera Amarilla
-
-
- Green Road Flare
- Bengala de Carretera Verde
-
-
-
-
-
-
- Rest Weapon/Deploy Bipod
- Oprzyj broń / rozłóż dwójnóg
- Apoyar Arma/Desplegar Bípode
-
-
- Unrest Weapon/Undeploy Bipod
- Levantar Arma/Plegar Bípode
-
-
- Lets the player rest his weapon / deploy the bipod. This is part of the 'Weapon Rest [CSE]' module.
- Pozwala graczowi oprzeć swoją broń / rozłożyć dwójnóg. Jest to część modułu 'Podpieranie broni [CSE]'.
- Permite apoyar el arma / desplegar el bípode. Es parte del módulo "Weapon Rest [CSE]".
-
-
- Lets the player unrest his weapon / undeploy the bipod. This is part of the 'Weapon Rest [CSE]' module.
- Permite levantar el arma / plegar el bípode. Es parte del módulo "Weapon Rest [CSE]".
-
-
-
-
-
-
-
-
- Increase NVG Brightness
- Zwiększ czułość NVG
- Aumentar el brillo de la Visión Nocturna
-
-
- Allows the player to increase the NVG brightness.
- Pozwala graczowi zwiększyć czułość noktowizji.
- Permite al jugador aumentar el brillo de la Visión Nocturna
-
-
- Decrease NVG Brightness
- Zmniejsz czułość NVG
- Disminuir el brillo de la Visión Nocturna
-
-
- Allows the player to decrease the NVG brightness.
- Pozwala graczowi zmniejszyć czułość noktowizji.
- Permite al jugador disminuir el brillo de la Visión Nocturna
-
-
-
-
-
diff --git a/TO_MERGE/cse/sys_equipment/ui/rscTitles.h b/TO_MERGE/cse/sys_equipment/ui/rscTitles.h
deleted file mode 100644
index 77fe626e84..0000000000
--- a/TO_MERGE/cse/sys_equipment/ui/rscTitles.h
+++ /dev/null
@@ -1,51 +0,0 @@
-class RscControlsGroup;
-class RscText;
-/*
-class RscInGameUI
-{
- class RscUnitInfo
- {
- class WeaponInfoControlsGroupLeft: RscControlsGroup
- {
- class controls
- {
- class CA_AmmoCount: RscText
- {
- sizeEx = 0;
- };
- class CA_MagCount: RscText
- {
- sizeEx = 0;
- };
- class GrenadeCount: RscText
- {
- sizeEx = 0;
- };
- };
- };
- };
-};*/
-/*
- class RscUnitInfo {
- idd = 300;
- class WeaponInfoControlsGroupLeft: RscControlsGroup
- {
- idc = 2302;
- class controls
- {
- class CA_AmmoCount: RscText
- {
- idc = 184;
- };
- class CA_MagCount: RscText
- {
- idc = 185;
- };
- class CA_GrenadeCount: RscText
- {
- idc = 151;
- };
- };
- };
- };
-*/
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/data/icons/icon_bipod.paa b/TO_MERGE/cse/sys_equipment/weaponresting/data/icons/icon_bipod.paa
deleted file mode 100644
index c2b6a2fb3e..0000000000
Binary files a/TO_MERGE/cse/sys_equipment/weaponresting/data/icons/icon_bipod.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_actionReleaseWeapon_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_actionReleaseWeapon_WR.sqf
deleted file mode 100644
index 08fd122ee3..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_actionReleaseWeapon_WR.sqf
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * fn_actionReleaseWeapon_WR.sqf
- * @Descr: Force unrest/undeploy of the weapon
- * @Author: Ruthberg
- *
- * @Arguments: []
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-player setVariable ["cse_isWeaponRested_WR", false, false];
-player setVariable ["cse_isWeaponDeployed_WR", false, false];
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_canDeployBipod_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_canDeployBipod_WR.sqf
deleted file mode 100644
index 06d5abf56e..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_canDeployBipod_WR.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * fn_canDeployBipod_WR.sqf
- * @Descr: Check if player can deploy a bipod.
- * @Author: Glowbal, Ruthberg
- *
- * @Arguments: []
- * @Return: [BOOL, PositionASL]
- * @PublicAPI: true
- */
-
-
-#define LEFT_HAND_BIPOD_DISTANCE_LONG_RIFLE 0.3
-#define LEFT_HAND_BIPOD_DISTANCE_RIFLE 0.15
-#define BIPOD_HEIGHT 0.40
-#define ALLOWED_ANIMATION_STATES ["amovpercmstpsraswrfldnon","aadjpercmstpsraswrfldup","aadjpercmstpsraswrflddown","aadjpknlmstpsraswrfldup","amovpknlmstpsraswrfldnon","aadjpknlmstpsraswrflddown","aadjppnemstpsraswrfldup","amovppnemstpsraswrfldnon","aadjpknlmstpsraswrfldright","aadjpknlmstpsraswrfldleft","aadjpercmstpsraswrfldright","aadjpercmstpsraswrfldleft"]
-
-private ["_weapon", "_playerAnimationState", "_canDeployBipod", "_weaponDirection", "_leftHandPosition", "_leftHandBipodDistance", "_isLongRifle", "_azimut", "_elevation", "_bipodTop", "_bipodBottom"];
-_weapon = currentWeapon player;
-_playerAnimationState = (([animationState player, "_"] call BIS_fnc_splitString) select 0);
-_canDeployBipod = [false, [0, 0, 0]];
-
-if ((call cse_fnc_hasBipod_WR) && _weapon == primaryWeapon player && !(weaponLowered player) && _playerAnimationState in ALLOWED_ANIMATION_STATES) then {
- _weaponDirection = player weaponDirection _weapon;
-
- _leftHandPosition = ATLtoASL (player modelToWorld (player selectionPosition "LeftHand"));
-
- _leftHandBipodDistance = LEFT_HAND_BIPOD_DISTANCE_RIFLE;
- _isLongRifle = [configFile >> "CfgWeapons" >> _weapon, "Rifle_Long_Base_F"] call cse_fnc_inheritsFrom;
- if (_isLongRifle) then {
- _leftHandBipodDistance = LEFT_HAND_BIPOD_DISTANCE_LONG_RIFLE;
- };
-
- _azimut = (_weaponDirection select 0) atan2 (_weaponDirection select 1);
- _elevation = asin(_weaponDirection select 2);
-
- _bipodTop = _leftHandPosition vectorAdd (_weaponDirection vectorMultiply _leftHandBipodDistance);
- _bipodBottom = _bipodTop vectorAdd [sin(_azimut) * sin(_elevation) * BIPOD_HEIGHT, cos(_azimut) * sin(_elevation) * BIPOD_HEIGHT, cos(_elevation) * -BIPOD_HEIGHT];
-
- // Bipods can be deployed on ground or objects.
- _canDeployBipod = [_bipodTop, _bipodBottom, 0.05] call cse_fnc_getFirstObjectIntersection;
- if (_canDeployBipod select 0) exitWith {};
- _canDeployBipod = [_bipodTop, _bipodBottom, 0.05] call cse_fnc_getFirstTerrainIntersection;
- if (_canDeployBipod select 0) exitWith {};
-};
-
-_canDeployBipod
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_canRestWeapon_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_canRestWeapon_WR.sqf
deleted file mode 100644
index fa5c751d79..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_canRestWeapon_WR.sqf
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * fn_canRestWeapon_WR.sqf
- * @Descr: Check if player can rest weapon.
- * @Author: Glowbal, Ruthberg
- *
- * @Arguments: []
- * @Return: BOOL Can rest weapon.
- * @PublicAPI: true
- */
-
-
-#define ALLOWED_ANIMATION_STATES ["amovpercmstpsraswrfldnon","aadjpercmstpsraswrfldup","aadjpercmstpsraswrflddown","aadjpknlmstpsraswrfldup","amovpknlmstpsraswrfldnon","aadjpknlmstpsraswrflddown","aadjppnemstpsraswrfldup","amovppnemstpsraswrfldnon","aadjpknlmstpsraswrfldright","aadjpknlmstpsraswrfldleft","aadjpercmstpsraswrfldright","aadjpercmstpsraswrfldleft","aadjppnemstpsraswrfldright","aadjppnemstpsraswrfldleft","aadjppnemstpsraswrflddown"]
-#define MAX_REST_DISTANCE_FORWARD 0.30
-#define MAX_REST_DISTANCE_LEFT 0.40
-#define MAX_REST_DISTANCE_RIGHT 0.30
-#define MAX_REST_DISTANCE_BOTTOM 0.50
-#define MAX_REST_ANGLE 45
-
-private ["_weapon", "_canRestWeapon", "_playerAnimationState", "_weaponDirection", "_leftHandPosition", "_rightHandPosition"];
-_weapon = currentWeapon player;
-_canRestWeapon = false;
-_playerAnimationState = (([animationState player, "_"] call BIS_fnc_splitString) select 0);
-
-if (_weapon == primaryWeapon player && !(weaponLowered player) && _playerAnimationState in ALLOWED_ANIMATION_STATES) then {
- _weaponDirection = player weaponDirection _weapon;
-
- _leftHandPosition = ATLtoASL (player modelToWorld (player selectionPosition "LeftHand"));
- _rightHandPosition = ATLtoASL (player modelToWorld (player selectionPosition "RightHand"));
-
- // calculate direction for side checks.
- _direction = (_weaponDirection select 0) atan2 (_weaponDirection select 1);
-
- // check left
- if (lineIntersects [_rightHandPosition, _rightHandPosition vectorAdd [
- MAX_REST_DISTANCE_LEFT * sin ((_direction) - MAX_REST_ANGLE),
- MAX_REST_DISTANCE_LEFT * cos ((_direction) - MAX_REST_ANGLE),
- MAX_REST_DISTANCE_LEFT * 0.5 * (_weaponDirection select 2)
- ]]) exitWith { _canRestWeapon = true };
-
- // check right
- if (lineIntersects [_rightHandPosition, _rightHandPosition vectorAdd [
- MAX_REST_DISTANCE_RIGHT * sin ((_direction) + MAX_REST_ANGLE),
- MAX_REST_DISTANCE_RIGHT * cos ((_direction) + MAX_REST_ANGLE),
- MAX_REST_DISTANCE_RIGHT * 0.5 * (_weaponDirection select 2)
- ]]) exitWith { _canRestWeapon = true };
-
- // check bottom (object)
- if (lineIntersects [
- _rightHandPosition vectorDiff [0, 0, MAX_REST_DISTANCE_BOTTOM],
- _leftHandPosition vectorDiff [0, 0, MAX_REST_DISTANCE_BOTTOM] vectorAdd (_weaponDirection vectorMultiply MAX_REST_DISTANCE_FORWARD)]
- ) exitWith { _canRestWeapon = true };
-
- // check bottom (ground)
- if (terrainIntersectASL [
- _rightHandPosition vectorDiff [0, 0, MAX_REST_DISTANCE_BOTTOM],
- _leftHandPosition vectorDiff [0, 0, MAX_REST_DISTANCE_BOTTOM] vectorAdd (_weaponDirection vectorMultiply MAX_REST_DISTANCE_FORWARD)]
- ) exitWith { _canRestWeapon = true };
-};
-
-_canRestWeapon
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_deployWeapon_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_deployWeapon_WR.sqf
deleted file mode 100644
index f33aab832b..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_deployWeapon_WR.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_deployWeapon_WR.sqf
- * @Descr: N/A
- * @Author: Ruthberg
- *
- * @Arguments: [pivotPosition PositionASL]
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-#define DEPLOYED_RECOIL 0.5
-#define CAM_SHAKE [1.0, 0.5, 6.0]
-
-private ["_pivotPosition", "_playerAnimationState"];
-_pivotPosition = _this;
-
-player setVariable ["cse_isWeaponDeployed_WR", true, false];
-
-playSound "cse_weaponrest_rest";
-addCamShake CAM_SHAKE;
-["cse_bipodDeployed", true, "cse\cse_sys_equipment\weaponresting\data\icons\icon_bipod.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-
-_playerAnimationState = animationState player;
-player switchMove format["%1_cse_deployed", _playerAnimationState];
-player setUnitRecoilCoefficient DEPLOYED_RECOIL;
-
-// Watcher that undeploys if we rotate/move too much
-[_pivotPosition] spawn {
- private ["_pivotPosition", "_canDeployBipod"];
- _pivotPosition = _this select 0;
- while {player getVariable ["cse_isWeaponDeployed_WR", false]} do {
- _canDeployBipod = call cse_fnc_canDeployBipod_WR;
- if !(_canDeployBipod select 0) exitWith {};
- if ((_canDeployBipod select 1) vectorDistance _pivotPosition > 0.30) exitWith {};
- sleep 0.1;
- };
- call cse_fnc_undeployWeapon_WR;
-};
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_hasBipod_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_hasBipod_WR.sqf
deleted file mode 100644
index 1244cad29e..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_hasBipod_WR.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * fn_hasBipod_WR.sqf
- * @Descr: Check if the current weapon has a bipod.
- * @Author: Glowbal, Ruthberg
- *
- * @Arguments: []
- * @Return: BOOL weapon has bipod.
- * @PublicAPI: true
- */
-
-
-_cseBipod = getNumber(configFile >> "CfgWeapons" >> primaryWeapon player >> "cse_bipod") == 1;
-_weaponModeBipod = ["bipod", currentWeaponMode player, false] call BIS_fnc_inString || ["bp", currentWeaponMode player, false] call BIS_fnc_inString;
-
-// TODO: Also check for asdg and kao bipods
-
-_cseBipod || _weaponModeBipod
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_keyPressed_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_keyPressed_WR.sqf
deleted file mode 100644
index f09559f08a..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_keyPressed_WR.sqf
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * fn_keyPressed_WR.sqf
- * @Descr: N/A
- * @Author: Glowbal, Ruthberg
- *
- * @Arguments: []
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-#define ALLOWED_ANIMATION_STATES ["amovpercmstpsraswrfldnon","aadjpercmstpsraswrfldup","aadjpercmstpsraswrflddown","aadjpknlmstpsraswrfldup","amovpknlmstpsraswrfldnon","aadjpknlmstpsraswrflddown","aadjppnemstpsraswrfldup","amovppnemstpsraswrfldnon","aadjpknlmstpsraswrfldright","aadjpknlmstpsraswrfldleft","aadjpercmstpsraswrfldright","aadjpercmstpsraswrfldleft","aadjppnemstpsraswrfldright","aadjppnemstpsraswrfldleft","aadjppnemstpsraswrflddown"]
-
-private ["_playerAnimationState", "_canDeployBipod"];
-
-if (weaponLowered player) exitWith {};
-if (!([player] call cse_fnc_canInteract)) exitWith {};
-if (player getVariable ["cse_isWeaponDeployed_WR", false]) exitWith {};
-
-_playerAnimationState = (([animationState player, "_"] call BIS_fnc_splitString) select 0);
-if (!(_playerAnimationState in ALLOWED_ANIMATION_STATES)) exitWith {};
-
-// not deployed -> try to deploy now
-_canDeployBipod = call cse_fnc_canDeployBipod_WR;
-if (_canDeployBipod select 0) then {
- if (player getVariable ["cse_isWeaponRested_WR", false]) then {
- call cse_fnc_unrestWeapon_WR;
- };
- (_canDeployBipod select 1) call cse_fnc_deployWeapon_WR;
-};
-
-if (!(player getVariable ["cse_isWeaponRested_WR", false]) && !(player getVariable ["cse_isWeaponDeployed_WR", false])) then {
- // not deployed and not rested -> try to rest now
- if (call cse_fnc_canRestWeapon_WR) then {
- call cse_fnc_restWeapon_WR;
- };
-};
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_restWeapon_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_restWeapon_WR.sqf
deleted file mode 100644
index 153247076a..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_restWeapon_WR.sqf
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * fn_restWeapon_WR.sqf
- * @Descr: N/A
- * @Author: Ruthberg
- *
- * @Arguments: []
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-#define RESTED_RECOIL 0.8
-#define CAM_SHAKE [1.0, 0.5, 6.0]
-
-private ["_playerAnimationState"];
-
-
-player setVariable ["cse_isWeaponRested_WR", true, false];
-
-playSound "cse_weaponrest_rest";
-addCamShake CAM_SHAKE;
-["cse_bipodDeployed", true, "cse\cse_sys_equipment\weaponresting\data\icons\icon_bipod.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon; // TODO: Make a separate icon for weapon resting
-
-_playerAnimationState = animationState player;
-player switchMove format["%1_cse_rested", _playerAnimationState];
-player setUnitRecoilCoefficient RESTED_RECOIL;
-
-// Watcher that unrests if we rotate/move too much
-[] spawn {
- while {player getVariable ["cse_isWeaponRested_WR", false]} do {
- if !(call cse_fnc_canRestWeapon_WR) exitWith {};
- sleep 0.1;
- };
- call cse_fnc_unrestWeapon_WR;
-};
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_undeployWeapon_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_undeployWeapon_WR.sqf
deleted file mode 100644
index b953d49792..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_undeployWeapon_WR.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * fn_undeployWeapon_WR.sqf
- * @Descr: N/A
- * @Author: Ruthberg
- *
- * @Arguments: []
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-private ["_playerAnimationState"];
-
-_playerAnimationState = animationState player;
-player switchMove (([_playerAnimationState, "_"] call BIS_fnc_splitString) select 0);
-player setUnitRecoilCoefficient 1;
-
-player setVariable ["cse_isWeaponDeployed_WR", false, false];
-
-playSound "cse_weaponrest_unrest";
-["cse_bipodDeployed", false, "cse\cse_sys_equipment\weaponresting\data\icons\icon_bipod.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_unrestWeapon_WR.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_unrestWeapon_WR.sqf
deleted file mode 100644
index ca31eec04e..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/functions/fn_unrestWeapon_WR.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * fn_unrestWeapon_WR.sqf
- * @Descr: N/A
- * @Author: Ruthberg
- *
- * @Arguments: []
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-private ["_playerAnimationState"];
-
-_playerAnimationState = animationState player;
-player switchMove (([_playerAnimationState, "_"] call BIS_fnc_splitString) select 0);
-player setUnitRecoilCoefficient 1;
-
-player setVariable ["cse_isWeaponRested_WR", false, false];
-
-playSound "cse_weaponrest_unrest";
-["cse_bipodDeployed", false, "cse\cse_sys_equipment\weaponresting\data\icons\icon_bipod.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_equipment/weaponresting/init_sys_weaponrest.sqf b/TO_MERGE/cse/sys_equipment/weaponresting/init_sys_weaponrest.sqf
deleted file mode 100644
index 7137b8cbd7..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponresting/init_sys_weaponrest.sqf
+++ /dev/null
@@ -1,9 +0,0 @@
-if (!hasInterface) exitwith {};
-waituntil{!isnil "cse_gui" && !isnil "cse_main"};
-
-waitUntil {!isNull player};
-
-["cse_isWeaponRested_WR" , false, false, "wr"] call cse_fnc_defineVariable;
-["cse_isWeaponDeployed_WR", false, false, "wr"] call cse_fnc_defineVariable;
-
-cse_sys_weaponRest = true;
diff --git a/TO_MERGE/cse/sys_equipment/weaponsafety/functions/fn_safetyOff_ws.sqf b/TO_MERGE/cse/sys_equipment/weaponsafety/functions/fn_safetyOff_ws.sqf
deleted file mode 100644
index 4f81fe8626..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponsafety/functions/fn_safetyOff_ws.sqf
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * fn_safetyOff_ws.sqf
- * @Descr: Puts the given unit/weapon/muzzle combination on fire
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING]
- * @Return: nil
- * @PublicAPI: true
- */
-
-
-private ["_unit", "_weapon", "_muzzle"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-
-_unit setVariable [format["CSE_WeaponSafety_%1_%2", _weapon, _muzzle], false, false];
-playSound "click";
diff --git a/TO_MERGE/cse/sys_equipment/weaponsafety/functions/fn_safetyOn_ws.sqf b/TO_MERGE/cse/sys_equipment/weaponsafety/functions/fn_safetyOn_ws.sqf
deleted file mode 100644
index 3c6e094351..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponsafety/functions/fn_safetyOn_ws.sqf
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * fn_safetyOn_ws.sqf
- * @Descr: Puts the given unit/weapon/muzzle combination on safe
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING]
- * @Return: nil
- * @PublicAPI: true
- */
-
-
-private ["_unit", "_weapon", "_muzzle", "_ID"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-
-_unit setVariable[format["CSE_WeaponSafety_%1_%2", _weapon, _muzzle], true, false];
-playSound "click";
-
-_ID = format["CSE_WeaponSafety_ID_%1_%2_%3", _unit, _weapon, _muzzle];
-
-[_ID, "onEachFrame", {
- private ["_unit", "_weapon", "_muzzle", "_ID"];
- _unit = _this select 0;
- _weapon = _this select 1;
- _muzzle = _this select 2;
- _ID = _this select 3;
-
- if (!(_unit getVariable[format["CSE_WeaponSafety_%1_%2", _weapon, _muzzle], false]) || !(_weapon in (weapons (vehicle _unit)))) exitWith {
- [_ID, "onEachFrame"] call BIS_fnc_removeStackedEventHandler;
- };
-
- if (currentWeapon _unit == _weapon && currentMuzzle _unit == _muzzle) then {
- (vehicle _unit) setWeaponReloadingTime [_unit, _muzzle, 1];
- };
-
-}, [_unit, _weapon, _muzzle, _ID]] call BIS_fnc_addStackedEventHandler;
diff --git a/TO_MERGE/cse/sys_equipment/weaponsafety/init_sys_weaponsafety.sqf b/TO_MERGE/cse/sys_equipment/weaponsafety/init_sys_weaponsafety.sqf
deleted file mode 100644
index d2f27293f2..0000000000
--- a/TO_MERGE/cse/sys_equipment/weaponsafety/init_sys_weaponsafety.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-if (!hasInterface) exitwith {};
-waituntil{!isnil "cse_gui" && !isnil "cse_main"};
-
-waitUntil {!isNull player};
-
-["put_safety_on", (["put_safety_on","action",[126,0,0,0]] call cse_fnc_getKeyBindingFromProfile_F), {
- // TODO: Find a way to implement weapon safety without the slide of a pistol being locked back
- if (currentWeapon player != "" && (currentWeapon player == primaryWeapon player || currentWeapon player == secondaryWeapon player)) then {
- [player, currentWeapon player, currentMuzzle player] call cse_fnc_safetyOn_ws;
- };
-}] call cse_fnc_addKeyBindingForAction_F;
-["put_safety_on","action","Safety on","Put weapon on safe."] call cse_fnc_settingsDefineDetails_F;
-
-["put_safety_off", (["put_safety_off","action",[126,1,0,0]] call cse_fnc_getKeyBindingFromProfile_F), {
- [player, currentWeapon player, currentMuzzle player] call cse_fnc_safetyOff_ws;
-}] call cse_fnc_addKeyBindingForAction_F;
-["put_safety_off","action","Safety off","Put weapon on fire."] call cse_fnc_settingsDefineDetails_F;
-
-
-cse_sys_weaponSafety = true;
diff --git a/TO_MERGE/cse/sys_field_rations/CfgFunctions.h b/TO_MERGE/cse/sys_field_rations/CfgFunctions.h
deleted file mode 100644
index 9c8df9f7c8..0000000000
--- a/TO_MERGE/cse/sys_field_rations/CfgFunctions.h
+++ /dev/null
@@ -1,33 +0,0 @@
-class CfgFunctions {
- class CSE {
- class FieldRations {
- file = "cse\cse_sys_field_rations\functions";
- class reduceLevels_FR { recompile = 1; };
- class updateFieldRations_FR { recompile = 1; };
- class updateUIStatus_FR { recompile = 1; };
-
- class actionEat_FR { recompile = 1; };
- class canEat_FR { recompile = 1; };
- class getEatableValue_FR { recompile = 1; };
- class itemIsEatable_FR { recompile = 1; };
- class hasEatableItem_FR { recompile = 1; };
- class actionDrink_FR { recompile = 1; };
- class canDrink_FR { recompile = 1; };
- class getDrinkableValue_FR { recompile = 1; };
- class itemIsDrinkable_FR { recompile = 1; };
- class hasDrinkableItem_FR { recompile = 1; };
-
- class canRefill_FR { recompile = 1; };
- class itemIsRefillable_FR { recompile = 1; };
- class hasRefillableItem_FR { recompile = 1; };
- class actionRefill_FR { recompile = 1; };
-
- class actionRefillCamelbak_FR;
- class hasCamelbak_FR;
- class isCamelbak_FR;
- class getMaxContent_Camelbak_FR;
- class getInitialContent_Camelbak_FR;
- class canRefillCamelbak_FR;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/CfgMagazines.h b/TO_MERGE/cse/sys_field_rations/CfgMagazines.h
deleted file mode 100644
index 48bc356ee5..0000000000
--- a/TO_MERGE/cse/sys_field_rations/CfgMagazines.h
+++ /dev/null
@@ -1,412 +0,0 @@
-class CfgMagazines {
- class Default;
- class CA_magazine: Default {};
- class cse_backwardsCompatMagazineBase_FR: CA_magazine {};
- class cse_waterbottle: cse_backwardsCompatMagazineBase_FR {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Water Bottle";
- picture = "\cse\cse_sys_field_rations\data\pictures\waterbottle.paa";
- model = "\A3\Structures_F_EPA\Items\Food\BottlePlastic_V2_F.p3d";
- descriptionShort = "A waterbottle";
- mass = 5;
- cse_isDrinkable = 3.75;
- cse_onDrink = "cse_waterbottle_half";
- };
- class cse_canteen: cse_backwardsCompatMagazineBase_FR {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Canteen (Water)";
- picture = "\cse\cse_sys_field_rations\data\pictures\image_canteen.paa";
- model = "\A3\Structures_F_EPA\Items\Food\Canteen_F.p3d";
- descriptionShort = "A Canteen containing water";
- mass = 5;
- cse_isDrinkable = 3.75;
- cse_onDrink = "cse_canteen_half";
- };
- class cse_canteen_half: cse_canteen {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Canteen (Half)";
- picture = "\cse\cse_sys_field_rations\data\pictures\image_canteen.paa";
- model = "\A3\Structures_F_EPA\Items\Food\Canteen_F.p3d";
- descriptionShort = "A Canteen containing water (Half)";
- mass = 5;
- cse_isDrinkable = 3.75;
- cse_onDrink = "cse_canteen_empty";
- cse_onRefill = "cse_canteen";
- };
- class cse_canteen_empty: cse_canteen {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Canteen (Empty)";
- picture = "\cse\cse_sys_field_rations\data\pictures\image_canteen.paa";
- model = "\A3\Structures_F_EPA\Items\Food\Canteen_F.p3d";
- descriptionShort = "A Canteen containing water (Half)";
- mass = 5;
- cse_isDrinkable = 0;
- cse_onDrink = "";
- cse_onRefill = "cse_canteen";
- };
-
-
- class cse_waterbottle_half: cse_waterbottle {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Water Bottle 1/2";
- picture = "\cse\cse_sys_field_rations\data\pictures\waterbottle.paa";
- model ="\cse\cse_sys_field_rations\waterbottle.p3d";
- descriptionShort = "Half full waterbottle";
- cse_onDrink = "cse_waterbottle_empty";
- cse_isDrinkable = 3.75;
- se_onRefill = "cse_waterbottle";
- };
-
-
- class cse_waterbottle_empty: cse_waterbottle {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Empty Water Bottle";
- picture = "\cse\cse_sys_field_rations\data\pictures\waterbottle_empty.paa";
- model ="\cse\cse_sys_field_rations\waterbottle.p3d";
- descriptionShort = "An empty waterbottle";
- cse_isDrinkable = 0;
- cse_onRefill = "cse_waterbottle";
- cse_onDrink = "";
- };
-
- class cse_MRE_BASE: cse_waterbottle {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE.paa";
- model ="\cse\cse_sys_field_rations\mre_type1.p3d";
- descriptionShort = "A Meal Ready to Eat, unprepared";
- mass = 3;
- cse_isEatable = 10;
- cse_isDrinkable = 0;
- };
-
- class cse_MRE_LambC: cse_MRE_BASE {
- displayName = "MRE Lamb Curry";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- model ="\cse\cse_sys_field_rations\mre_type1.p3d";
- descriptionShort = "An MRE containing Lamb Curry. Heat for best effect";
- };
- class cse_MRE_LambC_prepared: cse_MRE_LambC {
- displayName = "MRE Lamb Curry (Heated)";
- };
-
- class cse_MRE_Rice: cse_MRE_BASE {
- displayName = "MRE Rice";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type2.paa";
- model ="\cse\cse_sys_field_rations\mre_type2.p3d";
- descriptionShort = "An MRE Containing Rice. Heat for best effect";
- };
- class cse_MRE_Rice_prepared: cse_MRE_Rice {
- displayName = "MRE Rice (Heated)";
- };
-
- class cse_MRE_CreamTomatoSoup: cse_MRE_BASE {
- displayName = "MRE Cream Tomato Soup";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type3.paa";
- model ="\cse\cse_sys_field_rations\mre_type3.p3d";
- descriptionShort = "An MRE Containing Tomato Soup cream. Mix with water and heat for best effect";
- };
- class cse_MRE_CreamTomatoSoup_prepared: cse_MRE_CreamTomatoSoup {
- displayName = "MRE Cream Tomato Soup (Heated)";
- };
-
- class cse_MRE_CreamChickenSoup: cse_MRE_BASE {
- displayName = "MRE Cream Chicken Soup";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type3.paa";
- model ="\cse\cse_sys_field_rations\mre_type3.p3d";
- descriptionShort = "An MRE Containing Chicken Soup. Mix with water and heat for best effect";
- };
- class cse_MRE_CreamChickenSoup_prepared: cse_MRE_CreamChickenSoup {
- displayName = "MRE Cream Chicken Soup (Heated)";
- };
-
- class cse_MRE_ChickenTikkaMassala: cse_MRE_BASE {
- displayName = "MRE Chicken Tikka Massala";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type4.paa";
- model = "\cse\cse_sys_field_rations\mre_type4.p3d";
- descriptionShort = "An MRE with Chicken Tikka Massala. Heat for best effect";
- };
- class cse_MRE_ChickenTikkaMassala_prepared: cse_MRE_ChickenTikkaMassala {
- displayName = "MRE Chicken Tikka Massala (Heated)";
- };
-
- class cse_MRE_SteakVegetables: cse_MRE_BASE {
- displayName = "MRE Steak & Vegetables";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type5.paa";
- model ="\cse\cse_sys_field_rations\mre_type5.p3d";
- descriptionShort = "An MRE Containing Steak & Vegetables. Heat for best effect";
- };
- class cse_MRE_SteakVegetables_prepared: cse_MRE_SteakVegetables {
- displayName = "MRE Steak & Vegetables (Heated)";
- };
-
- class cse_MRE_MeatballsPasta: cse_MRE_BASE {
- displayName = "MRE Meatballs & Pasta";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type6.paa";
- model ="\cse\cse_sys_field_rations\mre_type6.p3d";
- descriptionShort = "An MRE Containing Meatballs & Pasta. Heat for best effect";
- };
- class cse_MRE_MeatballsPasta_prepared: cse_MRE_MeatballsPasta {
- displayName = "MRE Meatballs & Pastas (Heated)";
- };
-
- class cse_MRE_ChickenHerbDumplings: cse_MRE_BASE {
- displayName = "MRE Chicken with Herb Dumplings";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type6.paa";
- model ="\cse\cse_sys_field_rations\mre_type6.p3d";
- descriptionShort = "An MRE Containing Chicken with Herb Dumplings. Heat for best effect";
- };
- class cse_MRE_ChickenHerbDumplings_prepared: cse_MRE_ChickenHerbDumplings {
- displayName = "MRE Chicken with Herb Dumplings (Heated)";
- };
-
- class cse_Humanitarian_Ration: cse_MRE_BASE {
- displayName = "Humanitarian Ration";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_human.paa";
- model ="\cse\cse_sys_field_rations\mre_human.p3d";
- descriptionShort = "An Humanitarian Ration, for handing out to the local population";
- };
-
- class cse_US_MRE_ChiliBeans: cse_MRE_BASE {
- displayName = "Chile with Beans MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Chili with Beans";
- };
- class cse_US_MRE_ChiliBeans_prepared: cse_US_MRE_ChiliBeans {
- displayName = "Chile with Beans MRE (Heated)";
- };
- class cse_US_MRE_ChickenFajita: cse_MRE_BASE {
- displayName = "Chicken Fajita MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "A Chicken Fajita MRE";
- };
- class cse_US_MRE_ChickenFajita_prepared: cse_US_MRE_ChickenFajita {
- displayName = "Chicken Fajita MRE (Heated)";
- };
-
- class cse_US_MRE_ChickenNoodles: cse_MRE_BASE {
- displayName = "Chicken with Noodles MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Chicken with Noodles";
- };
- class cse_US_MRE_ChickenNoodles_prepared: cse_US_MRE_ChickenNoodles {
- displayName = "Chicken Fajita MRE(Heated)";
- };
-
- class cse_US_MRE_PorkSausageGravy: cse_MRE_BASE {
- displayName = "Pork Sausage with Gravy MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Pork Sausage with Gravy";
- };
- class cse_US_MRE_PorkSausageGravy_prepared: cse_US_MRE_PorkSausageGravy {
- displayName = "Pork Sausage Gravy MRE(Heated)";
- };
-
- class cse_US_MRE_MedChicen: cse_MRE_BASE {
- displayName = "Mediterranean Chicken MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Mediterranean Chicken";
- };
- class cse_US_MRE_MedChicken_prepared: cse_US_MRE_MedChicen {
- displayName = "Mediterranean Chicken MRE(Heated)";
- };
-
- class cse_US_MRE_BeefRoastVeggies: cse_MRE_BASE {
- displayName = "Beef Roast with Veggies MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Beef Roast with Veggies";
- };
- class cse_US_MRE_BeefRoastVeggies_prepared: cse_US_MRE_BeefRoastVeggies {
- displayName = "Beef Roast Veg MRE(Heated)";
- };
-
- class cse_US_MRE_BeefBrisket: cse_MRE_BASE {
- displayName = "Beef Brisket MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Beef Brisket";
- };
- class cse_US_MRE_BeefBrisket_prepared: cse_US_MRE_BeefBrisket {
- displayName = "Beef Brisket MRE(Heated)";
- };
-
- class cse_US_MRE_MeatballMarinara: cse_MRE_BASE {
- displayName = "Meatball Marinara MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Meatballs with Marinara Sauce";
- };
- class cse_US_MRE_MeatballMarinara_prepared: cse_US_MRE_MeatballMarinara {
- displayName = "Meatball Marinara(Heated)";
- };
-
- class cse_US_MRE_BeefStew: cse_MRE_BASE {
- displayName = "Beef Stew MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Beef Stew";
- };
- class cse_US_MRE_BeefStew_prepared: cse_US_MRE_BeefStew {
- displayName = "Beef Stew MRE(Heated)";
- };
-
- class cse_US_MRE_ChiliMacaroni: cse_MRE_BASE {
- displayName = "Chile Macaroni MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Chile Macaroni";
- };
- class cse_US_MRE_ChileMacaroni_prepared: cse_US_MRE_ChiliMacaroni {
- displayName = "Chile Macaroni MRE(Heated)";
- };
-
- class cse_US_MRE_VegetableLasagna: cse_MRE_BASE {
- displayName = "Vegetable Lasagna MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Vegetable Lasagna";
- };
- class cse_US_MRE_VegetableLasagna_prepared: cse_US_MRE_VegetableLasagna {
- displayName = "Vegetable Lasagna MRE(Heated)";
- };
-
- class cse_US_MRE_SpicyPennePasta: cse_MRE_BASE {
- displayName = "Spicy Penne Pasta MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Spicy Penne Pasta";
- };
- class cse_US_MRE_SpicyPennePasta_prepared: cse_US_MRE_SpicyPennePasta {
- displayName = "Spicy Penne Pasta MRE(Heated)";
- };
-
- class cse_US_MRE_CheeseTortellini: cse_MRE_BASE {
- displayName = "Cheese Tortellini MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing CheeseTortellini";
- };
- class cse_US_MRE_CheeseTortellini_prepared: cse_US_MRE_CheeseTortellini {
- displayName = "Cheese Tortellini MRE(Heated)";
- };
-
- class cse_US_MRE_Ratatouille: cse_MRE_BASE {
- displayName = "Ratatouille MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Ratatouille";
- };
- class cse_US_MRE_Ratatouille_prepared: cse_US_MRE_Ratatouille {
- displayName = "Ratatouille MRE (Heated)";
- };
-
- class cse_US_MRE_MexicanStyleChickenStew: cse_MRE_BASE {
- displayName = "Mexican Style Chicken Stew MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Mexican Style Chicken Stew";
- };
- class cse_US_MRE_MexicanStyleChickenStew_prepared: cse_US_MRE_MexicanStyleChickenStew {
- displayName = "Mexican Style Chicken Stew MRE (Heated)";
- };
-
- class cse_US_MRE_PorkRib: cse_MRE_BASE {
- displayName = "Pork Rib MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Pork Rib";
- };
- class cse_US_MRE_PorkRib_prepared: cse_US_MRE_PorkRib {
- displayName = "Pork Rib MRE (Heated)";
- };
-
- class cse_US_MRE_MapleSausage: cse_MRE_BASE {
- displayName = "Maple Sausage MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Maple Sausage";
- };
- class cse_US_MRE_MapleSausage_prepared: cse_US_MRE_MapleSausage {
- displayName = "Maple Sausage MRE (Heated)";
- };
-
- class cse_US_MRE_BeefRavioli: cse_MRE_BASE {
- displayName = "Beef Ravioli MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Beef Ravioli";
- };
- class cse_US_MRE_BeefRavioli_prepared: cse_US_MRE_BeefRavioli {
- displayName = "Beef Ravioli MRE (Heated)";
- };
-
- class cse_US_MRE_SloppyJoe: cse_MRE_BASE {
- displayName = "Sloppy Joe MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing a Sloppy Joe";
- };
- class cse_US_MRE_SloppyJoe_prepared: cse_US_MRE_SloppyJoe {
- displayName = "Sloppy Joe MRE (Heated)";
- };
-
- class cse_US_MRE_SpaghettiMeatSauce: cse_MRE_BASE {
- displayName = "Spaghetti with Meat Sauce MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Spaghetti with Meat Sauce";
- };
- class cse_US_MRE_SpaghettiMeatSauce_prepared: cse_US_MRE_SpaghettiMeatSauce {
- displayName = "Spaghetti with Meat Sauce MRE (Heated)";
- };
-
- class cse_US_MRE_LemonPepperTuna: cse_MRE_BASE {
- displayName = " Lemon Pepper Tuna MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Lemon Pepper Tuna";
- };
- class cse_US_MRE_LemonPepperTuna_prepared: cse_US_MRE_LemonPepperTuna {
- displayName = "Lemon Pepper Tuna MRE (Heated)";
- };
-
- class cse_US_MRE_AsianBeefStrips: cse_MRE_BASE {
- displayName = "Asian Beef Strips MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Asian Beef Strips";
- };
- class cse_US_MRE_AsianBeefStrips_prepared: cse_US_MRE_AsianBeefStrips {
- displayName = "Asian Beef Strips MRE (Heated)";
- };
-
- class cse_US_MRE_ChickenPestoPasta: cse_MRE_BASE {
- displayName = "Chicken Pesto Pasta MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Chicken Pesto Pasta";
- };
- class cse_US_MRE_ChickenPestoPasta_prepared: cse_US_MRE_ChickenPestoPasta {
- displayName = "Chicken Pesto Pasta (Heated)";
- };
-
- class cse_US_MRE_SouthwestStyleBeefBlackBeans: cse_MRE_BASE {
- displayName = "Southwest Style Beef & Black Beans";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Southwest Style Beef & Black Beans";
- };
- class cse_US_MRE_SouthwestStyleBeefBlackBeans_prepared: cse_US_MRE_SouthwestStyleBeefBlackBeans {
- displayName = "Southwest Style Beef & Black Beans (Heated)";
- };
-
- class cse_mre_c_ration: cse_MRE_BASE {
- displayName = "C Ration";
- picture = "\cse\cse_sys_field_rations\data\pictures\gbl_mre_c_ration.paa";
- descriptionShort = "C ration";
- };
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/CfgSounds.h b/TO_MERGE/cse/sys_field_rations/CfgSounds.h
deleted file mode 100644
index 238bc7024a..0000000000
--- a/TO_MERGE/cse/sys_field_rations/CfgSounds.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgSounds {
- class cse_drinking {
- name = "cse_drinking";
- sound[] = {"cse\cse_sys_field_rations\sounds\drinkingSound.ogg","db-1",1.0};
- titles[] = {};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/CfgVehicles.h b/TO_MERGE/cse/sys_field_rations/CfgVehicles.h
deleted file mode 100644
index b0f1b82c9f..0000000000
--- a/TO_MERGE/cse/sys_field_rations/CfgVehicles.h
+++ /dev/null
@@ -1,201 +0,0 @@
-class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {};
- };
- class cse_sys_field_rations: Module_F {
- scope = 2;
- displayName = "Field Rations [CSE]";
- icon = "\cse\cse_main\data\cse_basic_module.paa";
- category = "cseModules";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- class timeWithoutWater {
- displayName = "Time without water";
- description = "How long should a unit be able to go without water";
- typeName = "NUMBER";
- class values {
- class Twodays {name="48 hours"; value= 0.5; };
- class 32Hours {name="32 hours"; value= 0.75; };
- class oneDay {name="24 hours"; value=1; default=1; };
- class halfDay {name="12 hours"; value=2; };
- class quarterDay {name="6 hours"; value=4; };
- class eightDay {name="3 hours"; value=8; };
- class oneHour {name="1 hour"; value=24; };
- };
- };
- class timeWithoutFood {
- displayName = "Time without food";
- description = "How long should a unit be able to go without food";
- typeName = "NUMBER";
- class values {
- class Twodays {name="48 hours"; value= 0.5; };
- class 32Hours {name="32 hours"; value= 0.75; default=1;};
- class oneDay {name="24 hours"; value=1; };
- class halfDay {name="12 hours"; value=2; };
- class quarterDay {name="6 hours"; value=4; };
- class eightDay {name="3 hours"; value=8; };
- class oneHour {name="1 hour"; value=24; };
- };
- };
- };
- };
-
- class NATO_Box_Base;
- class cse_field_rations_all : NATO_Box_Base {
- scope = 2;
- accuracy = 1000;
- displayName = "Field Rations [All] (CSE)";
- model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
- author = "Combat Space Enhancement";
- class TransportWeapons {
- class cse_waterbottle {
- weapon = "cse_waterbottle";
- count = 20;
- };
- class _xx_cse_canteen {
- weapon = "cse_canteen";
- count = 20;
- };
- class _xx_cse_MRE_LambC {
- weapon = "cse_MRE_LambC";
- count = 10;
- };
- class _xx_cse_MRE_Rice {
- weapon = "cse_MRE_Rice";
- count = 10;
- };
- class _xx_cse_MRE_CreamTomatoSoup {
- weapon = "cse_MRE_CreamTomatoSoup";
- count = 10;
- };
- class _xx_cse_MRE_CreamChickenSoup {
- weapon = "cse_MRE_CreamChickenSoup";
- count = 10;
- };
- class _xx_cse_MRE_ChickenTikkaMassala {
- weapon = "cse_MRE_ChickenTikkaMassala";
- count = 10;
- };
- class _xx_cse_MRE_SteakVegetables {
- weapon = "cse_MRE_SteakVegetables";
- count = 10;
- };
- class _xx_cse_MRE_MeatballsPasta {
- weapon = "cse_MRE_MeatballsPasta";
- count = 10;
- };
- class _xx_cse_MRE_ChickenHerbDumplings {
- weapon = "cse_MRE_ChickenHerbDumplings";
- count = 10;
- };
- class _xx_cse_Humanitarian_Ration {
- weapon = "cse_Humanitarian_Ration";
- count = 10;
- };
- class _xx_cse_US_MRE_ChiliBeans {
- weapon = "cse_US_MRE_ChiliBeans";
- count = 10;
- };
- class _xx_cse_US_MRE_ChickenFajita {
- weapon = "cse_US_MRE_ChickenFajita";
- count = 10;
- };
- class _xx_cse_US_MRE_ChickenNoodles {
- weapon = "cse_US_MRE_ChickenNoodles";
- count = 10;
- };
- class _xx_cse_US_MRE_PorkSausageGravy {
- weapon = "cse_US_MRE_PorkSausageGravy";
- count = 10;
- };
- class _xx_cse_US_MRE_MedChicen {
- weapon = "cse_US_MRE_MedChicen";
- count = 10;
- };
- class _xx_cse_US_MRE_BeefRoastVeggies {
- weapon = "cse_US_MRE_BeefRoastVeggies";
- count = 10;
- };
- class _xx_cse_US_MRE_BeefBrisket {
- weapon = "cse_US_MRE_BeefBrisket";
- count = 10;
- };
- class _xx_cse_US_MRE_MeatballMarinara {
- weapon = "cse_US_MRE_MeatballMarinara";
- count = 10;
- };
- class _xx_cse_US_MRE_BeefStew {
- weapon = "cse_US_MRE_BeefStew";
- count = 10;
- };
- class _xx_cse_US_MRE_ChiliMacaroni {
- weapon = "cse_US_MRE_ChiliMacaroni";
- count = 10;
- };
- class _xx_cse_US_MRE_VegetableLasagna {
- weapon = "cse_US_MRE_VegetableLasagna";
- count = 10;
- };
- class _xx_cse_US_MRE_SpicyPennePasta {
- weapon = "cse_US_MRE_SpicyPennePasta";
- count = 10;
- };
- class _xx_cse_US_MRE_CheeseTortellini {
- weapon = "cse_US_MRE_CheeseTortellini";
- count = 10;
- };
- class _xx_cse_US_MRE_Ratatouille {
- weapon = "cse_US_MRE_Ratatouille";
- count = 10;
- };
- class _xx_cse_US_MRE_MexicanStyleChickenStew {
- weapon = "cse_US_MRE_MexicanStyleChickenStew";
- count = 10;
- };
- class _xx_cse_US_MRE_PorkRib {
- weapon = "cse_US_MRE_PorkRib";
- count = 10;
- };
- class _xx_cse_US_MRE_MapleSausage {
- weapon = "cse_US_MRE_MapleSausage";
- count = 10;
- };
- class _xx_cse_US_MRE_BeefRavioli {
- weapon = "cse_US_MRE_BeefRavioli";
- count = 10;
- };
- class _xx_cse_US_MRE_SloppyJoe {
- weapon = "cse_US_MRE_SloppyJoe";
- count = 10;
- };
- class _xx_cse_US_MRE_SpaghettiMeatSauce {
- weapon = "cse_US_MRE_SpaghettiMeatSauce";
- count = 10;
- };
- class _xx_cse_US_MRE_LemonPepperTuna {
- weapon = "cse_US_MRE_LemonPepperTuna";
- count = 10;
- };
- class _xx_cse_US_MRE_AsianBeefStrips {
- weapon = "cse_US_MRE_AsianBeefStrips";
- count = 10;
- };
- class _xx_cse_US_MRE_ChickenPestoPasta {
- weapon = "cse_US_MRE_ChickenPestoPasta";
- count = 10;
- };
- class _xx_cse_US_MRE_SouthwestStyleBeefBlackBeans {
- weapon = "cse_US_MRE_SouthwestStyleBeefBlackBeans";
- count = 10;
- };
- class _xx_cse_mre_c_ration {
- weapon = "cse_mre_c_ration";
- count = 10;
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/CfgWeapons.h b/TO_MERGE/cse/sys_field_rations/CfgWeapons.h
deleted file mode 100644
index 06efed1750..0000000000
--- a/TO_MERGE/cse/sys_field_rations/CfgWeapons.h
+++ /dev/null
@@ -1,431 +0,0 @@
-class CfgWeapons {
- class ItemCore;
- class InventoryItem_Base_F;
- class cse_waterbottle: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Water Bottle";
- picture = "\cse\cse_sys_field_rations\data\pictures\waterbottle.paa";
- model = "\A3\Structures_F_EPA\Items\Food\BottlePlastic_V2_F.p3d";
- descriptionShort = "A waterbottle";
- class ItemInfo: InventoryItem_Base_F
- {
- mass= 5;
- type= 201;
- };
- cse_isDrinkable = 3.75;
- cse_onDrink = "cse_waterbottle_half";
- };
- class cse_canteen: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Canteen (Water)";
- picture = "\cse\cse_sys_field_rations\data\pictures\image_canteen.paa";
- model = "\A3\Structures_F_EPA\Items\Food\Canteen_F.p3d";
- descriptionShort = "A Canteen containing water";
- class ItemInfo: InventoryItem_Base_F
- {
- mass= 5;
- type= 201;
- };
- cse_isDrinkable = 3.75;
- cse_onDrink = "cse_canteen_half";
- };
- class cse_canteen_half: cse_canteen {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Canteen (Half)";
- picture = "\cse\cse_sys_field_rations\data\pictures\image_canteen.paa";
- model = "\A3\Structures_F_EPA\Items\Food\Canteen_F.p3d";
- descriptionShort = "A Canteen containing water (Half)";
- class ItemInfo: InventoryItem_Base_F
- {
- mass= 5;
- type= 201;
- };
- cse_isDrinkable = 3.75;
- cse_onDrink = "cse_canteen_empty";
- cse_onRefill = "cse_canteen";
- };
- class cse_canteen_empty: cse_canteen {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Canteen (Empty)";
- picture = "\cse\cse_sys_field_rations\data\pictures\image_canteen.paa";
- model = "\A3\Structures_F_EPA\Items\Food\Canteen_F.p3d";
- descriptionShort = "A Canteen containing water (Half)";
- class ItemInfo: InventoryItem_Base_F
- {
- mass= 5;
- type= 201;
- };
- cse_isDrinkable = 0;
- cse_onDrink = "";
- cse_onRefill = "cse_canteen";
- };
-
-
- class cse_waterbottle_half: cse_waterbottle {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Water Bottle 1/2";
- picture = "\cse\cse_sys_field_rations\data\pictures\waterbottle.paa";
- model ="\cse\cse_sys_field_rations\waterbottle.p3d";
- descriptionShort = "Half full waterbottle";
- cse_onDrink = "cse_waterbottle_empty";
- cse_isDrinkable = 3.75;
- se_onRefill = "cse_waterbottle";
- };
-
-
- class cse_waterbottle_empty: cse_waterbottle {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "Empty Water Bottle";
- picture = "\cse\cse_sys_field_rations\data\pictures\waterbottle_empty.paa";
- model ="\cse\cse_sys_field_rations\waterbottle.p3d";
- descriptionShort = "An empty waterbottle";
- cse_isDrinkable = 0;
- cse_onRefill = "cse_waterbottle";
- cse_onDrink = "";
- };
-
- class cse_MRE_BASE: cse_waterbottle {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = "MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE.paa";
- model ="\cse\cse_sys_field_rations\mre_type1.p3d";
- descriptionShort = "A Meal Ready to Eat, unprepared";
- class ItemInfo: InventoryItem_Base_F
- {
- mass= 2;
- type= 201;
- };
- cse_isEatable = 10;
- cse_isDrinkable = 0;
- };
-
- class cse_MRE_LambC: cse_MRE_BASE {
- displayName = "MRE Lamb Curry";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- model ="\cse\cse_sys_field_rations\mre_type1.p3d";
- descriptionShort = "An MRE containing Lamb Curry. Heat for best effect";
- };
- class cse_MRE_LambC_prepared: cse_MRE_LambC {
- displayName = "MRE Lamb Curry (Heated)";
- };
-
- class cse_MRE_Rice: cse_MRE_BASE {
- displayName = "MRE Rice";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type2.paa";
- model ="\cse\cse_sys_field_rations\mre_type2.p3d";
- descriptionShort = "An MRE Containing Rice. Heat for best effect";
- };
- class cse_MRE_Rice_prepared: cse_MRE_Rice {
- displayName = "MRE Rice (Heated)";
- };
-
- class cse_MRE_CreamTomatoSoup: cse_MRE_BASE {
- displayName = "MRE Cream Tomato Soup";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type3.paa";
- model ="\cse\cse_sys_field_rations\mre_type3.p3d";
- descriptionShort = "An MRE Containing Tomato Soup cream. Mix with water and heat for best effect";
- };
- class cse_MRE_CreamTomatoSoup_prepared: cse_MRE_CreamTomatoSoup {
- displayName = "MRE Cream Tomato Soup (Heated)";
- };
-
- class cse_MRE_CreamChickenSoup: cse_MRE_BASE {
- displayName = "MRE Cream Chicken Soup";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type3.paa";
- model ="\cse\cse_sys_field_rations\mre_type3.p3d";
- descriptionShort = "An MRE Containing Chicken Soup. Mix with water and heat for best effect";
- };
- class cse_MRE_CreamChickenSoup_prepared: cse_MRE_CreamChickenSoup {
- displayName = "MRE Cream Chicken Soup (Heated)";
- };
-
- class cse_MRE_ChickenTikkaMassala: cse_MRE_BASE {
- displayName = "MRE Chicken Tikka Massala";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type4.paa";
- model = "\cse\cse_sys_field_rations\mre_type4.p3d";
- descriptionShort = "An MRE with Chicken Tikka Massala. Heat for best effect";
- };
- class cse_MRE_ChickenTikkaMassala_prepared: cse_MRE_ChickenTikkaMassala {
- displayName = "MRE Chicken Tikka Massala (Heated)";
- };
-
- class cse_MRE_SteakVegetables: cse_MRE_BASE {
- displayName = "MRE Steak & Vegetables";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type5.paa";
- model ="\cse\cse_sys_field_rations\mre_type5.p3d";
- descriptionShort = "An MRE Containing Steak & Vegetables. Heat for best effect";
- };
- class cse_MRE_SteakVegetables_prepared: cse_MRE_SteakVegetables {
- displayName = "MRE Steak & Vegetables (Heated)";
- };
-
- class cse_MRE_MeatballsPasta: cse_MRE_BASE {
- displayName = "MRE Meatballs & Pasta";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type6.paa";
- model ="\cse\cse_sys_field_rations\mre_type6.p3d";
- descriptionShort = "An MRE Containing Meatballs & Pasta. Heat for best effect";
- };
- class cse_MRE_MeatballsPasta_prepared: cse_MRE_MeatballsPasta {
- displayName = "MRE Meatballs & Pastas (Heated)";
- };
-
- class cse_MRE_ChickenHerbDumplings: cse_MRE_BASE {
- displayName = "MRE Chicken with Herb Dumplings";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type6.paa";
- model ="\cse\cse_sys_field_rations\mre_type6.p3d";
- descriptionShort = "An MRE Containing Chicken with Herb Dumplings. Heat for best effect";
- };
- class cse_MRE_ChickenHerbDumplings_prepared: cse_MRE_ChickenHerbDumplings {
- displayName = "MRE Chicken with Herb Dumplings (Heated)";
- };
-
- class cse_Humanitarian_Ration: cse_MRE_BASE {
- displayName = "Humanitarian Ration";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_human.paa";
- model ="\cse\cse_sys_field_rations\mre_human.p3d";
- descriptionShort = "An Humanitarian Ration, for handing out to the local population";
- };
-
- class cse_US_MRE_ChiliBeans: cse_MRE_BASE {
- displayName = "Chile with Beans MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Chili with Beans";
- };
- class cse_US_MRE_ChiliBeans_prepared: cse_US_MRE_ChiliBeans {
- displayName = "Chile with Beans MRE (Heated)";
- };
- class cse_US_MRE_ChickenFajita: cse_MRE_BASE {
- displayName = "Chicken Fajita MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "A Chicken Fajita MRE";
- };
- class cse_US_MRE_ChickenFajita_prepared: cse_US_MRE_ChickenFajita {
- displayName = "Chicken Fajita MRE (Heated)";
- };
-
- class cse_US_MRE_ChickenNoodles: cse_MRE_BASE {
- displayName = "Chicken with Noodles MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Chicken with Noodles";
- };
- class cse_US_MRE_ChickenNoodles_prepared: cse_US_MRE_ChickenNoodles {
- displayName = "Chicken Fajita MRE(Heated)";
- };
-
- class cse_US_MRE_PorkSausageGravy: cse_MRE_BASE {
- displayName = "Pork Sausage with Gravy MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Pork Sausage with Gravy";
- };
- class cse_US_MRE_PorkSausageGravy_prepared: cse_US_MRE_PorkSausageGravy {
- displayName = "Pork Sausage Gravy MRE(Heated)";
- };
-
- class cse_US_MRE_MedChicen: cse_MRE_BASE {
- displayName = "Mediterranean Chicken MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Mediterranean Chicken";
- };
- class cse_US_MRE_MedChicken_prepared: cse_US_MRE_MedChicen {
- displayName = "Mediterranean Chicken MRE(Heated)";
- };
-
- class cse_US_MRE_BeefRoastVeggies: cse_MRE_BASE {
- displayName = "Beef Roast with Veggies MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Beef Roast with Veggies";
- };
- class cse_US_MRE_BeefRoastVeggies_prepared: cse_US_MRE_BeefRoastVeggies {
- displayName = "Beef Roast Veg MRE(Heated)";
- };
-
- class cse_US_MRE_BeefBrisket: cse_MRE_BASE {
- displayName = "Beef Brisket MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Beef Brisket";
- };
- class cse_US_MRE_BeefBrisket_prepared: cse_US_MRE_BeefBrisket {
- displayName = "Beef Brisket MRE(Heated)";
- };
-
- class cse_US_MRE_MeatballMarinara: cse_MRE_BASE {
- displayName = "Meatball Marinara MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Meatballs with Marinara Sauce";
- };
- class cse_US_MRE_MeatballMarinara_prepared: cse_US_MRE_MeatballMarinara {
- displayName = "Meatball Marinara(Heated)";
- };
-
- class cse_US_MRE_BeefStew: cse_MRE_BASE {
- displayName = "Beef Stew MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Beef Stew";
- };
- class cse_US_MRE_BeefStew_prepared: cse_US_MRE_BeefStew {
- displayName = "Beef Stew MRE(Heated)";
- };
-
- class cse_US_MRE_ChiliMacaroni: cse_MRE_BASE {
- displayName = "Chile Macaroni MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Chile Macaroni";
- };
- class cse_US_MRE_ChileMacaroni_prepared: cse_US_MRE_ChiliMacaroni {
- displayName = "Chile Macaroni MRE(Heated)";
- };
-
- class cse_US_MRE_VegetableLasagna: cse_MRE_BASE {
- displayName = "Vegetable Lasagna MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Vegetable Lasagna";
- };
- class cse_US_MRE_VegetableLasagna_prepared: cse_US_MRE_VegetableLasagna {
- displayName = "Vegetable Lasagna MRE(Heated)";
- };
-
- class cse_US_MRE_SpicyPennePasta: cse_MRE_BASE {
- displayName = "Spicy Penne Pasta MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Spicy Penne Pasta";
- };
- class cse_US_MRE_SpicyPennePasta_prepared: cse_US_MRE_SpicyPennePasta {
- displayName = "Spicy Penne Pasta MRE(Heated)";
- };
-
- class cse_US_MRE_CheeseTortellini: cse_MRE_BASE {
- displayName = "Cheese Tortellini MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing CheeseTortellini";
- };
- class cse_US_MRE_CheeseTortellini_prepared: cse_US_MRE_CheeseTortellini {
- displayName = "Cheese Tortellini MRE(Heated)";
- };
-
- class cse_US_MRE_Ratatouille: cse_MRE_BASE {
- displayName = "Ratatouille MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Ratatouille";
- };
- class cse_US_MRE_Ratatouille_prepared: cse_US_MRE_Ratatouille {
- displayName = "Ratatouille MRE (Heated)";
- };
-
- class cse_US_MRE_MexicanStyleChickenStew: cse_MRE_BASE {
- displayName = "Mexican Style Chicken Stew MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE containing Mexican Style Chicken Stew";
- };
- class cse_US_MRE_MexicanStyleChickenStew_prepared: cse_US_MRE_MexicanStyleChickenStew {
- displayName = "Mexican Style Chicken Stew MRE (Heated)";
- };
-
- class cse_US_MRE_PorkRib: cse_MRE_BASE {
- displayName = "Pork Rib MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Pork Rib";
- };
- class cse_US_MRE_PorkRib_prepared: cse_US_MRE_PorkRib {
- displayName = "Pork Rib MRE (Heated)";
- };
-
- class cse_US_MRE_MapleSausage: cse_MRE_BASE {
- displayName = "Maple Sausage MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Maple Sausage";
- };
- class cse_US_MRE_MapleSausage_prepared: cse_US_MRE_MapleSausage {
- displayName = "Maple Sausage MRE (Heated)";
- };
-
- class cse_US_MRE_BeefRavioli: cse_MRE_BASE {
- displayName = "Beef Ravioli MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Beef Ravioli";
- };
- class cse_US_MRE_BeefRavioli_prepared: cse_US_MRE_BeefRavioli {
- displayName = "Beef Ravioli MRE (Heated)";
- };
-
- class cse_US_MRE_SloppyJoe: cse_MRE_BASE {
- displayName = "Sloppy Joe MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing a Sloppy Joe";
- };
- class cse_US_MRE_SloppyJoe_prepared: cse_US_MRE_SloppyJoe {
- displayName = "Sloppy Joe MRE (Heated)";
- };
-
- class cse_US_MRE_SpaghettiMeatSauce: cse_MRE_BASE {
- displayName = "Spaghetti with Meat Sauce MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Spaghetti with Meat Sauce";
- };
- class cse_US_MRE_SpaghettiMeatSauce_prepared: cse_US_MRE_SpaghettiMeatSauce {
- displayName = "Spaghetti with Meat Sauce MRE (Heated)";
- };
-
- class cse_US_MRE_LemonPepperTuna: cse_MRE_BASE {
- displayName = " Lemon Pepper Tuna MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Lemon Pepper Tuna";
- };
- class cse_US_MRE_LemonPepperTuna_prepared: cse_US_MRE_LemonPepperTuna {
- displayName = "Lemon Pepper Tuna MRE (Heated)";
- };
-
- class cse_US_MRE_AsianBeefStrips: cse_MRE_BASE {
- displayName = "Asian Beef Strips MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Asian Beef Strips";
- };
- class cse_US_MRE_AsianBeefStrips_prepared: cse_US_MRE_AsianBeefStrips {
- displayName = "Asian Beef Strips MRE (Heated)";
- };
-
- class cse_US_MRE_ChickenPestoPasta: cse_MRE_BASE {
- displayName = "Chicken Pesto Pasta MRE";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Chicken Pesto Pasta";
- };
- class cse_US_MRE_ChickenPestoPasta_prepared: cse_US_MRE_ChickenPestoPasta {
- displayName = "Chicken Pesto Pasta (Heated)";
- };
-
- class cse_US_MRE_SouthwestStyleBeefBlackBeans: cse_MRE_BASE {
- displayName = "Southwest Style Beef & Black Beans";
- picture = "\cse\cse_sys_field_rations\data\pictures\MRE_type1.paa";
- descriptionShort = "An MRE Containing Southwest Style Beef & Black Beans";
- };
- class cse_US_MRE_SouthwestStyleBeefBlackBeans_prepared: cse_US_MRE_SouthwestStyleBeefBlackBeans {
- displayName = "Southwest Style Beef & Black Beans (Heated)";
- };
-
- class cse_mre_c_ration: cse_MRE_BASE {
- displayName = "C Ration";
- picture = "\cse\cse_sys_field_rations\data\pictures\gbl_mre_c_ration.paa";
- descriptionShort = "C ration";
- };
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_field_rations/Combat_Space_Enhancement.h
deleted file mode 100644
index 674ed4195d..0000000000
--- a/TO_MERGE/cse/sys_field_rations/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,8 +0,0 @@
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_field_rations {
- init = "call compile preprocessFile 'cse\cse_sys_field_rations\init_sys_field_rations.sqf';";
- name = "Field Rations";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/GUI.h b/TO_MERGE/cse/sys_field_rations/GUI.h
deleted file mode 100644
index fa22af3773..0000000000
--- a/TO_MERGE/cse/sys_field_rations/GUI.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
- #include "gui\define.h"
- #include "gui\dialog_menu.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/config.cpp b/TO_MERGE/cse/sys_field_rations/config.cpp
deleted file mode 100644
index 3feec5fde7..0000000000
--- a/TO_MERGE/cse/sys_field_rations/config.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#define _ARMA_
-class CfgPatches {
- class cse_sys_field_rations {
- units[] = {"cse_field_rations_all"};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_gui", "cse_main", "cse_f_eh", "cse_f_configuration", "cse_f_modules", "cse_f_states"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_field_rations {
- list[] = {"cse_sys_field_rations"};
- };
- };
-};
-
-#include "CfgFunctions.h"
-#include "Combat_Space_Enhancement.h"
-#include "CfgVehicles.h"
-
-// Here for backwards compatabilty.
-// #include "CfgMagazines.h"
-
-#include "CfgWeapons.h"
-#include "CfgSounds.h"
-#include "GUI.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/data/Humanitarian_Ration.paa b/TO_MERGE/cse/sys_field_rations/data/Humanitarian_Ration.paa
deleted file mode 100644
index 349a133b9a..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/Humanitarian_Ration.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/MRE_nohq.paa b/TO_MERGE/cse/sys_field_rations/data/MRE_nohq.paa
deleted file mode 100644
index 6972636a3d..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/MRE_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/MRE_smdi.paa b/TO_MERGE/cse/sys_field_rations/data/MRE_smdi.paa
deleted file mode 100644
index f450605958..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/MRE_smdi.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/Thumbs.db b/TO_MERGE/cse/sys_field_rations/data/Thumbs.db
deleted file mode 100644
index ae0aed9c59..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/Thumbs.db and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/hud_camelbak.paa b/TO_MERGE/cse/sys_field_rations/data/hud_camelbak.paa
deleted file mode 100644
index 35dfe4b273..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/hud_camelbak.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/hud_drinkstatus.paa b/TO_MERGE/cse/sys_field_rations/data/hud_drinkstatus.paa
deleted file mode 100644
index 99f0195871..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/hud_drinkstatus.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/hud_drinkstatus2.paa b/TO_MERGE/cse/sys_field_rations/data/hud_drinkstatus2.paa
deleted file mode 100644
index 9a6801c1da..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/hud_drinkstatus2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/hud_foodstatus.paa b/TO_MERGE/cse/sys_field_rations/data/hud_foodstatus.paa
deleted file mode 100644
index a7263b22af..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/hud_foodstatus.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/hud_foodstatus2.paa b/TO_MERGE/cse/sys_field_rations/data/hud_foodstatus2.paa
deleted file mode 100644
index 1c23460c77..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/hud_foodstatus2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/human.rvmat b/TO_MERGE/cse/sys_field_rations/data/human.rvmat
deleted file mode 100644
index fde5e41869..0000000000
--- a/TO_MERGE/cse/sys_field_rations/data/human.rvmat
+++ /dev/null
@@ -1,32 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={0.5,0.5,0.5,1};
-forcedDiffuse[]={0.5,0.5,0.5,0};
-emmisive[]={0,0,0,1};
-specular[]={0.30000001,0.30000001,0.30000001,0};
-specularPower=17;
-PixelShaderID="NormalMapSpecularDIMap";
-VertexShaderID="NormalMap";
-class Stage1
-{
- texture="cse\cse_sys_field_rations\data\MRE_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
-class Stage2
-{
- texture="cse\cse_sys_field_rations\data\MRE_smdi.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_field_rations/data/human_co.paa b/TO_MERGE/cse/sys_field_rations/data/human_co.paa
deleted file mode 100644
index e713006bb3..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/human_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/igui_background_dialog.paa b/TO_MERGE/cse/sys_field_rations/data/igui_background_dialog.paa
deleted file mode 100644
index ed3ef5d002..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/igui_background_dialog.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/mre-type125_co.paa b/TO_MERGE/cse/sys_field_rations/data/mre-type125_co.paa
deleted file mode 100644
index 27c94eaf2b..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/mre-type125_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/mre-type3_co.paa b/TO_MERGE/cse/sys_field_rations/data/mre-type3_co.paa
deleted file mode 100644
index 367f7e7c9e..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/mre-type3_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE.paa
deleted file mode 100644
index 5a941e7edf..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Heaterpackage.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Heaterpackage.paa
deleted file mode 100644
index 5083552df5..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Heaterpackage.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type1.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type1.paa
deleted file mode 100644
index ec397cea4c..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type1.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type2.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type2.paa
deleted file mode 100644
index 3c75c24f2c..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type3.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type3.paa
deleted file mode 100644
index 5a941e7edf..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type3.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type4.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type4.paa
deleted file mode 100644
index f90514a1c1..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type4.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type5.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type5.paa
deleted file mode 100644
index 08fde02f9a..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type5.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type6.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type6.paa
deleted file mode 100644
index 267b8a9b6e..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_Type6.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_human.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_human.paa
deleted file mode 100644
index 349a133b9a..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/MRE_human.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/britisharmy_waterbottle.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/britisharmy_waterbottle.paa
deleted file mode 100644
index f7c940b823..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/britisharmy_waterbottle.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/camelbak.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/camelbak.paa
deleted file mode 100644
index fa9d24b7c9..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/camelbak.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/camelbak_empty.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/camelbak_empty.paa
deleted file mode 100644
index 40ad5e02a8..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/camelbak_empty.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/gbl_mre_c_ration.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/gbl_mre_c_ration.paa
deleted file mode 100644
index c2ed77897e..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/gbl_mre_c_ration.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/image_canteen.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/image_canteen.paa
deleted file mode 100644
index f9b6ad6887..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/image_canteen.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/rationpack.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/rationpack.paa
deleted file mode 100644
index f90514a1c1..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/rationpack.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/waterbottle.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/waterbottle.paa
deleted file mode 100644
index d9f49d2596..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/waterbottle.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/pictures/waterbottle_empty.paa b/TO_MERGE/cse/sys_field_rations/data/pictures/waterbottle_empty.paa
deleted file mode 100644
index ff29021140..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/pictures/waterbottle_empty.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/type46.rvmat b/TO_MERGE/cse/sys_field_rations/data/type46.rvmat
deleted file mode 100644
index fde5e41869..0000000000
--- a/TO_MERGE/cse/sys_field_rations/data/type46.rvmat
+++ /dev/null
@@ -1,32 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={0.5,0.5,0.5,1};
-forcedDiffuse[]={0.5,0.5,0.5,0};
-emmisive[]={0,0,0,1};
-specular[]={0.30000001,0.30000001,0.30000001,0};
-specularPower=17;
-PixelShaderID="NormalMapSpecularDIMap";
-VertexShaderID="NormalMap";
-class Stage1
-{
- texture="cse\cse_sys_field_rations\data\MRE_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
-class Stage2
-{
- texture="cse\cse_sys_field_rations\data\MRE_smdi.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_field_rations/data/type46_nohq.paa b/TO_MERGE/cse/sys_field_rations/data/type46_nohq.paa
deleted file mode 100644
index ab85da35e9..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/type46_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/type4_co.paa b/TO_MERGE/cse/sys_field_rations/data/type4_co.paa
deleted file mode 100644
index 34a674c4c0..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/type4_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/type6_co.paa b/TO_MERGE/cse/sys_field_rations/data/type6_co.paa
deleted file mode 100644
index 87e97ea62f..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/type6_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/uk-bottle.paa b/TO_MERGE/cse/sys_field_rations/data/uk-bottle.paa
deleted file mode 100644
index ea80e5d567..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/uk-bottle.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/waterbottle.paa b/TO_MERGE/cse/sys_field_rations/data/waterbottle.paa
deleted file mode 100644
index 591f414142..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/waterbottle.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/data/waterbottle_2.paa b/TO_MERGE/cse/sys_field_rations/data/waterbottle_2.paa
deleted file mode 100644
index ca04325513..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/data/waterbottle_2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_actionDrink_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_actionDrink_FR.sqf
deleted file mode 100644
index ea6caaa728..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_actionDrink_FR.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_actionDrink_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_item", "_time", "_res"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
-_item = [_this, 1, "", [""]] call BIS_fnc_param;
-_time = [_this, 2, 0, [0]] call BIS_fnc_param;
-
-
-["cse_fieldRations_actionConsuming", true, "cse\cse_sys_field_rations\data\icons\icon_drinking.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-
-CSE_ORIGINAL_POSITION_PLAYER = getPos _unit;
-playsound "cse_drinking";
-_res = [_time,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar;
-
-["cse_fieldRations_actionConsuming", false, "cse\cse_sys_field_rations\data\icons\icon_drinking.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-
-
-if ([_item] call cse_fnc_itemIsDrinkable_FR && _res) then {
- _unit removeItem _item;
- _unit setvariable ["cse_drink_status_fr", ((_unit getvariable ["cse_drink_status_fr", 100]) + ([_item] call cse_fnc_getDrinkableValue_FR)) min 100];
-
- _onDrink = getText(ConfigFile >> "CfgWeapons" >> _item >> "cse_onDrink");
- if (_onDrink != "") then {
- _unit addItem _onDrink;
- };
-
- [format["ACTION DRINK: %1 FOUND %2",_unit, _item]] call cse_fnc_debug;
- if ((_unit getvariable ["cse_drink_status_fr", 100]) >= 100) then {
- hint "You feel stuffed..";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_actionEat_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_actionEat_FR.sqf
deleted file mode 100644
index b568d6bac3..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_actionEat_FR.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * fn_actionEat_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_item", "_time", "_res"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
-_item = [_this, 1, "", [""]] call BIS_fnc_param;
-_time = [_this, 2, 0, [0]] call BIS_fnc_param;
-
-
-["cse_fieldRations_actionConsuming", true, CSE_ICON_PATH + "icon_survival.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-
-CSE_ORIGINAL_POSITION_PLAYER = getPos _unit;
-_res = [_time,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar;
-
-["cse_fieldRations_actionConsuming", false, "cse\cse_sys_field_rations\data\icons\icon_drinking.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-
-
-if ([_item] call cse_fnc_itemIsEatable_FR && _res) then {
- _unit removeItem _item;
- _unit setvariable ["cse_food_status_fr", ((_unit getvariable ["cse_food_status_fr", 100]) + ([_item] call cse_fnc_getEatableValue_FR)) min 100];
-
- [format["ACTIONEAT: %1 FOUND %2",_unit, _item]] call cse_fnc_debug;
- if ((_unit getvariable ["cse_food_status_fr", 100]) >= 100) then {
- hint "You feel stuffed..";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_actionRefillCamelbak_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_actionRefillCamelbak_FR.sqf
deleted file mode 100644
index 63edf83d0d..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_actionRefillCamelbak_FR.sqf
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * fn_actionRefillCamelbak_FR.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-private ["_unit", "_item", "_onRefill", "_time", "_res"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-_time = [_this, 1, 0, [0]] call BIS_fnc_param;
-
-
-CSE_ORIGINAL_POSITION_PLAYER = getPos _unit;
-_res = [_time,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar;
-
-
-if ([uniformContainer _unit] call cse_fnc_isCamelbak_FR && _res) then {
- _maxValue = getNumber(ConfigFile >> "cfgWeapons" >> typeOf (uniformContainer _unit) >> "cse_camelbak_maxContent");
- if (_maxValue > 0) then {
- _uniform = uniformContainer _unit;
- _uniform setvariable ["cse_camelbak_status_fr", _maxValue];
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_actionRefill_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_actionRefill_FR.sqf
deleted file mode 100644
index f95e18753b..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_actionRefill_FR.sqf
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * fn_actionRefill_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_item", "_onRefill", "_time", "_res"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-_item = [_this, 1, "", [""]] call BIS_fnc_param;
-_time = [_this, 2, 0, [0]] call BIS_fnc_param;
-
-
-CSE_ORIGINAL_POSITION_PLAYER = getPos _unit;
-_res = [_time,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar;
-
-
-if ([_item] call cse_fnc_itemIsRefillable_FR && _res) then {
- _unit removeItem _item;
- _onRefill = getText(ConfigFile >> "CfgWeapons" >> _item >> "cse_onRefill");
- if (_onRefill != "") then {
- _unit addItem _onRefill;
- };
- [format["ACTION REFILL: %1 FOUND %2 %3",_unit, _item, _onRefill]] call cse_fnc_debug;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_canDrink_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_canDrink_FR.sqf
deleted file mode 100644
index 70d6539a8a..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_canDrink_FR.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * fn_canDrink_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-(((_this select 0) getvariable ["cse_drink_status_fr", 100]) < 101)
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_canEat_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_canEat_FR.sqf
deleted file mode 100644
index 69c412f41b..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_canEat_FR.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * fn_canEat_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-
-((_unit getvariable ["cse_food_status_fr", 100]) < 101)
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_canRefillCamelbak_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_canRefillCamelbak_FR.sqf
deleted file mode 100644
index e374d111b2..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_canRefillCamelbak_FR.sqf
+++ /dev/null
@@ -1,6 +0,0 @@
-private ["_unit", "_target"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-_target = [_this, 1, objNull, [objNull]] call bis_fnc_param;
-
-
-([_unit,_target] call cse_fnc_canRefill_FR);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_canRefill_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_canRefill_FR.sqf
deleted file mode 100644
index e2a02af147..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_canRefill_FR.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_canRefill_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_target"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-_target = [_this, 1, objNull, [objNull]] call bis_fnc_param;
-
-
-(((_target getvariable ["cse_isRefillObject_FR", false]) || (_target iskindof "Land_Misc_Well_C_EP1") || (_target iskindof "Land_Misc_Well_L_EP1") || (_target iskindof "Land_Barrel_water") || (_target iskindof "Land_stand_waterl_EP1") || (_target iskindof "Land_Reservoir_EP1")) && (_target distance _unit < 5))
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_getDrinkableValue_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_getDrinkableValue_FR.sqf
deleted file mode 100644
index 57e2f2b0a2..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_getDrinkableValue_FR.sqf
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * fn_getDrinkableValue_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_item", "_return"];
-_item = [_this, 0, "", [""]] call bis_fnc_param;
-_return = 0;
-
-if ([_item] call cse_fnc_itemIsDrinkable_FR) then {
- _return = getNumber(ConfigFile >> "CfgWeapons" >> _item >> "cse_isDrinkable");
-};
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_getEatableValue_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_getEatableValue_FR.sqf
deleted file mode 100644
index 5619f7cb05..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_getEatableValue_FR.sqf
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * fn_getEatableValue_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_item", "_return"];
-_item = [_this, 0, "", [""]] call bis_fnc_param;
-_return = 0;
-
-if ([_item] call cse_fnc_itemIsEatable_FR) then {
- _return = getNumber(ConfigFile >> "CfgWeapons" >> _item >> "cse_isEatable");
-};
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_getInitialContent_Camelbak_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_getInitialContent_Camelbak_FR.sqf
deleted file mode 100644
index 48d1e29d74..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_getInitialContent_Camelbak_FR.sqf
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * fn_getStartContent_Camelbak_FR.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-private ["_camelbak"];
-_camelbak = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-(getNumber(ConfigFile >> "cfgWeapons" >> typeOf _camelbak >> "cse_camelbak_initialContent") min ([_camelbak] call cse_fnc_getMaxContent_Camelbak_FR));
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_getMaxContent_Camelbak_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_getMaxContent_Camelbak_FR.sqf
deleted file mode 100644
index a41de4f97c..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_getMaxContent_Camelbak_FR.sqf
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * fn_getMaxContent_Camelbak_FR.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-private ["_camelbak"];
-_camelbak = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-getNumber(ConfigFile >> "cfgWeapons" >> typeOf _camelbak >> "cse_camelbak_maxContent");
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_hasCamelbak_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_hasCamelbak_FR.sqf
deleted file mode 100644
index d1315cd654..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_hasCamelbak_FR.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_hasCamelbak_FR.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-
-private ["_unit"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-
-if !(_unit isKindOf "CAManBase") exitwith {false};
-([uniformContainer _unit] call cse_fnc_isCamelbak_FR);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_hasDrinkableItem_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_hasDrinkableItem_FR.sqf
deleted file mode 100644
index dcfe758649..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_hasDrinkableItem_FR.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_hasDrinkableItem_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_return", "_magazines"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-_return = false;
-
-_magazines = items _unit;
-{
- if ([_x] call cse_fnc_itemIsDrinkable_FR) exitwith {
- _return = true;
- };
-}foreach _magazines;
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_hasEatableItem_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_hasEatableItem_FR.sqf
deleted file mode 100644
index e643ed182f..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_hasEatableItem_FR.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_hasEatableItem_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_return", "_magazines"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-_return = false;
-
-_magazines = items _unit;
-{
- if ([_x] call cse_fnc_itemIsEatable_FR) exitwith {
- _return = true;
- };
-}foreach _magazines;
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_hasRefillableItem_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_hasRefillableItem_FR.sqf
deleted file mode 100644
index 7f6fe27261..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_hasRefillableItem_FR.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_hasRefillableItem_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_return", "_magazines"];
-_unit = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-_return = false;
-
-_magazines = items _unit;
-{
- if ([_x] call cse_fnc_itemIsRefillable_FR) exitwith {
- _return = true;
- };
-}foreach _magazines;
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_isCamelbak_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_isCamelbak_FR.sqf
deleted file mode 100644
index be3f57b975..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_isCamelbak_FR.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * fn_isCamelbak_FR.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-private ["_return", "_object"];
-_object = [_this, 0, objNull, [objNull]] call bis_fnc_param;
-_return = false;
-if (isClass (ConfigFile >> "cfgWeapons" >> typeOf _object)) then {
- _return = getNumber(ConfigFile >> "cfgWeapons" >> typeOf _object >> "cse_camelbak_maxContent") > 0;
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsDrinkable_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsDrinkable_FR.sqf
deleted file mode 100644
index 026f51568d..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsDrinkable_FR.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_itemIsDrinkable_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_item", "_return", "_cfg"];
-_item = [_this, 0, "", [""]] call bis_fnc_param;
-_return = false;
-
-_cfg = (ConfigFile >> "CfgWeapons" >> _item);
-if (isClass _cfg) then {
- _return = (getNumber (_cfg >> "cse_isDrinkable") > 0);
-};
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsEatable_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsEatable_FR.sqf
deleted file mode 100644
index ed2df08bce..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsEatable_FR.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_itemIsEatable_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_item", "_return", "_cfg"];
-_item = [_this, 0, "", [""]] call bis_fnc_param;
-_return = false;
-
-_cfg = (ConfigFile >> "CfgWeapons" >> _item);
-if (isClass _cfg) then {
- _return = (getNumber (_cfg >> "cse_isEatable") > 0);
-};
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsRefillable_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsRefillable_FR.sqf
deleted file mode 100644
index 3545eafbbd..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_itemIsRefillable_FR.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_itemIsRefillable_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_item", "_return", "_cfg"];
-_item = [_this, 0, "", [""]] call bis_fnc_param;
-_return = false;
-
-_cfg = (ConfigFile >> "CfgWeapons" >> _item);
-if (isClass _cfg) then {
- _return = (getText(_cfg >> "cse_onRefill") != "");
-};
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_reduceLevels_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_reduceLevels_FR.sqf
deleted file mode 100644
index e577a9147e..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_reduceLevels_FR.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_reduceLevels_FR.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_absSpeed", "_camelbak_state","_decentWater","_decentFood", "_unit"];
-_unit = _this select 0;
-
-_drinkStatus = _unit getvariable ["cse_drink_status_fr", 100];
-_foodStatus = _unit getvariable ["cse_food_status_fr", 100];
-
-_absSpeed = abs(speed _unit);
-
-_decentWater = CSE_DESCENT_RATE_WATER_FR;
-_decentFood = CSE_DESCENT_RATE_FOOD_FR;
-
-// TODO add in weight calculation and effect
-// If _unit is inside a vehicle, adjust waterlevels
-if (vehicle _unit == _unit) then {
- if (_absSpeed > 1) then {
- _decentWater = _decentWater + (_absSpeed / 400);
- _decentFood = _decentFood + (_absSpeed / 1200);
- };
-};
-if ([_unit] call cse_fnc_hasCamelbak_FR) then {
- _camelbak_state = (uniformContainer _unit) getvariable ["cse_camelbak_status_fr", [(uniformContainer _unit)] call cse_fnc_getInitialContent_Camelbak_FR];
- if (_camelbak_state > 0) then {
- (uniformContainer _unit) setvariable ["cse_camelbak_status_fr", _camelbak_state - _decentWater];
- } else {
- _unit setvariable ["cse_drink_status_fr", _drinkStatus - _decentWater];
- };
-} else {
- _unit setvariable ["cse_drink_status_fr", _drinkStatus - _decentWater];
-};
-_unit setvariable ["cse_food_status_fr", _foodStatus - _decentFood];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_updateFieldRations_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_updateFieldRations_FR.sqf
deleted file mode 100644
index ee676456f9..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_updateFieldRations_FR.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * fn_updateFieldRations_FR.sqf
- * @Descr: Updates the hydration and hunger levels for given unit and if the unit is the player, it will also give a call to the UI icons from Field Rations.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT (The unit that will have the levels updated)]
- * @Return: void
- * @PublicAPI: false
- */
-
-private ["_unit", "_drinkStatus","_foodStatus","_camelbakStatus", "_animState", "_aniMStateChars", "_animP"];
-_unit = _this select 0;
-[_unit] call cse_fnc_reduceLevels_FR;
-_drinkStatus = _unit getvariable ["cse_drink_status_fr", 100];
-_foodStatus = _unit getvariable ["cse_food_status_fr", 100];
-_camelbakStatus = _unit getvariable ["cse_camelbak_status_fr", 0];
-//[format["drink: %1 Food: %2 Camelbak: %3 - %4", _drinkStatus, _foodStatus, _camelbakStatus, _unit]] call cse_fnc_debug;
-
-[] call cse_fnc_updateUIStatus_FR;
-if (_drinkStatus < 25 || _foodStatus < 25) then {
- if (speed _unit > 12 && vehicle _unit == _unit) then {
- _unit playMove "amovppnemstpsraswrfldnon";
- };
-};
-
-if (_drinkStatus < 30 || _foodStatus < 30) then {
- CSE_SHOW_UI_ICONS_FR = true;
-} else {
- CSE_SHOW_UI_ICONS_FR = false;
-};
-
-if (_drinkStatus < 20 || _foodStatus < 20) then {
- if (random(1) > 0.8) then {
- [_unit] call cse_fnc_setUnconsciousState;
- };
-};
-
-_animState = animationState _unit;
-_animStateChars = toArray _animState;
-_animP = toString [_animStateChars select 5,_animStateChars select 6,_aniMStateChars select 7];
-
-
-if (_drinkStatus < 7 || _foodStatus < 7) then {
- if (speed _unit > 1 && vehicle _unit == _unit && (_animP != "pne")) then {
- _unit playMove "amovppnemstpsraswrfldnon";
- };
-};
-
-if (_drinkStatus < 1 || _foodStatus < 1) then {
- if (random(1) > 0.2) then {
- [_unit] call cse_fnc_setDead;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/functions/fn_updateUIStatus_FR.sqf b/TO_MERGE/cse/sys_field_rations/functions/fn_updateUIStatus_FR.sqf
deleted file mode 100644
index b3ac2bb126..0000000000
--- a/TO_MERGE/cse/sys_field_rations/functions/fn_updateUIStatus_FR.sqf
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * fn_updateUIStatus_FR.sqf
- * @Descr: Updates the UI icons for field rations, based on player stats.
- * @Author: Glowbal
- *
- * @Arguments: [skipCheck BOOL (Whatever or not checks for display should be skipped. True will force display)]
- * @Return: void
- * @PublicAPI: true
- */
-
-#define DEFAULT_ALPHA_LEVEL 0.4
-
-private ["_unit","_PlayerStatusUI","_ctrlPlayerStatusDrink", "_ctrlPlayerStatusFood", "_ctrlCamelBakStatus", "_alphaCamelBak", "_drinkStatus","_foodStatus","_camelbakStatus", "_greenCamelBak", "_greenDrink", "_greenFood", "_yellowFood","_yellowDrink","_yellowCamelBak", "_redFood", "_redDrink", "_redCamelBak"];
-
-_skipChecks = [_this, 0, false, [false]] call BIS_fnc_Param;
-
-if !(hasInterface) exitwith {};
-_unit = player;
-disableSerialization;
-_PlayerStatusUI = uiNamespace getVariable "CSE_sys_field_rations_PlayerStatusUI";
-if (!isnil "_PlayerStatusUI") then {
- _ctrlPlayerStatusDrink = _PlayerStatusUI displayCtrl 11113;
- _ctrlPlayerStatusFood = _PlayerStatusUI displayCtrl 11112;
- _ctrlCamelBakStatus = _PlayerStatusUI displayCtrl 11114;
-
- _drinkStatus = _unit getvariable ["cse_drink_status_fr", 100];
- _foodStatus = _unit getvariable ["cse_food_status_fr", 100];
- _camelbakStatus = _unit getvariable ["cse_camelbak_status_fr", 0];
-
- if (CSE_SHOW_UI_ICONS_FR || CSE_SHOW_UI_ICONS_ONACTION_FR || CSE_SHOW_UI_ICONS_SETTING_FR || ((_drinkStatus < 30) || (_foodStatus < 30))) then {
- _alphaCamelBak = 0;
- if ([_unit] call cse_fnc_hasCamelbak_FR) then {
- _alphaCamelBak = DEFAULT_ALPHA_LEVEL;
- };
-
- _greenCamelBak = _camelbakStatus/100;
- _redCamelBak = 1.0 - _greenCamelBak;
- _yellowCamelBak = 0;
- _ctrlCamelBakStatus ctrlSetTextColor [_redCamelBak,_greenCamelBak,_yellowCamelBak, _alphaCamelBak];
-
- _greenFood = _foodStatus/100;
- _redFood = 1.0 - _greenFood;
- _yellowFood = 0;
- _ctrlPlayerStatusFood ctrlSetTextColor [_redFood,_greenFood,_yellowFood, DEFAULT_ALPHA_LEVEL];
-
- _greenDrink = _drinkStatus/100;
- _redDrink = 1.0 - _greenDrink;
- _yellowDrink = 0;
- _ctrlPlayerStatusDrink ctrlSetTextColor [_redDrink,_greenDrink,_yellowDrink, DEFAULT_ALPHA_LEVEL];
- } else {
- _ctrlCamelBakStatus ctrlSetTextColor [0, 0, 0, 0];
- _ctrlPlayerStatusFood ctrlSetTextColor [0, 0, 0, 0];
- _ctrlPlayerStatusDrink ctrlSetTextColor [0, 0, 0, 0];
- };
- if (!_skipChecks) then {
- if (CSE_SHOW_UI_ICONS_ONACTION_FR) then {
- CSE_SHOW_UI_ICONS_ONACTION_FR = false;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/gui/define.h b/TO_MERGE/cse/sys_field_rations/gui/define.h
deleted file mode 100644
index c521de470f..0000000000
--- a/TO_MERGE/cse/sys_field_rations/gui/define.h
+++ /dev/null
@@ -1,797 +0,0 @@
-
-#ifndef CSE_DEFINE_H
-#define CSE_DEFINE_H
-// define.hpp
-
-#define true 1
-#define false 0
-
-#define CT_STATIC 0
-#define CT_BUTTON 1
-#define CT_EDIT 2
-#define CT_SLIDER 3
-#define CT_COMBO 4
-#define CT_LISTBOX 5
-#define CT_TOOLBOX 6
-#define CT_CHECKBOXES 7
-#define CT_PROGRESS 8
-#define CT_HTML 9
-#define CT_STATIC_SKEW 10
-#define CT_ACTIVETEXT 11
-#define CT_TREE 12
-#define CT_STRUCTURED_TEXT 13
-#define CT_CONTEXT_MENU 14
-#define CT_CONTROLS_GROUP 15
-#define CT_SHORTCUTBUTTON 16
-#define CT_XKEYDESC 40
-#define CT_XBUTTON 41
-#define CT_XLISTBOX 42
-#define CT_XSLIDER 43
-#define CT_XCOMBO 44
-#define CT_ANIMATED_TEXTURE 45
-#define CT_OBJECT 80
-#define CT_OBJECT_ZOOM 81
-#define CT_OBJECT_CONTAINER 82
-#define CT_OBJECT_CONT_ANIM 83
-#define CT_LINEBREAK 98
-#define CT_ANIMATED_USER 99
-#define CT_MAP 100
-#define CT_MAP_MAIN 101
-#define CT_LISTNBOX 102
-
-// Static styles
-#define ST_POS 0x0F
-#define ST_HPOS 0x03
-#define ST_VPOS 0x0C
-#define ST_LEFT 0x00
-#define ST_RIGHT 0x01
-#define ST_CENTER 0x02
-#define ST_DOWN 0x04
-#define ST_UP 0x08
-#define ST_VCENTER 0x0c
-
-#define ST_TYPE 0xF0
-#define ST_SINGLE 0
-#define ST_MULTI 16
-#define ST_TITLE_BAR 32
-#define ST_PICTURE 48
-#define ST_FRAME 64
-#define ST_BACKGROUND 80
-#define ST_GROUP_BOX 96
-#define ST_GROUP_BOX2 112
-#define ST_HUD_BACKGROUND 128
-#define ST_TILE_PICTURE 144
-#define ST_WITH_RECT 160
-#define ST_LINE 176
-
-#define ST_SHADOW 0x100
-#define ST_NO_RECT 0x200 // this style works for CT_STATIC in conjunction with ST_MULTI
-#define ST_KEEP_ASPECT_RATIO 0x800
-
-#define ST_TITLE ST_TITLE_BAR + ST_CENTER
-
-// Slider styles
-#define SL_DIR 0x400
-#define SL_VERT 0
-#define SL_HORZ 0x400
-
-#define SL_TEXTURES 0x10
-
-// Listbox styles
-#define LB_TEXTURES 0x10
-#define LB_MULTI 0x20
-#define FontCSE "PuristaMedium"
-
-class cse_gui_backgroundBase {
- type = CT_STATIC;
- idc = -1;
- style = ST_PICTURE;
- colorBackground[] = {0,0,0,0};
- colorText[] = {1, 1, 1, 1};
- font = FontCSE;
- text = "";
- sizeEx = 0.032;
-};
-class cse_gui_editBase
-{
- access = 0;
- type = 2;
- x = 0;
- y = 0;
- h = 0.04;
- w = 0.2;
- colorBackground[] =
- {
- 0,
- 0,
- 0,
- 1
- };
- colorText[] =
- {
- 0.95,
- 0.95,
- 0.95,
- 1
- };
- colorSelection[] =
- {
- "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])",
- 1
- };
- autocomplete = "";
- text = "";
- size = 0.2;
- style = "0x00 + 0x40";
- font = "PuristaMedium";
- shadow = 2;
- sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorDisabled[] =
- {
- 1,
- 1,
- 1,
- 0.25
- };
-};
-
-
-
-class cse_gui_buttonBase {
- idc = -1;
- type = 16;
- style = ST_LEFT;
- text = "";
- action = "";
- x = 0.0;
- y = 0.0;
- w = 0.25;
- h = 0.04;
- size = 0.03921;
- sizeEx = 0.03921;
- color[] = {1.0, 1.0, 1.0, 1};
- color2[] = {1.0, 1.0, 1.0, 1};
- /*colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.5])"};
- colorbackground2[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.4};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- colorFocused[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])", 0.8};
- colorBackgroundFocused[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.8};
- */
-
- colorBackground[] = {1,1,1,0.95};
- colorbackground2[] = {1,1,1,0.95};
- colorDisabled[] = {1,1,1,0.6};
- colorFocused[] = {1,1,1,1};
- colorBackgroundFocused[] = {1,1,1,1};
- periodFocus = 1.2;
- periodOver = 0.8;
- default = false;
- class HitZone {
- left = 0.00;
- top = 0.00;
- right = 0.00;
- bottom = 0.00;
- };
-
- class ShortcutPos {
- left = 0.00;
- top = 0.00;
- w = 0.00;
- h = 0.00;
- };
-
- class TextPos {
- left = 0.002;
- top = 0.0004;
- right = 0.0;
- bottom = 0.00;
- };
- textureNoShortcut = "";
- animTextureNormal = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDisabled = "cse\cse_gui\data\buttonDisabled_gradient.paa";
- animTextureOver = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureFocused = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTexturePressed = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDefault = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- period = 0.5;
- font = FontCSE;
- soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
- soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0};
- soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1};
- soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
- class Attributes {
- font = FontCSE;
- color = "#E5E5E5";
- align = "center";
- shadow = "true";
- };
- class AttributesImage {
- font = FontCSE;
- color = "#E5E5E5";
- align = "left";
- shadow = "true";
- };
-};
-
-class cse_gui_RscProgress {
- type = 8;
- style = 0;
- colorFrame[] = {1,1,1,0.7};
- colorBar[] = {1,1,1,0.7};
- texture = "#(argb,8,8,3)color(1,1,1,0.7)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-};
-
-
-class cse_gui_staticBase {
- idc = -1;
- type = CT_STATIC;
- x = 0.0;
- y = 0.0;
- w = 0.183825;
- h = 0.104575;
- style = ST_LEFT;
- font = FontCSE;
- sizeEx = 0.03921;
- colorText[] = {0.95, 0.95, 0.95, 1.0};
- colorBackground[] = {0, 0, 0, 0};
- text = "";
-};
-
-class RscListBox;
-class cse_gui_listBoxBase : RscListBox{
- type = CT_LISTBOX;
- style = ST_MULTI;
- font = FontCSE;
- sizeEx = 0.03921;
- color[] = {1, 1, 1, 1};
- colorText[] = {0.543, 0.5742, 0.4102, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 1};
- colorSelectBackground2[] = {0.543, 0.5742, 0.4102, 1.0};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- period = 1.2;
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 1};
- maxHistoryDelay = 1.0;
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- soundSelect[] = {"",0.1,1};
- soundExpand[] = {"",0.1,1};
- soundCollapse[] = {"",0.1,1};
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
- class ScrollBar {
- color[] = {1, 1, 1, 0.6};
- colorActive[] = {1, 1, 1, 1};
- colorDisabled[] = {1, 1, 1, 0.3};
- thumb = "";
- arrowFull = "";
- arrowEmpty = "";
- border = "";
- };
-};
-
-
-class cse_gui_listNBox {
- access = 0;
- type = CT_LISTNBOX;// 102;
- style =ST_MULTI;
- w = 0.4;
- h = 0.4;
- font = FontCSE;
- sizeEx = 0.031;
-
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- columns[] = {0.0};
- color[] = {1, 1, 1, 1};
-
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.5};
- colorActive[] = {0,0,0,1};
- colorDisabled[] = {0,0,0,0.3};
- rows = 1;
-
- drawSideArrows = 0;
- idcLeft = -1;
- idcRight = -1;
- maxHistoryDelay = 1;
- soundSelect[] = {"", 0.1, 1};
- period = 1;
- shadow = 2;
- class ScrollBar {
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- border = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- thumb = "#(argb,8,8,3)color(1,1,1,1)";
- };
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-class RscCombo;
-class cse_gui_comboBoxBase: RscCombo {
- idc = -1;
- type = 4;
- style = "0x10 + 0x200";
- x = 0;
- y = 0;
- w = 0.3;
- h = 0.035;
- color[] = {0,0,0,0.6};
- colorActive[] = {1,0,0,1};
- colorBackground[] = {0,0,0,1};
- colorDisabled[] = {1,1,1,0.25};
- colorScrollbar[] = {1,0,0,1};
- colorSelect[] = {0,0,0,1};
- colorSelectBackground[] = {1,1,1,0.7};
- colorText[] = {1,1,1,1};
-
- arrowEmpty = "";
- arrowFull = "";
- wholeHeight = 0.45;
- font = FontCSE;
- sizeEx = 0.031;
- soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1};
- soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1};
- soundCollapse[] = {"\A3\ui_f\data\sound\RscCombo\soundCollapse",0.1,1};
- maxHistoryDelay = 1.0;
- class ScrollBar
- {
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- border = "";
- };
- class ComboScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-
-class cse_gui_mapBase {
- moveOnEdges = 1;
- x = "SafeZoneXAbs";
- y = "SafeZoneY + 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "SafeZoneWAbs";
- h = "SafeZoneH - 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- type = 100; // Use 100 to hide markers
- style = 48;
- shadow = 0;
-
- ptsPerSquareSea = 5;
- ptsPerSquareTxt = 3;
- ptsPerSquareCLn = 10;
- ptsPerSquareExp = 10;
- ptsPerSquareCost = 10;
- ptsPerSquareFor = 9;
- ptsPerSquareForEdge = 9;
- ptsPerSquareRoad = 6;
- ptsPerSquareObj = 9;
- showCountourInterval = 0;
- scaleMin = 0.001;
- scaleMax = 1.0;
- scaleDefault = 0.16;
- maxSatelliteAlpha = 0.85;
- alphaFadeStartScale = 0.35;
- alphaFadeEndScale = 0.4;
- colorBackground[] = {0.969,0.957,0.949,1.0};
- colorSea[] = {0.467,0.631,0.851,0.5};
- colorForest[] = {0.624,0.78,0.388,0.5};
- colorForestBorder[] = {0.0,0.0,0.0,0.0};
- colorRocks[] = {0.0,0.0,0.0,0.3};
- colorRocksBorder[] = {0.0,0.0,0.0,0.0};
- colorLevels[] = {0.286,0.177,0.094,0.5};
- colorMainCountlines[] = {0.572,0.354,0.188,0.5};
- colorCountlines[] = {0.572,0.354,0.188,0.25};
- colorMainCountlinesWater[] = {0.491,0.577,0.702,0.6};
- colorCountlinesWater[] = {0.491,0.577,0.702,0.3};
- colorPowerLines[] = {0.1,0.1,0.1,1.0};
- colorRailWay[] = {0.8,0.2,0.0,1.0};
- colorNames[] = {0.1,0.1,0.1,0.9};
- colorInactive[] = {1.0,1.0,1.0,0.5};
- colorOutside[] = {0.0,0.0,0.0,1.0};
- colorTracks[] = {0.84,0.76,0.65,0.15};
- colorTracksFill[] = {0.84,0.76,0.65,1.0};
- colorRoads[] = {0.7,0.7,0.7,1.0};
- colorRoadsFill[] = {1.0,1.0,1.0,1.0};
- colorMainRoads[] = {0.9,0.5,0.3,1.0};
- colorMainRoadsFill[] = {1.0,0.6,0.4,1.0};
- colorGrid[] = {0.1,0.1,0.1,0.6};
- colorGridMap[] = {0.1,0.1,0.1,0.6};
- colorText[] = {1, 1, 1, 0.85};
-font = "PuristaMedium";
-sizeEx = 0.0270000;
-stickX[] = {0.20, {"Gamma", 1.00, 1.50} };
-stickY[] = {0.20, {"Gamma", 1.00, 1.50} };
-onMouseButtonClick = "";
-onMouseButtonDblClick = "";
-
- fontLabel = "PuristaMedium";
- sizeExLabel = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontGrid = "TahomaB";
- sizeExGrid = 0.02;
- fontUnits = "TahomaB";
- sizeExUnits = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontNames = "PuristaMedium";
- sizeExNames = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2";
- fontInfo = "PuristaMedium";
- sizeExInfo = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontLevel = "TahomaB";
- sizeExLevel = 0.02;
- text = "#(argb,8,8,3)color(1,1,1,1)";
- class ActiveMarker {
- color[] = {0.30, 0.10, 0.90, 1.00};
- size = 50;
- };
- class Legend
- {
- x = "SafeZoneX + ( ((safezoneW / safezoneH) min 1.2) / 40)";
- y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
- h = "3.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- font = "PuristaMedium";
- sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- colorBackground[] = {1,1,1,0.5};
- color[] = {0,0,0,1};
- };
- class Task
- {
- icon = "\A3\ui_f\data\map\mapcontrol\taskIcon_CA.paa";
- iconCreated = "\A3\ui_f\data\map\mapcontrol\taskIconCreated_CA.paa";
- iconCanceled = "\A3\ui_f\data\map\mapcontrol\taskIconCanceled_CA.paa";
- iconDone = "\A3\ui_f\data\map\mapcontrol\taskIconDone_CA.paa";
- iconFailed = "\A3\ui_f\data\map\mapcontrol\taskIconFailed_CA.paa";
- color[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])"};
- colorCreated[] = {1,1,1,1};
- colorCanceled[] = {0.7,0.7,0.7,1};
- colorDone[] = {0.7,1,0.3,1};
- colorFailed[] = {1,0.3,0.2,1};
- size = 27;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- };
- class Waypoint
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class WaypointCompleted
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypointCompleted_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class CustomMark
- {
- icon = "\A3\ui_f\data\map\mapcontrol\custommark_ca.paa";
- size = 24;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {0,0,0,1};
- };
- class Command
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- size = 18;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {1,1,1,1};
- };
- class Bush
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = "14/2";
- importance = "0.2 * 14 * 0.05 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Rock
- {
- icon = "\A3\ui_f\data\map\mapcontrol\rock_ca.paa";
- color[] = {0.1,0.1,0.1,0.8};
- size = 12;
- importance = "0.5 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class SmallTree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.6 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Tree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.9 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class busstop
- {
- icon = "\A3\ui_f\data\map\mapcontrol\busstop_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class fuelstation
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fuelstation_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class hospital
- {
- icon = "\A3\ui_f\data\map\mapcontrol\hospital_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class church
- {
- icon = "\A3\ui_f\data\map\mapcontrol\church_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class lighthouse
- {
- icon = "\A3\ui_f\data\map\mapcontrol\lighthouse_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class power
- {
- icon = "\A3\ui_f\data\map\mapcontrol\power_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powersolar
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powersolar_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwave
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwave_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwind
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwind_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class quay
- {
- icon = "\A3\ui_f\data\map\mapcontrol\quay_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class shipwreck
- {
- icon = "\A3\ui_f\data\map\mapcontrol\shipwreck_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class transmitter
- {
- icon = "\A3\ui_f\data\map\mapcontrol\transmitter_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class watertower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\watertower_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class Cross
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Cross_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Chapel
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Chapel_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Bunker
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 14;
- importance = "1.5 * 14 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fortress
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 16;
- importance = "2 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fountain
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fountain_ca.paa";
- size = 11;
- importance = "1 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Ruin
- {
- icon = "\A3\ui_f\data\map\mapcontrol\ruin_ca.paa";
- size = 16;
- importance = "1.2 * 16 * 0.05";
- coefMin = 1;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Stack
- {
- icon = "\A3\ui_f\data\map\mapcontrol\stack_ca.paa";
- size = 20;
- importance = "2 * 16 * 0.05";
- coefMin = 0.9;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Tourism
- {
- icon = "\A3\ui_f\data\map\mapcontrol\tourism_ca.paa";
- size = 16;
- importance = "1 * 16 * 0.05";
- coefMin = 0.7;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class ViewTower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\viewtower_ca.paa";
- size = 16;
- importance = "2.5 * 16 * 0.05";
- coefMin = 0.5;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
-};
-
-#endif
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/gui/dialog_menu.h b/TO_MERGE/cse/sys_field_rations/gui/dialog_menu.h
deleted file mode 100644
index 6db9dc28e3..0000000000
--- a/TO_MERGE/cse/sys_field_rations/gui/dialog_menu.h
+++ /dev/null
@@ -1,172 +0,0 @@
-class cse_dialog_menu_frm {
- idd = 54328;
- movingEnable = false;
- onLoad = "uiNamespace setVariable ['cse_dialog_menu_frm', _this select 0];";
- onUnload = "uiNamespace setVariable ['cse_dialog_menu_frm', nil];";
- class controlsBackground {
- class HeaderBackground: cse_gui_backgroundBase{
- idc = -1;
- type = CT_STATIC;
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_LEFT + ST_SHADOW;
- font = "PuristaMedium";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.95, 0.95, 0.95, 0.75};
- colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- text = "";
- };
- class CenterBackground: HeaderBackground {
- y = "2.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- h = "2.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "";
- colorText[] = {0, 0, 0, "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- colorBackground[] = {0,0,0,"(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- };
- class LeftBackground: CenterBackground {
- y = "4.8 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- h = "12.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "25 * (((safezoneW / safezoneH) min 1.2) / 40)";
- };
- class RightBackground: LeftBackground {
- x = "26.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- w = "12.9 * (((safezoneW / safezoneH) min 1.2) / 40)";
- };
- };
-
- class controls {
- class HeaderName {
- idc = 1;
- type = CT_STATIC;
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_LEFT + ST_SHADOW;
- font = "PuristaMedium";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.95, 0.95, 0.95, 0.75};
- colorBackground[] = {0,0,0,0};
- text = "Dialog with Person";
- };
-
- class labelShow : cse_gui_staticBase {
- idc = 12;
- x = "2 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "2.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "30 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "Name:";
- };
- class labelShow2: cse_gui_staticBase {
- idc = 13;
- x = "2 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "30 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "State:";
- };
-
- class actionClose : cse_gui_buttonBase {
- idc = 10;
- text = "Close";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "17.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "6 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.8)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.5)";
- animTextureOver = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)";
- animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1, 1, 1, 1};
- color2[] = {0,0,0, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.5,0.5,0.5,0.8};
- colorFocused[] = {0,0,0,1};
- periodFocus = 1;
- periodOver = 1;
- action = "closedialog 0;";
- };
-
- class listboxConversationOverView: cse_gui_listNBox {
- idc = 200;
- x = "2 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "23 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
- colorBackground[] = {0, 0, 0, 0.9};
- colorSelectBackground[] = {0, 0, 0, 0.9};
- columns[] = {0.0, 0.25};
- };
-
- class labelTitle: cse_gui_staticBase {
- idc = 250;
- x = "27.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "Conversation Selection";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- };
-
-
- class actionListBox1: cse_gui_listBoxBase {
- idc = 400;
- x = "27.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "7.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "11 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "8 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- colorBackground[] = {0,0,0, 0.9};
- colorSelectBackground[] = {0,0,0, 0.9};
- colorSelectBackground2[] = { 0.9, 0.9, 0.9, 0.9};
- color[] = {1, 1, 1, 1};
- colorText[] = {1, 1, 1, 1};
- colorSelect[] = {1, 1, 1, 1};
- colorSelect2[] = {0,0,0, 1};
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.75)";
- rowHeight = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.75)";
- };
-
- class labelKey: cse_gui_staticBase {
- idc = 300;
- x = "27.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "6.2 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- };
-
-
- class actionPerformAction: actionClose {
- idc = 30;
- text = "Say selected line type";
- x = "27.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "17.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "11 * (((safezoneW / safezoneH) min 1.2) / 40)";
- action = "[CSE_AIM_DIALOG_INTERACTION_TARGET_AIM, player] call cse_fnc_playerSpeaksLine_AIM; ";
- animTextureNormal = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureDisabled = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureOver = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)";
- animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {0,0,0, 1};
- color2[] = {0,0,0, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.5,0.5,0.5,0.8};
- colorFocused[] = {0,0,0,1};
- };
-
-
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/gui/player_hud.h b/TO_MERGE/cse/sys_field_rations/gui/player_hud.h
deleted file mode 100644
index 76fd93508d..0000000000
--- a/TO_MERGE/cse/sys_field_rations/gui/player_hud.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#define RIGHT_SIDE (safezoneW + safezoneX)
-#define LEFT_SIDE safezoneX
-#define TOP_SIDE safeZoneY
-#define BOTTOM_SIDE (safeZoneH + safezoneY)
-
-#define ICON_WIDTH (1.75 * (((safezoneW / safezoneH) min 1.2) / 40))
-#define X_POS_ICONS RIGHT_SIDE - (1.1 * ICON_WIDTH)
-#define Y_POS_ICONS BOTTOM_SIDE - (0.1 * ICON_WIDTH)
-#define DIFFERENCE_ICONS (1.1 * ICON_WIDTH)
-
-class RscTitles {
- class CSE_sys_field_rations_PlayerStatusUI {
- duration = 1e+011;
- idd = 1111;
- movingenable = 0;
- onLoad = "uiNamespace setVariable ['CSE_sys_field_rations_PlayerStatusUI', _this select 0];";
- class controlsBackground {
- class FoodStatus: cse_gui_backgroundBase {
- text = "cse\cse_sys_field_rations\data\hud_foodstatus.paa";
- colorText[] = {0.0,1.0,0.0,0.4};
- idc = 11112;
- x = X_POS_ICONS;
- y = Y_POS_ICONS;
- w = ICON_WIDTH;
- h = ICON_WIDTH;
- };
- class drinkStatus: cse_gui_backgroundBase {
- text = "cse\cse_sys_field_rations\data\icons\icon_drinking.paa";
- colorText[] = {0.0,1.0,0.0,0.4};
- idc = 11113;
- x = X_POS_ICONS;
- y = Y_POS_ICONS - DIFFERENCE_ICONS;
- w = ICON_WIDTH;
- h = ICON_WIDTH;
- };
- /* class CamelBak: cse_gui_backgroundBase {
- text = "cse\cse_sys_field_rations\data\hud_camelbak.paa";
- colorText[] = {0.0,1.0,0.0,0};
- idc = 11114;
- x = "0.955313 * safezoneW + safezoneX";
- y = "0.80 * safezoneH + safezoneY";
- w = 0.05;
- h = 0.09;
- };*/
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/hud.hpp b/TO_MERGE/cse/sys_field_rations/hud.hpp
deleted file mode 100644
index d9ceda8332..0000000000
--- a/TO_MERGE/cse/sys_field_rations/hud.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// CSE FRM HUD
-// by Glowbal
-
-class RscTitles{
- class RscCSEPlayerStatus {
- duration = 10000000000;
- idd = 1111;
- movingenable = 0;
- onLoad = "uiNamespace setVariable ['CSEFRMStatusUI', _this select 0];";
-
- class controlsBackground {
- class cse_FoodStatus: cse_backgroundBase {
- text = "cse\cse_sys_field_rations\data\hud_foodstatus2.paa";
- colorText[] = {0.0, 1.0, 0.0, 0.9};
- idc = 11112;
- x = "0.955313 * safezoneW + safezoneX";
- y = "0.90 * safezoneH + safezoneY";
- w = "0.04 * safezoneW";
- h = "0.05 * safezoneH";
- };
-
- class cse_drinkStatus: cse_FoodStatus {
- text = "cse\cse_sys_field_rations\data\hud_drinkstatus2.paa";
- idc = 11113;
- y = "0.85 * safezoneH + safezoneY";
-
- };
-
- class cse_CamelBak: cse_FoodStatus {
- text = "cse\cse_sys_field_rations\data\hud_camelbak.paa";
- idc = 11114;
- y = "0.80 * safezoneH + safezoneY";
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/init_sys_field_rations.sqf b/TO_MERGE/cse/sys_field_rations/init_sys_field_rations.sqf
deleted file mode 100644
index cece0f7706..0000000000
--- a/TO_MERGE/cse/sys_field_rations/init_sys_field_rations.sqf
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * init_sys_field_rations.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-/*
- 24 hours:
- - 86400 seconds total
-
- Run every 10 seconds so:
- - 8640 iterations in 24 hours
-
- If we want to lower the decent rate from 100% to 0 in 24 hours:
- 100% / 8640 = 0.011574% per iteration.
-
- To increase it, decrease the modifier.
- To decease it, increase the modifier.
-*/
-#define DEFAULT_DECENT_RATE 0.011574
-
-private ["_args", "_entries"];
-CSE_DESCENT_RATE_WATER_FR = DEFAULT_DECENT_RATE;
-CSE_DESCENT_RATE_FOOD_FR = DEFAULT_DECENT_RATE;
-CSE_SHOW_UI_ICONS_FR = false;
-CSE_SHOW_UI_ICONS_ONACTION_FR = false;
-CSE_SHOW_UI_ICONS_SETTING_FR = true;
-
-["cse_drink_status_fr",100,false,"frm", false] call cse_fnc_defineVariable;
-["cse_food_status_fr",100,false,"frm", false] call cse_fnc_defineVariable;
-
-if (!hasInterface) exitwith {}; // only want to run this on clients
-
-_args = _this;
-{
- if (_x select 0 == "timeWithoutWater") then {
- CSE_DESCENT_RATE_WATER_FR = DEFAULT_DECENT_RATE * (_X select 1);
- };
- if (_x select 0 == "timeWithoutFood") then {
- CSE_DESCENT_RATE_FOOD_FR = DEFAULT_DECENT_RATE * (_X select 1);
- };
-}foreach _args;
-waituntil{!isnil "cse_gui"};
-[format["FRM - Field Rations Module initialised"],2] call cse_fnc_debug;
-
-["itemAdd", ["cse_sys_field_rations_task_loop_CMS", {
- if (alive player) then {
- [player] call cse_fnc_updateFieldRations_FR;
- };
-}, 10]] call BIS_fnc_loop;
-
-sleep 1;
-101 cutRsc ["CSE_sys_field_rations_PlayerStatusUI","PLAIN"];
-[] call cse_fnc_updateUIStatus_FR;
-
-waituntil {!isnil "cse_gui"};
-
-cse_displayEntries_Eat_FRM = {
- private ["_subMenus", "_passedMags", "_magazines"];
- _subMenus = [];
- _passedMags = [];
- _magazines = items player;
- {
- if (!((_x) in _passedMags)) then {
- _passedMags pushback _x;
- if ([(_x)] call cse_fnc_itemIsEatable_FR) then {
- _subMenus set [ count _subMenus,
- call compile format['[getText(configFile >> "CfgWeapons" >> "%1" >> "displayName"),getText(configFile >> "CfgWeapons" >> "%1" >> "picture"), {
- closeDialog 0;
- [player,"%1",10] spawn cse_fnc_actionEat_FR; CSE_SHOW_UI_ICONS_ONACTION_FR = true; [true] call cse_fnc_updateUIStatus_FR;
- }, true, "Eat " + getText(configFile >> "CfgWeapons" >> "%1" >> "displayName")]',(_x)]
- ];
- };
- };
- }foreach _magazines;
- [_subMenus] call cse_fnc_debug;
- [ _this select 3, _subMenus, _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true] call cse_fnc_openRadialSecondRing_GUI;
- CSE_SHOW_UI_ICONS_ONACTION_FR = true; [true] call cse_fnc_updateUIStatus_FR;
-};
-
-
-cse_displayEntries_Drink_FRM = {
- private ["_subMenus", "_passedMags", "_magazines"];
- _subMenus = [];
- _passedMags = [];
- _magazines = items player;
- {
- if (!(_x in _passedMags)) then {
- _passedMags pushback _x;
- if ([_x] call cse_fnc_itemIsDrinkable_FR) then {
- _subMenus set [ count _subMenus,
- call compile format['[getText(configFile >> "CfgWeapons" >> "%1" >> "displayName"),getText(configFile >> "CfgWeapons" >> "%1" >> "picture"), {
- closeDialog 0;
- [player,"%1", 4.5] spawn cse_fnc_actionDrink_FR; CSE_SHOW_UI_ICONS_ONACTION_FR = true; [true] call cse_fnc_updateUIStatus_FR;
- }, true, "Drink " + getText(configFile >> "CfgWeapons" >> "%1" >> "displayName")]',_x]
- ];
- };
- };
- }foreach _magazines;
- [ _this select 3, _subMenus, _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true] call cse_fnc_openRadialSecondRing_GUI;
- CSE_SHOW_UI_ICONS_ONACTION_FR = true;
- [true] call cse_fnc_updateUIStatus_FR;
-};
-
-cse_displayEntries_Refill_FRM = {
- private ["_subMenus", "_passedMags", "_magazines"];
- _subMenus = [];
- _passedMags = [];
- _magazines = items player;
- {
- if (!(_x in _passedMags)) then {
- _passedMags pushback _x;
- if ([_x] call cse_fnc_itemIsRefillable_FR) then {
- _subMenus set [ count _subMenus,
- call compile format['[getText(configFile >> "CfgWeapons" >> "%1" >> "displayName"),getText(configFile >> "CfgWeapons" >> "%1" >> "picture"), {
- closeDialog 0;
- [player,"%1",6] spawn cse_fnc_actionRefill_FR; CSE_SHOW_UI_ICONS_ONACTION_FR = true; [true] call cse_fnc_updateUIStatus_FR;
- }, true, "Refill " + getText(configFile >> "CfgWeapons" >> "%1" >> "displayName")]',_x]
- ];
- };
- };
- }foreach _magazines;
- [_subMenus] call cse_fnc_debug;
- [ _this select 3, _subMenus, _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true] call cse_fnc_openRadialSecondRing_GUI;
- CSE_SHOW_UI_ICONS_ONACTION_FR = true;
- [true] call cse_fnc_updateUIStatus_FR;
-};
-
-_entries = [
- ["Eat", {(([player] call cse_fnc_canEat_FR) && ([player] call cse_fnc_hasEatableItem_FR))}, CSE_ICON_PATH + "icon_survival.paa", cse_displayEntries_Eat_FRM, "Show consume options"],
- ["Drink", {(([player] call cse_fnc_canDrink_FR) && ([player] call cse_fnc_hasDrinkableItem_FR))}, "cse\cse_sys_field_rations\data\icons\icon_drinking.paa", cse_displayEntries_Drink_FRM, "Show drink options"],
- ["Refill", {(([player, _this select 1] call cse_fnc_canRefill_FR) && ([player] call cse_fnc_hasRefillableItem_FR))}, "cse\cse_sys_field_rations\data\hud_drinkstatus.paa", cse_displayEntries_Refill_FRM, "Show refill actions"],
- ["Camelbak", {(([player, _this select 1] call cse_fnc_canRefillCamelbak_FR) && ([player] call cse_fnc_hasCamelbak_FR))}, "cse\cse_sys_field_rations\data\hud_drinkstatus.paa", {[player,10] spawn cse_fnc_actionRefillCamelbak_FR;}, "Refill camelbak"]
- ];
-["ActionMenu","survival", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
-// This is here for backwards compatability. This code will be removed in the near future.
-_showError = false;
-{
- _configEntry = (configFile >> "CfgMagazines" >> _x);
- if([_configEntry, "cse_backwardsCompatMagazineBase_FR"] call cse_fnc_inheritsFrom) then {
- player removeMagazine _x;
- player addItem _x;
- diag_log format["WARNING: Outdated Field Rations magazine classname %1 found. Please replace magazine by item variant. Future versions will not support this anymore.", _x];
- _showError = true;
- };
-}foreach (magazines player);
-if (_showError) then {
- ["Outdated Field Rations Classnames have been found. Please replace magazine classname by item variant. Future versions will not support magazine variant"] call BIS_fnc_error;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/mre_human.p3d b/TO_MERGE/cse/sys_field_rations/mre_human.p3d
deleted file mode 100644
index e4830bdda6..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/mre_human.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/mre_type1.p3d b/TO_MERGE/cse/sys_field_rations/mre_type1.p3d
deleted file mode 100644
index 17c5cf815b..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/mre_type1.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/mre_type2.p3d b/TO_MERGE/cse/sys_field_rations/mre_type2.p3d
deleted file mode 100644
index b049bd2e10..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/mre_type2.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/mre_type3.p3d b/TO_MERGE/cse/sys_field_rations/mre_type3.p3d
deleted file mode 100644
index f8123720bd..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/mre_type3.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/mre_type4.p3d b/TO_MERGE/cse/sys_field_rations/mre_type4.p3d
deleted file mode 100644
index 96c835eb76..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/mre_type4.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/mre_type5.p3d b/TO_MERGE/cse/sys_field_rations/mre_type5.p3d
deleted file mode 100644
index 1c0419c8e6..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/mre_type5.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/mre_type6.p3d b/TO_MERGE/cse/sys_field_rations/mre_type6.p3d
deleted file mode 100644
index 7b0619b685..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/mre_type6.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/sounds/drinkingSound.ogg b/TO_MERGE/cse/sys_field_rations/sounds/drinkingSound.ogg
deleted file mode 100644
index 7e048ed4f0..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/sounds/drinkingSound.ogg and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/stringtable.xml b/TO_MERGE/cse/sys_field_rations/stringtable.xml
deleted file mode 100644
index 643a54ef7e..0000000000
--- a/TO_MERGE/cse/sys_field_rations/stringtable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_field_rations/uk_bottle.p3d b/TO_MERGE/cse/sys_field_rations/uk_bottle.p3d
deleted file mode 100644
index b561ebd6cc..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/uk_bottle.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_field_rations/waterbottle.p3d b/TO_MERGE/cse/sys_field_rations/waterbottle.p3d
deleted file mode 100644
index 55a3a92bbe..0000000000
Binary files a/TO_MERGE/cse/sys_field_rations/waterbottle.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_gestures/CfgAddons.h b/TO_MERGE/cse/sys_gestures/CfgAddons.h
deleted file mode 100644
index e802565741..0000000000
--- a/TO_MERGE/cse/sys_gestures/CfgAddons.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_gestures {
- list[] = {"cse_sys_gestures"};
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_gestures/CfgFunctions.h b/TO_MERGE/cse/sys_gestures/CfgFunctions.h
deleted file mode 100644
index 24b113642b..0000000000
--- a/TO_MERGE/cse/sys_gestures/CfgFunctions.h
+++ /dev/null
@@ -1,8 +0,0 @@
-class CfgFunctions {
- class CSE {
- class Gestures {
- file = "cse\cse_sys_gestures\functions";
- class playGesture { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_gestures/CfgVehicles.h b/TO_MERGE/cse/sys_gestures/CfgVehicles.h
deleted file mode 100644
index bf8da07323..0000000000
--- a/TO_MERGE/cse/sys_gestures/CfgVehicles.h
+++ /dev/null
@@ -1,29 +0,0 @@
-class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class cse_sys_gestures: Module_F {
- scope = 2;
- displayName = "Gestures [CSE]";
- icon = "\cse\cse_main\data\cse_groups_module.paa";
- category = "cseMisc";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- class allowAIControl {
- displayName = "Allow AI Control";
- description = "Allow Group leaders to issue basic orders through gestures";
- typeName = "BOOL";
- defaultValue = true;
- };
- };
- class ModuleDescription {
- description = "Enables the CSE Gesture actions.";
- sync[] = {};
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_gestures/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_gestures/Combat_Space_Enhancement.h
deleted file mode 100644
index 0de3163760..0000000000
--- a/TO_MERGE/cse/sys_gestures/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#define MENU_KEYBINDING 1
-#define ACTION_KEYBINDING 2
-#define CLIENT_SETTING 3
-
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_gestures {
- init = "call compile preprocessFile 'cse\cse_sys_gestures\init_sys_gestures.sqf';";
- name = "Gestures";
-
- /*class Configurations {
- class playGesture_Freeze {
- type = ACTION_KEYBINDING;
- title = $STR_CSE_GESTURE_FREEZE_TOOLTIP;
- description = $STR_CSE_GESTURE_FREEZE_TOOLTIP;
- value[] = {0,0,0,0};
- onPressed = "[player, 'gestureFreeze'] call cse_fnc_playGesture";
- };
-
- class playGesture_Follow {
- type = ACTION_KEYBINDING;
- title = $STR_CSE_GESTURE_FOLLOW_TOOLTIP;
- description = $STR_CSE_GESTURE_FOLLOW_TOOLTIP;
- value[] = {0,0,0,0};
- onPressed = "[player, 'gestureFollow'] call cse_fnc_playGesture";
- };
-
- class playGesture_CEASEFIRE {
- type = ACTION_KEYBINDING;
- title = $STR_CSE_GESTURE_CEASEFIRE_TOOLTIP;
- description = $STR_CSE_GESTURE_CEASEFIRE_TOOLTIP;
- value[] = {0,0,0,0};
- onPressed = "[player, 'gestureCeaseFire'] call cse_fnc_playGesture";
- };
-
- class playGesture_COVER {
- type = ACTION_KEYBINDING;
- title = $STR_CSE_GESTURE_COVER_TOOLTIP;
- description = $STR_CSE_GESTURE_COVER_TOOLTIP;
- value[] = {0,0,0,0};
- onPressed = "[player, 'gestureCover'] call cse_fnc_playGesture";
- };
-
- class playGesture_Go {
- type = ACTION_KEYBINDING;
- title = $STR_CSE_GESTURE_GO_TOOLTIP;
- description = $STR_CSE_GESTURE_GO_TOOLTIP;
- value[] = {0,0,0,0};
- onPressed = "[player, 'gestureGo'] call cse_fnc_playGesture";
- };
- class playGesture_Point {
- type = ACTION_KEYBINDING;
- title = $STR_CSE_GESTURE_POINT_TOOLTIP;
- description = $STR_CSE_GESTURE_POINT_TOOLTIP;
- value[] = {0,0,0,0};
- onPressed = "[player, 'gesturePoint'] call cse_fnc_playGesture";
- };
- };*/
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_gestures/config.cpp b/TO_MERGE/cse/sys_gestures/config.cpp
deleted file mode 100644
index 261dcff887..0000000000
--- a/TO_MERGE/cse/sys_gestures/config.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#define _ARMA_
-class CfgPatches {
- class cse_sys_gestures {
- units[] = {};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_f_eh","cse_main", "cse_gui"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-#include "CfgAddOns.h"
-#include "CfgFunctions.h"
-#include "CfgVehicles.h"
-#include "Combat_Space_Enhancement.h"
diff --git a/TO_MERGE/cse/sys_gestures/functions/fn_playGesture.sqf b/TO_MERGE/cse/sys_gestures/functions/fn_playGesture.sqf
deleted file mode 100644
index 8e3e53ca63..0000000000
--- a/TO_MERGE/cse/sys_gestures/functions/fn_playGesture.sqf
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * fn_playGesture.sqf
- * @Descr: Plays a gesture and executes orders for group AI, if setting has been enabled.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT (The unit that plays the gesture), gesture STRING (Classname of the gesture animation being played)]
- * @Return: void
- * @PublicAPI: true
- */
-
-
-private ["_unit", "_gesture", "_groupUnits"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-_gesture = [_this, 1, "", [""]] call BIS_fnc_Param;
-
-
-_unit playactionnow _gesture;
-_groupUnits = units group _unit;
-
-if (leader (group _unit) == _unit && CSE_SYS_GESTURES_ALLOW_AI_CONTROL) then {
- switch (_gesture) do {
- case ("gestureCeaseFire"): {
- };
- case ("gestureCover"): {
- };
- case ("gestureFreeze"): {
- {_x stop true;} count _groupUnits;
- };
- case ("gestureFollow"): {
- {_x dofollow _unit;} count _groupUnits;
- };
- case ("gestureGo"): {
- {_x stop false;} count _groupUnits;
- };
- case ("gesturePoint"): {
- };
- };
-};
-/*
-_unit setvariable ["cse_playGesture_GRP", _gesture, true];
-_handle = _this spawn {
- uisleep 3;
- if (((_this select 0) getvariable ["cse_playGesture_GRP", ""]) == (_this select 1)) then {
- (_this select 0) setvariable ["cse_playGesture_GRP", nil, true];
- };
-};
-*/
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_gestures/init_sys_gestures.sqf b/TO_MERGE/cse/sys_gestures/init_sys_gestures.sqf
deleted file mode 100644
index 7651e06b4f..0000000000
--- a/TO_MERGE/cse/sys_gestures/init_sys_gestures.sqf
+++ /dev/null
@@ -1,66 +0,0 @@
-
-private ["_args", "_entries"];
-_args = _this;
-CSE_SYS_GESTURES_ALLOW_AI_CONTROL = false;
-{
- if (_x select 0 == "allowAIControl") then {
- CSE_SYS_GESTURES_ALLOW_AI_CONTROL = (_x select 1);
- };
-}foreach _args;
-waituntil {!isnil "cse_gui"};
-
-cse_displayGestureActions_GroupMenu_GESTURES = {
- [ _this select 3,
- [
- [localize "STR_CSE_GESTURE_FREEZE_SHORT", "cse\cse_sys_gestures\data\icons\icon_hand.paa", {closeDialog 0; [player, "gestureFreeze"] call cse_fnc_playGesture}, true, localize "STR_CSE_GESTURE_FREEZE_TOOLTIP"],
- [localize "STR_CSE_GESTURE_FOLLOW_SHORT", "cse\cse_sys_gestures\data\icons\icon_hand.paa", {closeDialog 0; [player, "gestureFollow"] call cse_fnc_playGesture}, true, localize "STR_CSE_GESTURE_FOLLOW_TOOLTIP"],
- [localize "STR_CSE_GESTURE_CEASEFIRE_SHORT", "cse\cse_sys_gestures\data\icons\icon_hand.paa", {closeDialog 0; [player, "gestureCeaseFire"] call cse_fnc_playGesture}, true, localize "STR_CSE_GESTURE_CEASEFIRE_TOOLTIP"],
- [localize "STR_CSE_GESTURE_COVER_SHORT", "cse\cse_sys_gestures\data\icons\icon_hand.paa", {closeDialog 0; [player, "gestureCover"] call cse_fnc_playGesture}, true, localize "STR_CSE_GESTURE_COVER_TOOLTIP"],
- [localize "STR_CSE_GESTURE_GO_SHORT", "cse\cse_sys_gestures\data\icons\icon_hand.paa", {closeDialog 0; [player, "gestureGo"] call cse_fnc_playGesture}, true, localize "STR_CSE_GESTURE_GO_TOOLTIP"],
- [localize "STR_CSE_GESTURE_POINT_SHORT", "cse\cse_sys_gestures\data\icons\icon_hand.paa", {closeDialog 0; [player, "gesturePoint"] call cse_fnc_playGesture}, true, localize "STR_CSE_GESTURE_POINT_TOOLTIP"]
- ],
- _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true
- ] call cse_fnc_openRadialSecondRing_GUI;
-};
-
-_entries = [
- [localize "STR_CSE_GESTURE_GESTUREACTION_SHORT", {([player] call cse_fnc_canInteract)}, "cse\cse_sys_gestures\data\icons\icon_hand.paa", cse_displayGestureActions_GroupMenu_GESTURES, localize "STR_CSE_GESTURE_GESTUREACTION_TOOLTIP"]
-];
-
-["ActionMenu","group_actions", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
-_playCondition = {
- (((_this select 0) getvariable ["cse_playGesture_GRP", ""]) != "");
-};
-
-_playOnDraw = {
- _var = (_this select 0) getvariable ["cse_playGesture_GRP", ""];
-
- switch (_gesture) do {
- case ("gestureCeaseFire"): {
-
- };
- case ("gestureCover"): {
-
- };
- case ("gestureFreeze"): {
-
- };
- case ("gestureFollow"): {
-
- };
- case ("gestureGo"): {
-
- };
- case ("gesturePoint"): {
-
- };
- };
-
- ["cse\cse_sys_gestures\data\icons\icon_hand.paa", [1,1,1,1]];
-};
-
-if (["cse_sys_tags"] call cse_fnc_isModLoaded_f) then {
- [_playCondition, _playOnDraw, 1] call cse_fnc_registerIconSet_TAGS;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_gestures/stringtable.xml b/TO_MERGE/cse/sys_gestures/stringtable.xml
deleted file mode 100644
index 845eda59e8..0000000000
--- a/TO_MERGE/cse/sys_gestures/stringtable.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
- Freeze!
- Freeze!
- Halt!
- Stój!
- Alto¡
-
-
- Follow!
- Follow!
- Mitkommen!
- Za mną!
- Seguidme¡
-
-
- Cease Fire!
- Cease Fire!
- Feuer einstellen!
- Wstrzymać ogień!
- Alto el fuego¡
-
-
- Cover!
- Cover!
- In Deckung!
- Do osłon!
- A cobertura¡
-
-
- Go!
- Go!
- Los, Los, Los!
- Naprzód!
- Vamos¡
-
-
- Point!
- Point!
- Fingerzeig.
- Wskaż palcem!
- Señalar
-
-
- Play Gesture Freeze
- Play Gesture Freeze
- Halt! Geste ausführen
- Pokazuje gest Stój!
- Ejecutar gesto Alto¡
-
-
- Play Gesture Follow
- Play Gesture Follow
- Mitkommen! Geste ausführen
- Pokazuje gest Za mną!
- Ejecutar gesto Seguidme¡
-
-
- Play Gesture Cease Fire
- Play Gesture Cease Fire
- Feuer einstellen! Geste ausführen
- Pokazuje gest Wstrzymać ogień!
- Ejecutar gesto Alto el fuego¡
-
-
- Play Gesture Cover
- Play Gesture Cover
- In Deckung! Geste ausführen
- Pokazuje gest Do osłon!
- Ejecutar gesto A cobertura¡¡
-
-
- Play Gesture Go
- Play Gesture Go
- Los, Los, Los! Geste ausführen
- Pokazuje gest Naprzód!
- Ejecutar gesto Vamos¡
-
-
- Play Gesture Point
- Play Gesture Point
- Zeigt nach Vorne.
- Pokazuje gest Wskaż palcem!
- Ejecutar gesto Señalar¡
-
-
-
- Gestures
- Gestures
- Gesten
- Gesty
- Gestos
-
-
- Use Gesture
- Use Gesture
- Gesten ausführen
- Pokaż gest
- Usar Gestos
-
-
-
-
diff --git a/TO_MERGE/cse/sys_groups/CfgAddons.h b/TO_MERGE/cse/sys_groups/CfgAddons.h
deleted file mode 100644
index ecd27aa132..0000000000
--- a/TO_MERGE/cse/sys_groups/CfgAddons.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_groups {
- list[] = {"cse_sys_groups"};
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_groups/CfgFunctions.h b/TO_MERGE/cse/sys_groups/CfgFunctions.h
deleted file mode 100644
index df6e4cf65e..0000000000
--- a/TO_MERGE/cse/sys_groups/CfgFunctions.h
+++ /dev/null
@@ -1,15 +0,0 @@
-class CfgFunctions {
- class CSE {
- class Groups {
- file = "cse\cse_sys_groups\functions";
- class unitJoinGroup_GRP { recompile = 1; };
- class unitLeaveGroup_GRP { recompile = 1; };
- class unitsInGroupLeft_GRP { recompile = 1; };
- class unitCanJoinTargetGroup_GRP { recompile = 1; };
- class setGroupFormation_GRP { recompile = 1; };
- class setUnitGroupLeader_GRP { recompile = 1; };
- class canTapShoulder_GRP;
- class tapShoulder_GRP;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/CfgVehicles.h b/TO_MERGE/cse/sys_groups/CfgVehicles.h
deleted file mode 100644
index d4b5f957f2..0000000000
--- a/TO_MERGE/cse/sys_groups/CfgVehicles.h
+++ /dev/null
@@ -1,41 +0,0 @@
-class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class cse_sys_groups: Module_F {
- scope = 2;
- displayName = "Groups [CSE]";
- icon = "\cse\cse_main\data\cse_groups_module.paa";
- category = "cseModules";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- class allowGroupSwitch {
- displayName = "Group switch";
- description = "Allow players to join and leave groups";
- typeName = "BOOL";
- defaultValue = true;
- };
- class allowFormationSwitch {
- displayName = "Formation actions";
- description = "Group leaders can order formation changes through the action menu";
- typeName = "BOOL";
- defaultValue = true;
- };
- class allowShoulderTap {
- displayName = "Shoulder Tap";
- description = "Allow usage of shoulder taps";
- typeName = "BOOL";
- defaultValue = false;
- };
- };
- class ModuleDescription {
- description = "Provides players a serie of actions to join or leave their group, as well as formation changes";
- sync[] = {};
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_groups/Combat_Space_Enhancement.h
deleted file mode 100644
index 4b342b3cad..0000000000
--- a/TO_MERGE/cse/sys_groups/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#define MENU_KEYBINDING 1
-#define ACTION_KEYBINDING 2
-#define CLIENT_SETTING 3
-
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_groups {
- init = "call compile preprocessFile 'cse\cse_sys_groups\init_sys_groups.sqf';";
- name = "Groups";
-
- class Configurations {
- class actionTapShoulder_GRP {
- type = ACTION_KEYBINDING;
- title = $STR_CSE_SHOULDER_TAP_TITLE;
- description = $STR_CS_SHOULDER_TAP_DESC;
- value[] = {0,0,0,0};
- onPressed = "if ([player, cursorTarget] call cse_fnc_canTapShoulder_GRP) then {[player, cursorTarget] call cse_fnc_tapShoulder_GRP;};";
- };
- };
- };
- };
-
- class CustomEventHandlers {
- class shoulderTapped {}; // [_caller, _target]
- class groupJoined {}; // [_unit, _targetUnit]
- };
-};
diff --git a/TO_MERGE/cse/sys_groups/config.cpp b/TO_MERGE/cse/sys_groups/config.cpp
deleted file mode 100644
index 35c338f631..0000000000
--- a/TO_MERGE/cse/sys_groups/config.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#define _ARMA_
-class CfgPatches
-{
- class cse_sys_groups
- {
- units[] = {};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_f_eh","cse_main"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-#include "CfgAddOns.h"
-#include "CfgFunctions.h"
-#include "CfgVehicles.h"
-#include "Combat_Space_Enhancement.h"
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_column.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_column.paa
deleted file mode 100644
index e10bf80cd1..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_column.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_diamond.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_diamond.paa
deleted file mode 100644
index 2e897357a1..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_diamond.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_ech_l.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_ech_l.paa
deleted file mode 100644
index c2dea17c6c..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_ech_l.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_ech_r.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_ech_r.paa
deleted file mode 100644
index d968a7dbca..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_ech_r.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_group.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_group.paa
deleted file mode 100644
index 73108e5a98..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_group.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_line.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_line.paa
deleted file mode 100644
index 3f9c0f466e..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_line.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_stag_column.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_stag_column.paa
deleted file mode 100644
index cff3cb9b3e..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_stag_column.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_vee.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_vee.paa
deleted file mode 100644
index 16685ec314..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_vee.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/data/icons/icon_wedge.paa b/TO_MERGE/cse/sys_groups/data/icons/icon_wedge.paa
deleted file mode 100644
index aec606b22e..0000000000
Binary files a/TO_MERGE/cse/sys_groups/data/icons/icon_wedge.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_groups/functions/fn_canTapShoulder_GRP.sqf b/TO_MERGE/cse/sys_groups/functions/fn_canTapShoulder_GRP.sqf
deleted file mode 100644
index 2b819ef863..0000000000
--- a/TO_MERGE/cse/sys_groups/functions/fn_canTapShoulder_GRP.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * fn_canTapShoulder_GRP.sqf
- * @Descr: Check if caller can tap targets shoulder.
- * @Author: Glowbal
- *
- * @Arguments: [caller OBJECT, target OBJECT]
- * @Return: BOOL true if caller can tab target shoulder
- * @PublicAPI: true
- */
-
-
-private ["_caller", "_target"];
-_caller = _this select 0;
-_target = _this select 1;
-
-if (isnil "CSE_SYS_GROUPS_ALLOW_SHOULDER_TAPS_GRP") then {
- CSE_SYS_GROUPS_ALLOW_SHOULDER_TAPS_GRP = false;
-};
-if !(CSE_SYS_GROUPS_ALLOW_SHOULDER_TAPS_GRP) exitwith { false };
-
-(_target isKindOf "CAManBase" && {[_target] call cse_fnc_isAwake} && {[_caller] call cse_fnc_canInteract} && {_caller distance _target < 3} && {_caller != _target})
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/functions/fn_setGroupFormation_GRP.sqf b/TO_MERGE/cse/sys_groups/functions/fn_setGroupFormation_GRP.sqf
deleted file mode 100644
index 7ac9f37882..0000000000
--- a/TO_MERGE/cse/sys_groups/functions/fn_setGroupFormation_GRP.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * fn_setGroupFormation_GRP.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_formation", "_groupUnits"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-_formation = [_this, 1, "", [""]] call BIS_fnc_Param;
-
-
-if (([_unit] call cse_fnc_canInteract) && (formationLeader _unit == _unit)) then {
- (group _unit) setFormation _formation;
- [format["Setting formation of group %1 to %2",group _unit, _formation]] call cse_fnc_debug;
-} else {
- [format["cant set formation of group %1 to %2 because: %3 %4",group _unit, _formation, ([_unit] call cse_fnc_canInteract), (formationLeader _unit == _unit)]] call cse_fnc_debug;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/functions/fn_setUnitGroupLeader_GRP.sqf b/TO_MERGE/cse/sys_groups/functions/fn_setUnitGroupLeader_GRP.sqf
deleted file mode 100644
index 436bc6b5c9..0000000000
--- a/TO_MERGE/cse/sys_groups/functions/fn_setUnitGroupLeader_GRP.sqf
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * fn_setUnitGroupLeader_GRP.sqf
- * @Descr: Sets unit as the leader of units group.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: void
- * @PublicAPI: true
- */
-
-private ["_unit","_groupMembers"];
-_unit = _this select 0;
-if !(_unit isKindOf "CAManBase") exitwith {};
-
-_groupMembers = units group _unit;
-{
- if (_x != _unit) then {
- [_x] call cse_fnc_unitLeaveGroup_GRP;
- };
-}foreach _groupMembers;
-
-{
- if (_x != _unit) then {
- [_x, _unit] call cse_fnc_unitJoinGroup_GRP;
- };
-}foreach _groupMembers;
-
-true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/functions/fn_tapShoulder_GRP.sqf b/TO_MERGE/cse/sys_groups/functions/fn_tapShoulder_GRP.sqf
deleted file mode 100644
index 02a3a58bf6..0000000000
--- a/TO_MERGE/cse/sys_groups/functions/fn_tapShoulder_GRP.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_tapShoulder_GRP.sqf
- * @Descr: Tap units shoulder.
- * @Author: Glowbal
- *
- * @Arguments: [caller OBJECT, target OBJECT (Unit that will be tapped)]
- * @Return: void
- * @PublicAPI: true
- */
-
-private ["_caller", "_target"];
-_caller = _this select 0;
-_target = _this select 1;
-
-// If the target isn't local, we need to execute this function on the targets locality.
-if (!local _target) exitwith {
- [[_caller, _target], "cse_fnc_tapShoulder_GRP", _target] call BIS_fnc_MP;
-};
-[[_caller, _target],"shoulderTapped"] call cse_fnc_customEventHandler_F;
-
-// No need to execute this for non player units. We exit here for non player units, because we do want to execute the custom eventhandler.
-if (!isPlayer _target) exitwith {};
-
-// Display information for player to indicate that players should was tapped.
-// This is done through a camShake and a display Message on the screen.
-addCamShake [4, 0.5, 4];
-[_target,localize "STR_CS_SHOULDER_TAP_GRP",format[localize "STR_CSE_SHOULDER_TAPPED_GRP", [_caller] call cse_fnc_getName]] call cse_fnc_sendDisplayMessageTo;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/functions/fn_unitCanJoinTargetGroup_GRP.sqf b/TO_MERGE/cse/sys_groups/functions/fn_unitCanJoinTargetGroup_GRP.sqf
deleted file mode 100644
index 133da4f797..0000000000
--- a/TO_MERGE/cse/sys_groups/functions/fn_unitCanJoinTargetGroup_GRP.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_unitCanJoinTargetGroup_GRP.sqf
- * @Descr: Check if a unit can join the target group
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, target OBJECT]
- * @Return: BOOL True if unit can join the targets group
- * @PublicAPI: true
- */
-
-private ["_unit", "_targetUnit", "_currentGroup", "_targetGroup", "_return"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-_targetUnit = [_this, 1, objNull, [objNull]] call BIS_fnc_Param;
-
-_return = false;
-if (_unit != _targetUnit) then {
- if (_unit iskindof "CaManBase" && (_targetUnit isKindOf "CAManBase")) then {
- if (side _unit == side _targetUnit) then {
- _currentGroup = group _unit;
- _targetGroup = group _targetUnit;
- if (_currentGroup != _targetGroup) then {
- _return = true
- };
- };
- };
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/functions/fn_unitJoinGroup_GRP.sqf b/TO_MERGE/cse/sys_groups/functions/fn_unitJoinGroup_GRP.sqf
deleted file mode 100644
index 9e34fdd808..0000000000
--- a/TO_MERGE/cse/sys_groups/functions/fn_unitJoinGroup_GRP.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_unitJoinGroup_GRP.sqf
- * @Descr: unit joins target group and removes old group if no members are left.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, target OBJECT]
- * @Return: void
- * @PublicAPI: true
- */
-
-private ["_unit", "_targetUnit", "_currentGroup", "_targetGroup"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-_targetUnit = [_this, 1, objNull, [objNull]] call BIS_fnc_Param;
-
-if ([_unit, _targetUnit] call cse_fnc_unitCanJoinTargetGroup_GRP) then {
- _currentGroup = group _unit;
- _targetGroup = group _targetUnit;
-
- if (_currentGroup != _targetGroup) then {
- [_unit] joinSilent _targetGroup;
- if (count (units _currentGroup) == 0) then {
- deleteGroup _currentGroup;
- };
-
- [[_unit, _targetUnit],"groupJoined"] call cse_fnc_customEventHandler_F;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/functions/fn_unitLeaveGroup_GRP.sqf b/TO_MERGE/cse/sys_groups/functions/fn_unitLeaveGroup_GRP.sqf
deleted file mode 100644
index 71bc13cdf1..0000000000
--- a/TO_MERGE/cse/sys_groups/functions/fn_unitLeaveGroup_GRP.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * fn_unitLeaveGroup_GRP.sqf
- * @Descr: unit leaves current group and joins an empty group.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: void
- * @PublicAPI: true
- */
-
-private ["_unit", "_currentGroup", "_newgroup"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-if (_unit iskindof "CaManBase" && [_unit] call cse_fnc_canInteract) then {
- _currentGroup = group _unit;
- _newgroup = createGroup (side _unit);
- [_unit] joinSilent _newgroup;
-
- if (count (units _currentGroup) == 0) then {
- deleteGroup _currentGroup;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/functions/fn_unitsInGroupLeft_GRP.sqf b/TO_MERGE/cse/sys_groups/functions/fn_unitsInGroupLeft_GRP.sqf
deleted file mode 100644
index c8553495c4..0000000000
--- a/TO_MERGE/cse/sys_groups/functions/fn_unitsInGroupLeft_GRP.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * fn_unitsInGroupLeft_GRP.sqf
- * @Descr: Check if the group has more as one member
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL Returns true if group of unit contains more units as 1
- * @PublicAPI: true
- */
-
-private ["_unit", "_currentGroup", "_newgroup"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-if (_unit iskindof "CaManBase") then {
- (count (units (group _unit)) > 1)
-} else {
- false;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/init_sys_groups.sqf b/TO_MERGE/cse/sys_groups/init_sys_groups.sqf
deleted file mode 100644
index 201d9867b8..0000000000
--- a/TO_MERGE/cse/sys_groups/init_sys_groups.sqf
+++ /dev/null
@@ -1,80 +0,0 @@
-
-private ["_args", "_entries"];
-_args = _this;
-if (!hasInterface) exitwith {};
-CSE_SYS_GROUPS_ALLOW_GROUPSWITCH_GRP = false;
-CSE_SYS_GROUPS_ALLOW_FORMATIONSWITCH_GRP = false;
-CSE_SYS_GROUPS_ALLOW_SHOULDER_TAPS_GRP = false;
-
-{
- if (_x select 0 == "allowGroupSwitch") then {
- CSE_SYS_GROUPS_ALLOW_GROUPSWITCH_GRP = (_x select 1);
- };
- if (_x select 0 == "allowFormationSwitch") then {
- CSE_SYS_GROUPS_ALLOW_FORMATIONSWITCH_GRP = (_x select 1);
- };
- if (_x select 0 == "allowShoulderTap") then {
- CSE_SYS_GROUPS_ALLOW_SHOULDER_TAPS_GRP = (_x select 1);
- };
-}foreach _args;
-waituntil {!isnil "cse_gui"};
-
-if (CSE_SYS_GROUPS_ALLOW_GROUPSWITCH_GRP) then {
- _entries = [
- [localize "STR_CSE_GROUP_LEAVEGRP_SHORT", {([player] call cse_fnc_unitsInGroupLeft_GRP)}, "cse\cse_sys_groups\data\icons\icon_group.paa", {closeDialog 0; [player] call cse_fnc_unitLeaveGroup_GRP}, localize "STR_CSE_GROUP_LEAVEGRP_TOOLTIP"],
-
- [localize "STR_CSE_GROUP_REQUESTJOINGRP_SHORT", {(([_this select 0, _this select 1] call cse_fnc_unitCanJoinTargetGroup_GRP))}, "cse\cse_sys_groups\data\icons\icon_group.paa", {
- closeDialog 0;
- [player, _this select 1, "cse_sys_Groups_requestJoinGrp", "STR_CSE_GROUP_REQUESTJOINGRP_MESSAGE", "if !(_this select 2) exitwith {}; [player, _this select 1] call cse_fnc_unitJoinGroup_GRP;"] call cse_fnc_sendRequest_f;
- }, localize "STR_CSE_GROUP_REQUESTJOINGRP_TOOLTIP"]
- ];
- ["ActionMenu","group_actions", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
-
-if (CSE_SYS_GROUPS_ALLOW_GROUPSWITCH_GRP) then {
- cse_displaygroupActions_switchFormationMenu_GRP = {
- [ _this select 3,
- [
- [localize "STR_CSE_GROUP_FORM_COLUMN_SHORT", "cse\cse_sys_groups\data\icons\icon_column.paa", {closeDialog 0; [player, "COLUMN"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_COLUMN_TOOLTIP"],
- [localize "STR_CSE_GROUP_FORM_STAG_SHORT","cse\cse_sys_groups\data\icons\icon_stag_column.paa", {closeDialog 0; [player, "STAG COLUMN"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_STAG_TOOLTIP"],
- [localize "STR_CSE_GROUP_FORM_WEDGE_SHORT", "cse\cse_sys_groups\data\icons\icon_wedge.paa", {closeDialog 0; [player, "WEDGE"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_WEDGE_TOOLTIP"],
- [localize "STR_CSE_GROUP_FORM_ECHL_SHORT", "cse\cse_sys_groups\data\icons\icon_ech_l.paa", {closeDialog 0; [player, "ECH LEFT"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_ECHL_TOOLTIP"],
- [localize "STR_CSE_GROUP_FORM_ECHR_SHORT", "cse\cse_sys_groups\data\icons\icon_ech_r.paa", {closeDialog 0; [player, "ECH RIGHT"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_ECHR_TOOLTIP"],
- [localize "STR_CSE_GROUP_FORM_VEE_SHORT", "cse\cse_sys_groups\data\icons\icon_vee.paa", {closeDialog 0; [player, "VEE"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_VEE_TOOLTIP"],
- [localize "STR_CSE_GROUP_FORM_LINE_SHORT", "cse\cse_sys_groups\data\icons\icon_line.paa", {closeDialog 0; [player, "LINE"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_LINE_TOOLTIP"],
- [localize "STR_CSE_GROUP_FORM_FILE_SHORT", "cse\cse_sys_groups\data\icons\icon_column.paa", {closeDialog 0; [player, "FILE"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_FILE_TOOLTIP"],
- [localize "STR_CSE_GROUP_FORM_DIAMOND_SHORT", "cse\cse_sys_groups\data\icons\icon_diamond.paa", {closeDialog 0; [player, "DIAMOND"] call CSE_fnc_setGroupFormation_GRP}, true, localize "STR_CSE_GROUP_FORM_DIAMOND_TOOLTIP"]
- ],
- _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true
- ] call cse_fnc_openRadialSecondRing_GUI;
- };
-
- _entries = [
- [localize "STR_CSE_GROUP_SWITCHFORMATION_SHORT", {(([player] call cse_fnc_canInteract) && (formationLeader player == player))}, "cse\cse_sys_groups\data\icons\icon_group.paa", cse_displaygroupActions_switchFormationMenu_GRP, localize "STR_CSE_GROUP_SWITCHFORMATION_TOOLTIP"]
- ];
-
- ["ActionMenu","group_actions", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
- _requestGroupLeader = {
- closeDialog 0;
- [player, leader (group player), "cse_sys_Groups_requestLeader", "STR_CSE_GROUP_REQUESTLEADER_MESSAGE", "if !(_this select 2) exitwith {};
- [player] call cse_fnc_setUnitGroupLeader_GRP;
- "] call cse_fnc_sendRequest_f;
- };
-
- _entries = [
- [localize "STR_CSE_GROUP_REQUESTLEADER_SHORT", {(([player] call cse_fnc_canInteract) && (leader (group player) != player))}, "cse\cse_sys_groups\data\icons\icon_group.paa", _requestGroupLeader, localize "STR_CSE_GROUP_REQUESTLEADER_TOOLTIP"]
- ];
-
- ["ActionMenu","group_actions", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
-
-if (CSE_SYS_GROUPS_ALLOW_SHOULDER_TAPS_GRP) then {
-
- _entries = [
- [localize "STR_CSE_SHOULDER_TAP_TITLE", {(([player, _this select 1] call cse_fnc_canTapShoulder_GRP) && (isPlayer (_this select 1)))}, CSE_ICON_PATH + "icon_interact.paa", {closeDialog 0; [player, _this select 1] call cse_fnc_tapShoulder_GRP;}, localize "STR_CSE_SHOULDER_TAP_TITLE"]
- ];
-
- ["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_groups/stringtable.xml b/TO_MERGE/cse/sys_groups/stringtable.xml
deleted file mode 100644
index cc4bc03ee8..0000000000
--- a/TO_MERGE/cse/sys_groups/stringtable.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-
-
-
-
-
- Column
- Column
- Kolonne
- Kolumna
- Columna
-
-
- Stag Column
- Stag Column
- Gest.Kolonne
- Kolumna rozpr.
- Columna Esc.
-
-
-
- Wedge
- Wedge
- Keil
- Klin
- Cuña
-
-
-
- Echelon L
- Echelon L
- Staffel L
- Eszelon L
- Escalón Izq.
-
-
-
- Echelon R
- Echelon R
- Staffel R
- Eszelon P
- Escalon Der.
-
-
-
- Vee
- Vee
- V-Form.
- Formacja V
- Formación V
-
-
-
- Line
- Line
- Linie
- Tyraliera
- Línea
-
-
-
- File
- File
- Komp.Kolonne
- Plik
- Hilera
-
-
- Diamond
- Diamond
- Raute
- Diament
- Diamante
-
-
-
- Column
- Column
- Kolonnenformation
- Formacja kolumna/Polish>
- Columna
-
-
- Staggered Column
- Staggered Column
- Gestaffelte Kolonne
- Formacja rozproszona kolumna
- Columna Escalonada
-
-
-
- Wedge formation
- Wedge formation
- Keilformation
- Formacja klin
- Formación Cuña
-
-
-
- Echelon Left
- Echelon Left
- Staffel Links
- Formacja eszelon lewy
- Escalón Izquierda
-
-
-
- Echelon Right
- Echelon Right
- Staffel Rechts
- Formacja eszelon prawy
- Escalón Derecha
-
-
-
- Vee formation
- Vee formation
- V-Formation
- Formacja w kształcie litery 'V'
- Formación V
-
-
-
- Line formation
- Line formation
- Linienformation
- Formacja linia
- Formación Línea
-
-
-
- File formation
- File formation
- Kompakte Kolonnenformation
- Formacja kompaktowa kolumna
- Formación Hilera
-
-
- Diamond formation
- Diamond formation
- Rautenformation
- Formacja obrona okrężna
- Formación Diamante
-
-
-
-
- Formations
- Formations
- Formationen
- Formacje
- Formaciones
-
-
- Order Formation
- Order Formation
- Formationsbefehl
- Zmień formację
- Ordenar Formaciones
-
-
-
-
-
- Lead Group
- Lead Group
- Gruppe anführen
- Przejmij dowodzenie
- Grupo de cabeza
-
-
- Request group leader to take over group leader
- Request group leader to take over group leader
- Gruppenführerschaft anfordern
- Poproś aktualnego dowódcę o przejęcie roli dowodzenia
- Requerir un lider para que tome el control del grupo
-
-
- %1 requests to be leader of this group
- %1 requests to be leader of this group
- %1 bittet um Gruppenführerschaft
- %1 prosi o przejęcie dowodzenia nad tą grupą
- %1 pide liderazgo de grupo
-
-
-
-
-
- Your shoulder was tapped!
- Your shoulder was tapped!
- Jemand hat dich angestupst!
- Zostałeś klepnięty w ramię!
- Te han tocado el hombro¡
-
-
- Shoulder Tap
- Shoulder Tap
- Schultergriff
- Klepnij w ramię
- Toque en el hombro
-
-
-
-
-
- Shoulder Tap
- Shoulder Tap
- Schultergriff
- Klepanie w ramię
- Toque en el hombro
-
-
- When pressed, you tap the shoulder of the unit in front of you. This depends on the Shoulder Tap settings from the Groups Module.
- When pressed, you tap the shoulder of the unit in front of you. This depends on the Shoulder Tap settings from the Groups Module.
- Stupst die Einheit vor dir an der Schulter an. Dies hängt von den Schulter-Check Einstellungen im Gruppenmodul ab.
- Przy użyciu klepniesz w ramię osobę przed tobą. Ta opcja zależna jest od ustawień klepania w ramię w module grupy.
- Cuando se selecciona, tocas el hombro de la unidad que tengas en frente. Depende de la configuración del Módulo Grupos.
-
-
-
-
-
- Join Group
- Dołącz do grupy
- Unirse al Grupo
-
-
- Join target Group
- Dołączasz do wybranej grupy
- Unirse al Grupo
-
-
- %1 requests to join your group
- %1 pragnie dołączyć do twojej grupy
- %1 pide unirse a su grupo
-
-
-
-
- Leave Group
- Opuść grupę
- Salir del Grupo
-
-
- Leave Current Group
- Opuszczasz aktualną grupę
- Salir del Grupo
-
-
-
-
-
diff --git a/TO_MERGE/cse/sys_ieds/CfgAddons.h b/TO_MERGE/cse/sys_ieds/CfgAddons.h
deleted file mode 100644
index 8a11ab5c62..0000000000
--- a/TO_MERGE/cse/sys_ieds/CfgAddons.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_ieds {
- list[] = {"cse_sys_ieds"};
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_ieds/CfgFunctions.h b/TO_MERGE/cse/sys_ieds/CfgFunctions.h
deleted file mode 100644
index b6c117dbfb..0000000000
--- a/TO_MERGE/cse/sys_ieds/CfgFunctions.h
+++ /dev/null
@@ -1,24 +0,0 @@
-class CfgFunctions {
- class CSE {
- class IEDS {
- file = "cse\cse_sys_ieds\functions";
- class module_spawnIED { recompile = 1; };
- class createIEDObject_IEDS { recompile = 1; };
- class checkIEDActivated_IEDS { recompile = 1; };
- class checkPressurePlateActivated_IEDS { recompile = 1; };
- class checkRadioTriggered_IEDS { recompile = 1; };
- class monitorIEDS_IEDS { recompile = 1; };
- class onIEDActivated_IEDS { recompile = 1; };
- class thor3_detection_IEDS { recompile = 1; };
- class playThorIIISound_IEDS { recompile = 1; };
- class triggerManGotVisual_IEDS { recompile = 1; };
- class moduleTriggerMan_IEDS { recompile = 1; };
- class placeDownIED_IEDS { recompile = 1; };
- class monitorPlayerIEDs_IEDS { recompile = 1; };
-
- class onCellPhoneOpened_IEDS { recompile = 1; };
- class cellphone_detonateIED_IEDS { recompile = 1; };
- class checkIfJammed_IEDS { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/CfgSounds.h b/TO_MERGE/cse/sys_ieds/CfgSounds.h
deleted file mode 100644
index 46e89a6090..0000000000
--- a/TO_MERGE/cse/sys_ieds/CfgSounds.h
+++ /dev/null
@@ -1,9 +0,0 @@
-class CfgSounds
-{
- class cse_thor3_beep1
- {
- name = "cse_thor3_beep1";
- sound[] = {"cse\cse_sys_ieds\sounds\beeps\03_Dull_Short_Mid.wav","db-1",1};
- titles[] = {};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/CfgVehicles.h b/TO_MERGE/cse/sys_ieds/CfgVehicles.h
deleted file mode 100644
index 2355fd40e3..0000000000
--- a/TO_MERGE/cse/sys_ieds/CfgVehicles.h
+++ /dev/null
@@ -1,203 +0,0 @@
-class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
-
-
- class cse_playerSpawnedIED: Logic {
- displayName = "Player placed IED";
- };
-
- class cseModule_spawnIEDs: Module_F {
- scope = 2;
- displayName = "Create IED [CSE]";
- icon = "\cse\cse_main\data\cse_explosive_module.paa";
- category = "cseMisc";
- function = "cse_fnc_module_spawnIED";
- functionPriority = 1;
- isGlobal = 0;
- isTriggerActivated = 0;
- class Arguments {
- class typeOfIED {
- displayName = "Type";
- description = "The Type of the IED";
- typeName = "NUMBER";
- class values {
- class land {name="Normal"; value=0; default=1; };
- class urban {name="Urban"; value=1; };
- };
- };
-
- class sizeOfIED {
- displayName = "Size";
- description = "The size of the IED";
- typeName = "NUMBER";
- class values {
- class small {name="Small"; value=1; default=1; };
- class large {name="Large"; value=0; };
- };
- };
-
- class heightOfIED {
- displayName = "Height";
- description = "The height that the IED is burried";
- typeName = "NUMBER";
- class values {
- class Above {name="Above Ground"; value=0; default=1; };
- class slightly {name="Slightly burried"; value=-0.015; };
- class medium {name="Medium burried"; value=-0.025; };
- class almost {name="Almost burried"; value=-0.05; };
- class fully {name="Fully burried"; value=-0.1; };
- };
- };
-
- class iedActivationType {
- displayName = "Activation Type";
- description = "How is the IED activated";
- typeName = "NUMBER";
- class values {
- class None {name="None"; value=-1; };
- class PressurePlate {name="Pressure Plate"; value=0; default=1;};
- class Radio {name="Radio"; value=1; };
- };
- };
-
- class activatedForTargets {
- displayName = "Activated for";
- description = "What types is the IED activated for";
- typeName = "NUMBER";
- class values {
- class None {name="None"; value=-1; };
- class All {name="Any type"; value=0; default=1;};
- class Vehicles {name="Any Vehicle"; value=1; };
- class Land {name="Ground Vehicles"; value=2; };
- class Air {name="Airial Vehicles"; value=3; };
- class Man {name="Man"; value=4; };
- };
- };
-
- class activatedForSides {
- displayName = "What sides activate this IED";
- description = "What types is the IED activated for";
- typeName = "NUMBER";
- class values {
- class None {name="None"; value=-1; };
- class All {name="Any side"; value=0; default=1; };
- class West {name="BLUFOR"; value=1; };
- class East {name="OpFOR"; value=2; };
- class Ind {name="Independant"; value=3; };
- class Civ {name="Civilian"; value=4; };
- };
- };
- };
-
- class ModuleDescription {
- description = "Create an IED on position."; // Short description, will be formatted as structured text
- sync[] = {"cseModule_spawnIEDs"};
- position = 1; // Position is taken into effect
- direction = 0; // Direction is taken into effect
- optional = 0; // Synced entity is optional
- duplicate = 1; // Multiple entities of this type can be synced
-
- class cseModule_spawnIEDs {
- description[] = { // Multi-line descriptions are supported
- "Synchronize ieds with other IEDs to create chain ieds.",
- "When one of the synchronized ieds is triggered,",
- "all other IEDs will explode as well."
- };
- position = 1; // Position is taken into effect
- direction = 0; // Direction is taken into effect
- optional = 1; // Synced entity is optional
- duplicate = 1; // Multiple entities of this type can be synced
- synced[] = {"cseModule_spawnIEDs"}; // Pre-define entities like "AnyBrain" can be used. See the list below
- };
-
- };
- };
- class cseModule_triggerManLinkIEDS: Module_F {
- scope = 2;
- displayName = "Triggerman [CSE]";
- icon = "\cse\cse_main\data\cse_explosive_module.paa";
- category = "cseMisc";
- function = "cse_fnc_moduleTriggerMan_IEDS";
- functionPriority = 1;
- isGlobal = 0;
- isTriggerActivated = 0;
- class Arguments {
- class EnableList {
- displayName = "List";
- description = "List of unit names that will be able to trigger the radio IED.";
- defaultValue = "";
- };
- };
-
- class ModuleDescription {
- description = "Defines units as triggerman."; // Short description, will be formatted as structured text
- sync[] = {"cseModule_spawnIEDs"};
- position = 0; // Position is taken into effect
- direction = 0; // Direction is taken into effect
- optional = 0; // Synced entity is optional
- duplicate = 1; // Multiple entities of this type can be synced
-
- class cseModule_spawnIEDs {
- description[] = { // Multi-line descriptions are supported
- "Synchronize module with IEDs to define.",
- "which ieds can be triggered by units listed in module,"
- };
- position = 0; // Position is taken into effect
- direction = 0; // Direction is taken into effect
- optional = 0; // Synced entity is optional
- duplicate = 1; // Multiple entities of this type can be synced
- synced[] = {"cseModule_spawnIEDs"}; // Pre-define entities like "AnyBrain" can be used. See the list below
- };
- };
- };
-
- class B_Kitbag_sgg;
- class cse_thorIII_backpack: B_Kitbag_sgg {
- scope = 1;
- author = "Combat Space Enhancement";
- displayName = "THOR III - Jammer";
- };
-
-
- // class Items_base_F;
- // class cse_ied_pressureplate_small: Items_base_F {
- // scope = 2;
- // author = "Combat Space Enhancement";
- // displayName = "Pressure Plate IED (Small)";
- // picture = "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
- // descriptionShort = "Pressure Plate IED (Small)";
- // descriptionUse = "Pressure Plate IED (Small)";
- // model = "\A3\Weapons_F\Explosives\IED_land_small";
- // };
- // class cse_ied_pressureplate_large: cse_ied_pressureplate_small {
- // scope = 2;
- // author = "Combat Space Enhancement";
- // displayName = "Pressure Plate IED (Large)";
- // picture = "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
- // descriptionShort = "Pressure Plate IED (Large)";
- // descriptionUse = "Pressure Plate IED (Large)";
- // model = "\A3\Weapons_F\Explosives\IED_land_big";
- // };
- // class cse_ied_radio_small: cse_ied_pressureplate_small {
- // scope = 2;
- // author = "Combat Space Enhancement";
- // displayName = "Radio Triggered IED (Small)";
- // picture = "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
- // descriptionShort = "Radio Triggered IED (Small)";
- // descriptionUse = "Radio Triggered IED (Small)";
- // model = "\A3\Weapons_F\Explosives\IED_land_small";
- // };
- // class cse_ied_radio_large: cse_ied_radio_small {
- // scope = 2;
- // author = "Combat Space Enhancement";
- // displayName = "Radio Triggered IED (Large)";
- // picture = "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
- // descriptionShort = "Radio Triggered IED (Large)";
- // descriptionUse = "Radio Triggered IED (Large)";
- // model = "\A3\Weapons_F\Explosives\IED_land_big";
- // };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/CfgWeapons.h b/TO_MERGE/cse/sys_ieds/CfgWeapons.h
deleted file mode 100644
index f5f8ab8adc..0000000000
--- a/TO_MERGE/cse/sys_ieds/CfgWeapons.h
+++ /dev/null
@@ -1,133 +0,0 @@
-class CfgWeapons {
- class ItemCore;
- class InventoryItem_Base_F;
- class cse_ied_wires: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Wires (IED Material)";
- picture = "\cse_sys_ballistics\basicBallistics\data\weatherMeter.paa";
- descriptionShort = "Necessary material for creating an IED";
- descriptionUse = "Used to connect the detonation device with the explosive";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
- class cse_ied_explosive: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Explosive Material (IED Material)";
- picture = "\cse_sys_ballistics\basicBallistics\data\weatherMeter.paa";
- descriptionShort = "Provides the boom.";
- descriptionUse = "Makes the IED.";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
- class cse_ied_detonator: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Detonator (IED Material)";
- picture = "\cse_sys_ballistics\basicBallistics\data\weatherMeter.paa";
- descriptionShort = "Used to detonate the explosive.";
- descriptionUse = "Ensures the explosives goes off when activated.";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
- class cse_ied_pressure_plate: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Pressure Plate (IED Material)";
- picture = "\cse_sys_ballistics\basicBallistics\data\weatherMeter.paa";
- descriptionShort = "Pressure plate for creating IEDs";
- descriptionUse = "Pressure plate for creating IEDs";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
- class cse_ied_reciever: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Reciever (IED Material)";
- picture = "\cse_sys_ballistics\basicBallistics\data\weatherMeter.paa";
- descriptionShort = "Radio Reciever for creating Radio activated IEDs";
- descriptionUse = "Radio Reciever for creating Radio activated IEDs";
- model = "\A3\weapons_F\ammo\mag_univ.p3d";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
-
-
- class cse_ied_pressureplate_small: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Pressure Plate IED (Small)";
- picture = "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
- descriptionShort = "Pressure Plate IED (Small)";
- descriptionUse = "Pressure Plate IED (Small)";
- model = "\A3\Weapons_F\Explosives\IED_land_small";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
- class cse_ied_pressureplate_large: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Pressure Plate IED (Large)";
- picture = "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
- descriptionShort = "Pressure Plate IED (Large)";
- descriptionUse = "Pressure Plate IED (Large)";
- model = "\A3\Weapons_F\Explosives\IED_land_big";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
- class cse_ied_radio_small: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Radio Triggered IED (Small)";
- picture = "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
- descriptionShort = "Radio Triggered IED (Small)";
- descriptionUse = "Radio Triggered IED (Small)";
- model = "\A3\Weapons_F\Explosives\IED_land_small";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
- class cse_ied_radio_large: ItemCore {
- author = "Combat Space Enhancement";
- scope = 2;
- displayName = "Radio Triggered IED (Large)";
- picture = "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
- descriptionShort = "Radio Triggered IED (Large)";
- descriptionUse = "Radio Triggered IED (Large)";
- model = "\A3\Weapons_F\Explosives\IED_land_big";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=10;
- type=201;
- };
- };
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_ieds/Combat_Space_Enhancement.h
deleted file mode 100644
index 1056858eaa..0000000000
--- a/TO_MERGE/cse/sys_ieds/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,8 +0,0 @@
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_ieds {
- init = "call compile preprocessFile 'cse\cse_sys_ieds\init_sys_ieds.sqf';";
- name = "IEDs";
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_ieds/GUI.h b/TO_MERGE/cse/sys_ieds/GUI.h
deleted file mode 100644
index ccb85e5924..0000000000
--- a/TO_MERGE/cse/sys_ieds/GUI.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "ui\define.hpp"
-#include "ui\cellphone.hpp"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/config.cpp b/TO_MERGE/cse/sys_ieds/config.cpp
deleted file mode 100644
index ed79dc9966..0000000000
--- a/TO_MERGE/cse/sys_ieds/config.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#define _ARMA_
-class CfgPatches
-{
- class cse_sys_ieds
- {
- units[] = {"cse_thorIII_backpack" /*, "cse_ied_pressureplate_small", "cse_ied_pressureplate_large", "cse_ied_radio_small", "cse_ied_radio_large"*/};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_f_eh","cse_main"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-#include "CfgFunctions.h"
-#include "CfgVehicles.h"
-#include "CfgWeapons.h"
-#include "CfgSounds.h"
-#include "Combat_Space_Enhancement.h"
-#include "CfgAddOns.h"
-#include "GUI.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/data/cellphone_background.paa b/TO_MERGE/cse/sys_ieds/data/cellphone_background.paa
deleted file mode 100644
index 0570c7d228..0000000000
Binary files a/TO_MERGE/cse/sys_ieds/data/cellphone_background.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ieds/data/icon_cellphone.paa b/TO_MERGE/cse/sys_ieds/data/icon_cellphone.paa
deleted file mode 100644
index 01ec6c683a..0000000000
Binary files a/TO_MERGE/cse/sys_ieds/data/icon_cellphone.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ieds/functions.sqf b/TO_MERGE/cse/sys_ieds/functions.sqf
deleted file mode 100644
index 0ede0250b9..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-
-cse_fnc_spawn_ieds_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_spawn_ieds.sqf";
-cse_fnc_spawn_chain_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_spawn_chain.sqf";
-cse_fnc_link_chain_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_link_chain.sqf";
-cse_fnc_thor3_detection_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_thor3_detection.sqf";
-cse_fnc_triggerManGotVisual_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_triggerManGotVisual.sqf";
-
-
-cse_fnc_checkIEDActivated_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_checkIEDActivated.sqf";
-cse_fnc_checkPressurePlateActivated_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_checkPressurePlateActivated.sqf";
-cse_fnc_checkRadioTriggered_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_checkRadioTriggered.sqf";
-
-
-
-cse_fnc_spotterFlee_IED = compile preprocessFile "cse\cse_sys_ieds\spotter\fnc_spotterFlee.sqf";
-cse_fnc_spotterBehaviour_IED = compile preprocessFile "cse\cse_sys_ieds\spotter\fnc_spotterBehaviour.sqf";
-
-
-cse_fnc_searchGround_IED = compile preprocessFile "cse\cse_sys_ieds\fnc_searchGround.sqf";
-
-cse_fnc_broadcastTHOR3Sound = {
- (_this select 0) say3D "beep";
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_cellphone_detonateIED_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_cellphone_detonateIED_IEDS.sqf
deleted file mode 100644
index 98a322443f..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_cellphone_detonateIED_IEDS.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * fn_cellphone_detonateIED_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_display", "_iedInfo"];
-_display = uiNamespace getVariable 'cse_ied_cellphone';
-
-
-if (isnil "CSE_PLAYER_PLACED_RADIO_IEDS_IEDS") then {
- CSE_PLAYER_PLACED_RADIO_IEDS_IEDS = [];
-};
-
-if (isnil "CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS") then {
- CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = 0;
-};
-
-
-if (CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS > count CSE_PLAYER_PLACED_RADIO_IEDS_IEDS) then {
- CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = 0;
-};
-
-if (CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS < 0) then {
- CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = (count CSE_PLAYER_PLACED_RADIO_IEDS_IEDS) - 1;
-};
-
-if !(CSE_PLAYER_PLACED_RADIO_IEDS_IEDS isEqualTo []) then {
- _iedInfo = CSE_PLAYER_PLACED_RADIO_IEDS_IEDS select CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS;
- _iedLogic = _iedInfo select 0;
-
- if !([_iedLogic] call cse_fnc_checkIfJammed_IEDS) then {
- if (_iedLogic distance player < 3000) then {
- [_iedLogic] call cse_fnc_onIEDActivated_IEDS;
- CSE_PLAYER_PLACED_RADIO_IEDS_IEDS set [CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS, objNull];
- CSE_PLAYER_PLACED_RADIO_IEDS_IEDS = CSE_PLAYER_PLACED_RADIO_IEDS_IEDS - [objNull];
- CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS - 1;
- };
- };
-};
-
-[_display] call cse_fnc_onCellPhoneOpened_IEDS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_checkIEDActivated_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_checkIEDActivated_IEDS.sqf
deleted file mode 100644
index 87cee1ec8d..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_checkIEDActivated_IEDS.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_checkIEDActivated_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_logic","_triggered"];
-_logic = _this select 0;
-_triggered = false;
-
-switch (true) do {
- case (_logic getvariable ["iedActivationType",0] == 0): {
- if ([_logic] call cse_fnc_checkPressurePlateActivated_IEDS) then {
- _triggered = true;
- };
- };
- case (_logic getvariable ["iedActivationType",0] == 1): {
- if ([_logic] call cse_fnc_checkRadioTriggered_IEDS) then {
- _triggered = true;
- };
- };
- case (_logic getvariable ["iedActivationType",0] == 2): {
- if ([_logic] call cse_fnc_checkPressurePlateActivated_IEDS) then {
- _triggered = true;
- };
- };
- default {
- };
-};
-
-if (_triggered) then {
- [_logic] call cse_fnc_onIEDActivated_IEDS;
-};
-
-_triggered
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_checkIfJammed_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_checkIfJammed_IEDS.sqf
deleted file mode 100644
index b458572ce3..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_checkIfJammed_IEDS.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_checkIfJammed_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_ied", "_radioBlock", "_personsAround"];
-_ied = _this select 0;
-_radioBlock = false;
-_personsAround = (position _ied) nearEntities [["CaManBase"], 50];
-{
- if ((backpack _x == "cse_thorIII_backpack") && {(_x getvariable ["CSE_THOR_III_PACK_ENABLED_IEDS",false])}) exitwith {
- _radioBlock = true;
- };
- false;
-}count _personsAround;
-
-_radioBlock
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_checkPressurePlateActivated_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_checkPressurePlateActivated_IEDS.sqf
deleted file mode 100644
index cdca9dc727..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_checkPressurePlateActivated_IEDS.sqf
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * fn_checkPressurePlateActivated_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_pressurePlate","_return","_list","_pos"];
-_pressurePlate = _this select 0;
-_return = false;
-
- _pos = ASLToATL (getPosASL _pressurePlate);
- _list = _pos nearEntities [(_pressurePlate getvariable ["activatedForTargets",["Man", "Air", "Car", "Motorcycle", "Tank"]]),3];
- {
- if (side _x in (_pressurePlate getvariable ["activatedForSides",[WEST]])) then {
- if (_x isKindOf "CaManBase") then {
- if (_x distance _pressurePlate < random(1)) then {
- _return = true;
- };
- } else {
- if (_x distance _pressurePlate < (0.5+random(3))) then {
- _return = true;
- };
- };
- };
- if (_return) exitwith {};
- false;
- }count _list;
-
-_return
-
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_checkRadioTriggered_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_checkRadioTriggered_IEDS.sqf
deleted file mode 100644
index c056088b1d..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_checkRadioTriggered_IEDS.sqf
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * fn_checkRadioTriggered_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_ied","_return","_list","_radioBlock","_personsAround","_targetDetected","_triggerMan"];
-_ied = _this select 0;
-_return = false;
-_targetDetected = false;
-_triggerManUnits = _ied getvariable ["cse_ieds_triggerManUnits",[]];
-if ((_triggerManUnits isEqualTo [])) exitwith{false;};
-_list = (position _ied) nearEntities [(_ied getvariable ["activatedForTargets",["CaManBase", "Air", "Car", "Motorcycle", "Tank"]]),5];
-{
- _target = _x;
- {
- if ([_x, _target] call cse_fnc_triggerManGotVisual_IEDS) then {
- if (side _target in (_ied getvariable ["activatedForSides",[WEST]])) then {
- _targetDetected = true;
- };
- };
- if (_targetDetected) exitwith {};
- }count _triggerManUnits;
- if (_targetDetected) exitwith {};
-}count _list;
-
-if (!(_list isEqualTo []) && _targetDetected) then {
- _radioBlock = [_ied] call cse_fnc_checkifJammed_IEDS;
- _nearestPerson = _list select 0;
- _vehicleNear = false;
- {
- if (_ied distance _x < (_ied distance _nearestPerson)) then {
- _nearestPerson = _x;
- };
- if (!(_x iskindof "CaManBase")) then {
- _vehicleNear = true;
- };
- }foreach _list;
-
- if (!_radioBlock) then {
- if (count _list > 5) then {
- _return = true;
- } else {
- if (((_nearestPerson distance _ied < 1) || _vehicleNear) && random(1) >0.985) then {
- _return = true;
- };
- };
- };
-};
-_return
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_createIEDObject_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_createIEDObject_IEDS.sqf
deleted file mode 100644
index bb4b8d5179..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_createIEDObject_IEDS.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_createIEDObject_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define LAND_IEDS ["IEDLandBig_Remote_Ammo", "IEDLandSmall_Remote_Ammo"]
-#define URBAN_IEDS ["IEDUrbanBig_Remote_Ammo", "IEDUrbanSmall_Remote_Ammo"]
-
-private ["_logic","_typeOfIED", "_sizeOfIED", "_heightOfIED", "_iedClass", "_iedCreated"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-
-if (isNull _logic) exitwith {
-
-};
-_typeOfIED = _logic getvariable ["typeOfIED", 0];
-_sizeOfIED = _logic getvariable ["sizeOfIED", 0];
-_heightOfIED = _logic getvariable ["heightOfIED", 0];
-
-_iedClass = switch (_typeOfIED) do {
- case 0: { LAND_IEDS select _sizeOfIED};
- case 1: { URBAN_IEDS select _sizeOfIED };
-};
-_iedCreated = _iedClass createVehicle (getPos _logic);
-_logic setvariable ["cse_linkedIED_IEDS",_iedCreated, true];
-_iedCreated setPos [getPos _Logic select 0, getPos _Logic select 1, (getPos _Logic select 2) + _heightOfIED];
-[format["CREATED IED: %1", _iedCreated]] call cse_fnc_debug;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_moduleTriggerMan_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_moduleTriggerMan_IEDS.sqf
deleted file mode 100644
index 97b9f7c3f7..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_moduleTriggerMan_IEDS.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_moduleTriggerMan_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_logic", "_units", "_activated", "_totalCollection", "_collection", "_collectObjects"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-_units = [_this,1,[],[[]]] call BIS_fnc_param;
-_activated = [_this,2,true,[true]] call BIS_fnc_param;
-
-if (!local _logic) exitwith {};
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_module_spawnIED.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_module_spawnIED.sqf
deleted file mode 100644
index be7fa94fdf..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_module_spawnIED.sqf
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * fn_module_spawnIED.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_logic", "_units", "_activated", "_totalCollection", "_collection", "_collectObjects"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-_units = [_this,1,[],[[]]] call BIS_fnc_param;
-_activated = [_this,2,true,[true]] call BIS_fnc_param;
-
-if (!local _logic) exitwith {};
-
-_totalCollection = [];
-_collectObjects = {
- private ["_logic", "_collection"];
- _logic = _this select 0;
- _collection = synchronizedObjects _logic;
- {
- if !(_x in _totalCollection) then {
- if (typeOf _x == "cseModule_spawnIEDs") then {
- if !(_x getvariable ["cse_master_IED", false]) then {
- _x setvariable ["cse_subclass_IED", true];
- _x setvariable ["cse_controlledBy_IED",_logic];
- _totalCollection pushback _x;
- [_x] call _collectObjects;
- };
- } else {
- if (typeOf _x == "cseModule_triggerManLinkIEDS") then {
- _list = _x getvariable ["EnableList",""];
- _list = "[" + _list + "]";
- _parsedList = [] call compile _list;
- _triggerManList = (_logic getvariable ["cse_ieds_triggerManUnits", []]) + _parsedList;
- _logic setvariable ["cse_ieds_triggerManUnits", _triggerManList];
- [format["_triggerManList %1",_triggerManList]] call cse_fnc_debug;
- };
- };
- };
- }foreach _collection;
-};
-
-if !(_logic getvariable ["cse_subclass_IED",false]) then {
- _logic setvariable ["cse_master_IED", true];
- [_logic] call _collectObjects;
- if (_logic getvariable ["cse_master_IED", false]) then {
- _logic setvariable ["cse_iedCollection", (_logic getvariable ["cse_iedCollection",[]]) + _totalCollection];
- [format["%1 I am a master IED. Collection is: %2", _logic, (_logic getvariable ["cse_iedCollection",[]])]] call cse_fnc_debug;
- if (isnil "CSE_MASTER_IED_COLLECTION") then {
- CSE_MASTER_IED_COLLECTION = [];
- };
- CSE_MASTER_IED_COLLECTION pushback _logic;
- };
-};
-
-[_logic] call cse_fnc_createIEDObject_IEDS;
-
-_activatedSides = _logic getvariable ["activatedForSides", -1];
-_activatedTargets = _logic getvariable ["activatedForTargets", -1];
-
-_activatedTargets = switch (_activatedTargets) do {
- case 0: {["CaManBase", "Air", "Car", "Motorcycle", "Tank"]};
- case 1: {["Air", "Car", "Motorcycle", "Tank"]};
- case 2: {["Car", "Motorcycle", "Tank"]};
- case 3: {["Air"]};
- case 4: {["CaManBase"]};
- default {[]};
-};
-_logic setvariable ["activatedForTargets", _activatedTargets];
-
-_activatedSides = switch (_activatedSides) do {
- case 0: {[west, east, independent, civilian, sideEnemy, sideFriendly]};
- case 1: {[west, sideEnemy]};
- case 2: {[east, sideEnemy]};
- case 3: {[independent, sideEnemy]};
- case 4: {[civilian, sideEnemy]};
- default {[]};
-};
-
-_logic setvariable ["activatedForSides", _activatedSides, true];
-_logic setvariable ["iedActivationType", _logic getvariable ["iedActivationType",0], true];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_monitorIEDs_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_monitorIEDs_IEDS.sqf
deleted file mode 100644
index 3b9d63333c..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_monitorIEDs_IEDS.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_monitorIEDs_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_activated"];
-if !(isnil "CSE_MONITORING_IEDS") exitwith {};
-CSE_MONITORING_IEDS = true;
-sleep 1;
-if (isnil "CSE_MASTER_IED_COLLECTION") then {
- CSE_MASTER_IED_COLLECTION = [];
-};
-_code = '
- {
- _activated = false;
- if !([_x] call cse_fnc_checkIEDActivated_IEDS) then {
- {
- if ([_x] call cse_fnc_checkIEDActivated_IEDS) exitwith { _activated = true;};
- }foreach (_x getvariable ["cse_iedCollection", []]);
- } else {
- _activated = true;
- };
- if (_activated) exitwith {
- CSE_MASTER_IED_COLLECTION deleteAt _foreachIndex;
- };
- false;
- }count CSE_MASTER_IED_COLLECTION;
-
- false;';
-
-cse_sys_ieds_monitorIEDs_Trigger = createTrigger["EmptyDetector", [0,0,0]];
-cse_sys_ieds_monitorIEDs_Trigger setTriggerActivation ["NONE", "PRESENT", true];
-cse_sys_ieds_monitorIEDs_Trigger setTriggerTimeout [0, 0, 0, false];
-cse_sys_ieds_monitorIEDs_Trigger setTriggerStatements[_code, "", ""];
-
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_monitorPlayerIEDs_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_monitorPlayerIEDs_IEDS.sqf
deleted file mode 100644
index aa55d1203a..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_monitorPlayerIEDs_IEDS.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_monitorPlayerIEDs_IEDS.sqf
- * @Descr: Checks player placed pressure plate IEDs
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_activated"];
-if !(isnil "CSE_MONITORING_PLAYER_IEDS") exitwith {};
-CSE_MONITORING_PLAYER_IEDS = true;
-sleep 1;
-if (isnil "CSE_PLAYER_PLACED_PRESSURE_IEDS_IEDS") then {
- CSE_PLAYER_PLACED_PRESSURE_IEDS_IEDS = [];
-};
-
-[format["CSE_MONITORING_PLAYER_IEDS"]] call cse_fnc_debug;
-_code = '
- {
- _activated = false;
- if ([_X] call cse_fnc_checkPressurePlateActivated_IEDS) then {
- _activated = true;
- [_x] call cse_fnc_onIEDActivated_IEDS;
- };
- if (_activated || isNull _x) exitwith {
- CSE_PLAYER_PLACED_PRESSURE_IEDS_IEDS deleteAt _foreachIndex;
- };
- false;
- }count CSE_PLAYER_PLACED_PRESSURE_IEDS_IEDS;
-';
-
-
-cse_sys_ieds_monitorPlayerIEDs_Trigger = createTrigger["EmptyDetector", [0,0,0]];
-cse_sys_ieds_monitorPlayerIEDs_Trigger setTriggerActivation ["NONE", "PRESENT", true];
-cse_sys_ieds_monitorPlayerIEDs_Trigger setTriggerTimeout [0, 0, 0, false];
-cse_sys_ieds_monitorPlayerIEDs_Trigger setTriggerStatements[_code, "", ""];
-
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_onCellPhoneOpened_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_onCellPhoneOpened_IEDS.sqf
deleted file mode 100644
index fbd83c30f2..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_onCellPhoneOpened_IEDS.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * fn_onCellPhoneOpened_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_display"];
-_display = uiNamespace getVariable 'cse_ied_cellphone';
-
-
-if (isnil "CSE_PLAYER_PLACED_RADIO_IEDS_IEDS") then {
- CSE_PLAYER_PLACED_RADIO_IEDS_IEDS = [];
-};
-
-(_display displayCtrl 10) ctrlSetText "Adres book";
-
-if (isnil "CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS") then {
- CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = 0;
-};
-
-if (CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS > count CSE_PLAYER_PLACED_RADIO_IEDS_IEDS) then {
- CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = 0;
-};
-
-if (CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS < 0) then {
- CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = (count CSE_PLAYER_PLACED_RADIO_IEDS_IEDS) - 1;
-};
-(_display displayCtrl 12) ctrlSetText "";
-(_display displayCtrl 13) ctrlSetText "";
-(_display displayCtrl 14) ctrlSetText "";
-
-_ctrlIDC = 12;
-_cellphoneBookPointer = CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS;
-for [{_EHiterator=0}, {(_EHiterator< 3)}, {_EHiterator=_EHiterator+1}] do {
- if (_cellphoneBookPointer >= count CSE_PLAYER_PLACED_RADIO_IEDS_IEDS) then {
- _cellphoneBookPointer = 0;
- };
- if (_cellphoneBookPointer < 0) then {
- _cellphoneBookPointer = (count CSE_PLAYER_PLACED_RADIO_IEDS_IEDS) - 1;
- };
- if (_EHiterator < count CSE_PLAYER_PLACED_RADIO_IEDS_IEDS) then {
- (_display displayCtrl _ctrlIDC) ctrlSetText format["#%1", ((CSE_PLAYER_PLACED_RADIO_IEDS_IEDS select _cellphoneBookPointer) select 1)];
- _cellphoneBookPointer = _cellphoneBookPointer + 1;
- _ctrlIDC = _ctrlIDC + 1;
- };
-};
-
-(_display displayCtrl 12) ctrlSetbackgroundColor [0,0,0,0.1];
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_onIEDActivated_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_onIEDActivated_IEDS.sqf
deleted file mode 100644
index 2059f50f27..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_onIEDActivated_IEDS.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * fn_onIEDActivated_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_logic","_chain","_iedLogic", "_trigger", "_getMasterIED"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-
-
-_getMasterIED = {
- if (_logic getvariable ["cse_subclass_IED",false]) then {
- _logic = _logic getvariable ["cse_controlledBy_IED",_logic];
- if (_logic getvariable ["cse_subclass_IED",false]) then {
- call _getMasterIED;
- };
- };
-};
-call _getMasterIED;
-
-_chain = _logic getvariable ["cse_iedCollection",[]];
-_chain pushback _logic;
-{
- private ["_ied", "_trigger"];
- _iedLogic = _x;
- _trigger = _iedLogic getvariable ["cse_linkedIED_IEDS", objNull];
- [_iedLogic,_trigger, _logic] spawn {
- _iedLogic = _this select 0;
- _trigger = _this select 1;
- _master = _this select 2;
- if (!isNull _trigger) then {
- if (random(1)>0.5 && (_iedLogic != _master)) then {
- uisleep (random(2));
- };
- //(_iedLogic getvariable ["explosiveType","R_60mm_HE"]) createVehicle (getPos _iedLogic);
- deleteVehicle _iedLogic;
- _trigger setDamage 1;
- };
- };
-}foreach _chain;
-
-[format["%1 is triggering ied chain: %1",_logic, _chain]] call cse_fnc_debug;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_placeDownIED_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_placeDownIED_IEDS.sqf
deleted file mode 100644
index 67021314d1..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_placeDownIED_IEDS.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * fn_placeDownIED_IEDS.sqf
- * @Descr: Places down an IED (Player side)
- * @Author: Glowbal
- *
- * @Arguments: [type NUMBER (The type of IED.), size NUMBER, activationType NUMBER (1 = radio, 0 = pressure plate)]
- * @Return: logic LOGIC Returns the created IED logic
- * @PublicAPI: true
- */
-
-private ["_position", "_logic"];
-_typeOfIED = _this select 0;
-_sizeOfIED = _this select 1;
-_activationType = _this select 2;
-//_position = _this select 3;
-
-
-_position = getPos player;
-_logic = (createGroup sideLogic) createUnit ["cse_playerSpawnedIED", _position, [], 0, "FORM"];
-_logic setPos _position;
-
-_logic setvariable ["typeOfIED", _typeOfIED, true];
-_logic setvariable ["sizeOfIED", _sizeOfIED, true];
-_logic setvariable ["heightOfIED", 0, true];
-_logic setvariable ["iedActivationType", _activationType, true];
-
-[_logic] call cse_fnc_createIEDObject_IEDS;
-
-if (isnil "CSE_PLAYER_PLACED_PRESSURE_IEDS_IEDS") then {
- CSE_PLAYER_PLACED_PRESSURE_IEDS_IEDS = [];
-};
-
-if (isnil "CSE_PLAYER_PLACED_RADIO_IEDS_IEDS") then {
- CSE_PLAYER_PLACED_RADIO_IEDS_IEDS = [];
-};
-if (isnil "CSE_PLAYER_PLACED_RADIO_IEDS_COUNTER_IEDS") then {
- CSE_PLAYER_PLACED_RADIO_IEDS_COUNTER_IEDS = 0;
-};
-
-if (_activationType != 1) then {
- _logic spawn {
- hintSilent parseText "You placed down an IED. IED will be activate in 5 seconds.";
- uisleep 5;
- CSE_PLAYER_PLACED_PRESSURE_IEDS_IEDS pushback _this;
- };
-} else {
- CSE_PLAYER_PLACED_RADIO_IEDS_COUNTER_IEDS = CSE_PLAYER_PLACED_RADIO_IEDS_COUNTER_IEDS + 1;
- CSE_PLAYER_PLACED_RADIO_IEDS_IEDS pushback [_logic, format["IED %1",CSE_PLAYER_PLACED_RADIO_IEDS_COUNTER_IEDS]];
-};
-
-[format["fn_placeDownIED_IEDS %1", _logic]] call cse_fnc_debug;
-
-_logic
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_playThorIIISound_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_playThorIIISound_IEDS.sqf
deleted file mode 100644
index b736c95d9e..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_playThorIIISound_IEDS.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * fn_playThorIIISound_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-(_this select 0) say3D "cse_thor3_beep1";
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_searchGround_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_searchGround_IEDS.sqf
deleted file mode 100644
index 3564f522af..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_searchGround_IEDS.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * fn_searchGround_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define AVAILABLE_IEDS ["cseModule_spawnIEDs", "cse_playerSpawnedIED"]
-#define MAX_SEARCH_DISTANCE 2.5
-
-private ["_unit", "_foundIEDS", "_diggedUp", "_pos", "_height"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-
-_foundIEDS = nearestObjects [_unit, AVAILABLE_IEDS, MAX_SEARCH_DISTANCE];
-_diggedUp = false;
-{
- _ied = _x getvariable ["cse_linkedIED_IEDS", objNull];
- if (((getPos _ied) select 2) < 0) then {
- if (random(1)>0.1) then {
- _diggedUp = true;
- };
- };
- if (_diggedUp) exitwith{
- _pos = getPos _ied;
- _height = (_pos select 2) + 0.09;
- if (_height > 0) then {
- _height = 0;
- };
- _pos set[2,_height];
- _ied setPos _pos;
- };
-}foreach _foundIEDs;
-
-if (_unit == player) then {
- if (_diggedUp) then {
- _unit sidechat "You uncover some of an IED";
- _unit sidechat format["Pos: %1",_pos];
- } else {
- _unit sidechat "You didn't find anything";
- };
-};
-
-true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_thor3_detection_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_thor3_detection_IEDS.sqf
deleted file mode 100644
index d13c08809c..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_thor3_detection_IEDS.sqf
+++ /dev/null
@@ -1,28 +0,0 @@
-if (!isnil "CSE_LAST_TRACKER_THORBEEP_MOMENT") exitwith {};
-
-CSE_PLAY_THOR_III_SOUND_IEDS = false;
-CSE_THOR_III_PACK_ENABLED_IEDS = true;
-player setvariable ["CSE_THOR_III_PACK_ENABLED_IEDS",true,true];
-CSE_LAST_TRACKER_THORBEEP_MOMENT = time;
-_code = {
- if ((backpack player) == "cse_thorIII_backpack" && {(player getvariable ["CSE_THOR_III_PACK_ENABLED_IEDS", false])}) then {
- _foundIEDS = nearestObjects [player, ["cseModule_spawnIEDs", "cse_playerSpawnedIED"], 50];
- {
- _distanceToIED = player distance _x;
- if (_distanceToIED < 50) exitwith {
- if (_X getvariable ["iedActivationType",0] == 1) exitwith {
- _timeDifference = (_distanceToIED/50) * 10 * MODIFIER_LOOP_DELAY;
- if (time - CSE_LAST_TRACKER_THORBEEP_MOMENT >= (_timeDifference*accTime)) then {
- CSE_LAST_TRACKER_THORBEEP_MOMENT = time;
- playSound3D ["cse\cse_sys_ieds\sounds\beeps\03_Dull_Short_Mid.wav", player, false, getPos player, 35, 1, 10];
- };
- };
- };
- CSE_LAST_TRACKER_THORBEEP_MOMENT = time;
- }count _foundIEDS;
- };
-};
-
-["cse_thor3TrackerBeeping", [], _code] call cse_fnc_addTaskToPool_f;
-
-true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/functions/fn_triggerManGotVisual_IEDS.sqf b/TO_MERGE/cse/sys_ieds/functions/fn_triggerManGotVisual_IEDS.sqf
deleted file mode 100644
index fd400be10b..0000000000
--- a/TO_MERGE/cse/sys_ieds/functions/fn_triggerManGotVisual_IEDS.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_triggerManGotVisual_IEDS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_triggerMan","_obj","_return"];
-_triggerMan = _this select 0;
-_obj = _this select 1;
-_return = false;
-
-if (!(_triggerMan getvariable ["cse_ieds_SpotterFleeing_IEDS",false]) && _triggerMan != _obj && alive _triggerMan) then {
- if (_obj distance _triggerMan <350) then {
- _triggerMan doWatch _obj;
- _return = !(lineIntersects [eyePos _triggerMan, getPos _obj,_triggerMan]);
- };
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/icon.paa b/TO_MERGE/cse/sys_ieds/icon.paa
deleted file mode 100644
index 976f316c8e..0000000000
Binary files a/TO_MERGE/cse/sys_ieds/icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ieds/init_sys_ieds.sqf b/TO_MERGE/cse/sys_ieds/init_sys_ieds.sqf
deleted file mode 100644
index a123a5ca36..0000000000
--- a/TO_MERGE/cse/sys_ieds/init_sys_ieds.sqf
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * init_sys_ieds.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define IED_ICON "\A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa"
-
-if (isServer) then {
- call cse_fnc_monitorIEDS_IEDS;
-};
-
-if (hasInterface) then {
- CSE_THOR_III_PACK_ENABLED_IEDS = true;
- call cse_fnc_thor3_detection_IEDS;
- call cse_fnc_monitorPlayerIEDS_IEDS;
-};
-
-waituntil{!isnil "cse_gui"};
-
-_entries = [
- ["Pressure Plate (S)", {([player,"cse_ied_pressureplate_small"] call cse_fnc_hasItem)}, IED_ICON, {closeDialog 0; [0, 1, 0] call cse_fnc_placeDownIED_IEDS; player removeItem "cse_ied_pressureplate_small";}, "Place Pressure plate IED (Small)"],
-
- ["Pressure Plate (M)", {([player,"cse_ied_pressureplate_large"] call cse_fnc_hasItem)}, IED_ICON, {closeDialog 0; [0, 0, 0] call cse_fnc_placeDownIED_IEDS; player removeItem "cse_ied_pressureplate_large";}, "Place Pressure plate IED (Large)"],
-
- ["Radio (S)", {([player,"cse_ied_radio_small"] call cse_fnc_hasItem)}, IED_ICON, {closeDialog 0; [0, 1, 1] call cse_fnc_placeDownIED_IEDS; player removeItem "cse_ied_radio_small";}, "Place Radio IED (Small)"],
- ["Radio (M)", {([player,"cse_ied_radio_large"] call cse_fnc_hasItem)}, IED_ICON, {closeDialog 0; [0, 0, 1] call cse_fnc_placeDownIED_IEDS; player removeItem "cse_ied_radio_large";}, "Place Radio IED (Large)"],
- ["Cell Phone", {([player,"cse_oldphone"] call cse_fnc_hasItem)}, "cse\cse_sys_ieds\data\icon_cellphone.paa", {closeDialog 0; createDialog "cse_ied_cellphone";}, "Use Cell Phone Trigger"]
-];
-
-["ActionMenu","equipment", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_ieds/sounds/beeps/03_Dull_Short_Mid.wav b/TO_MERGE/cse/sys_ieds/sounds/beeps/03_Dull_Short_Mid.wav
deleted file mode 100644
index b8ad2067ba..0000000000
Binary files a/TO_MERGE/cse/sys_ieds/sounds/beeps/03_Dull_Short_Mid.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_ieds/stringtable.xml b/TO_MERGE/cse/sys_ieds/stringtable.xml
deleted file mode 100644
index 0eb106e300..0000000000
--- a/TO_MERGE/cse/sys_ieds/stringtable.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
- Pressure Plate IED (Small)
- IED z zapalnikiem naciskowym (mały)
- IED Placa de Presión (Pequeño)
-
-
- Pressure Plate IED (Large)
- IED z zapalnikiem naciskowym (duży)
- IED Placa de Presión (Grande)
-
-
- Radio IED (Small)
- IED z zapalnikiem radiowym (mały)
- IED Activación remota (Pequeño)
-
-
- Radio IED (Large)
- IED z zapalnikiem radiowym (duży)
- IED Activación remota (Grande)
-
-
-
-
diff --git a/TO_MERGE/cse/sys_ieds/ui/cellphone.hpp b/TO_MERGE/cse/sys_ieds/ui/cellphone.hpp
deleted file mode 100644
index 72126be1ca..0000000000
--- a/TO_MERGE/cse/sys_ieds/ui/cellphone.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-class cse_ied_cellphone {
- idd = 754321;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_ied_cellphone', _this select 0]; [_this] call cse_fnc_onCellPhoneOpened_IEDS; ['CSE_RADIAL_MENU', false] call cse_fnc_gui_blurScreen;";
- onUnload = "";
-
- class controlsBackground {
- class cse_background : cse_gui_backgroundBase {
- idc = -1;
- x = "0 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "30 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "cse\cse_sys_ieds\data\cellphone_background.paa";
- };
- };
- class controls {
- class labelTextMenu : cse_gui_staticBase {
- idc = 10;
- x = "5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "18.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "5.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
- text = "SERVICE";
- colorBackground[] = {0,0,0,0.0};
- colorText[] = {0.0, 0.0, 0.0, 1.0};
- style = ST_CENTER;
- };
- class labelTextLineOne : labelTextMenu {
- idc = 11;
- x = "5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "19.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "5.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.6 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.6)";
- text = "";
- style = ST_LEFT;
- };
- class labelTextLineTwo : labelTextLineOne {
- idc = 12;
- y = "20.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class labelTextLineThree : labelTextLineOne {
- idc = 13;
- y = "21 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class labelTextLineFour : labelTextLineOne {
- idc = 14;
- y = "21.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
-
-
- class actionCenter : cse_gui_buttonBase {
- idc = 30;
- text = "";
- x = "6.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "23 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "2.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureOver = "#(argb,8,8,3)color(1,1,1,0.0)";
- animTextureFocused = "#(argb,8,8,3)color(1,1,1,0.0)";
- animTexturePressed = "#(argb,8,8,3)color(1,1,1,0.0)";
- animTextureDefault = "#(argb,8,8,3)color(1,1,1,0.0)";
- color[] = {1, 1, 1, 1};
- color2[] = {0,0,0, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.5,0.5,0.5,0.8};
- colorFocused[] = {0,0,0,1};
- periodFocus = 1;
- periodOver = 1;
- action = "[] call cse_fnc_cellphone_detonateIED_IEDS;";
- };
-
- class actionButtonLeft : actionCenter {
- idc = 31;
- text = "";
- x = "5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "24 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "0.9 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- action = "";
- };
- class actionButtonRight_downwards : actionButtonLeft {
- idc = 32;
- text = "";
- x = "8.3 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "24.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "0.9 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- action = "CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS - 1; [_this] call cse_fnc_onCellPhoneOpened_IEDS;";
- };
- class actionButtonRight_up : actionButtonRight_downwards {
- idc = 32;
- text = "";
- x = "9.3 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "23.75 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "0.9 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- action = "CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS = CSE_CELLPHONE_ADRESSBOOK_POINTER_IEDS + 1; [_this] call cse_fnc_onCellPhoneOpened_IEDS;";
- };
-
- };
-};
diff --git a/TO_MERGE/cse/sys_ieds/ui/createIED.hpp b/TO_MERGE/cse/sys_ieds/ui/createIED.hpp
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/TO_MERGE/cse/sys_ieds/ui/define.hpp b/TO_MERGE/cse/sys_ieds/ui/define.hpp
deleted file mode 100644
index c521de470f..0000000000
--- a/TO_MERGE/cse/sys_ieds/ui/define.hpp
+++ /dev/null
@@ -1,797 +0,0 @@
-
-#ifndef CSE_DEFINE_H
-#define CSE_DEFINE_H
-// define.hpp
-
-#define true 1
-#define false 0
-
-#define CT_STATIC 0
-#define CT_BUTTON 1
-#define CT_EDIT 2
-#define CT_SLIDER 3
-#define CT_COMBO 4
-#define CT_LISTBOX 5
-#define CT_TOOLBOX 6
-#define CT_CHECKBOXES 7
-#define CT_PROGRESS 8
-#define CT_HTML 9
-#define CT_STATIC_SKEW 10
-#define CT_ACTIVETEXT 11
-#define CT_TREE 12
-#define CT_STRUCTURED_TEXT 13
-#define CT_CONTEXT_MENU 14
-#define CT_CONTROLS_GROUP 15
-#define CT_SHORTCUTBUTTON 16
-#define CT_XKEYDESC 40
-#define CT_XBUTTON 41
-#define CT_XLISTBOX 42
-#define CT_XSLIDER 43
-#define CT_XCOMBO 44
-#define CT_ANIMATED_TEXTURE 45
-#define CT_OBJECT 80
-#define CT_OBJECT_ZOOM 81
-#define CT_OBJECT_CONTAINER 82
-#define CT_OBJECT_CONT_ANIM 83
-#define CT_LINEBREAK 98
-#define CT_ANIMATED_USER 99
-#define CT_MAP 100
-#define CT_MAP_MAIN 101
-#define CT_LISTNBOX 102
-
-// Static styles
-#define ST_POS 0x0F
-#define ST_HPOS 0x03
-#define ST_VPOS 0x0C
-#define ST_LEFT 0x00
-#define ST_RIGHT 0x01
-#define ST_CENTER 0x02
-#define ST_DOWN 0x04
-#define ST_UP 0x08
-#define ST_VCENTER 0x0c
-
-#define ST_TYPE 0xF0
-#define ST_SINGLE 0
-#define ST_MULTI 16
-#define ST_TITLE_BAR 32
-#define ST_PICTURE 48
-#define ST_FRAME 64
-#define ST_BACKGROUND 80
-#define ST_GROUP_BOX 96
-#define ST_GROUP_BOX2 112
-#define ST_HUD_BACKGROUND 128
-#define ST_TILE_PICTURE 144
-#define ST_WITH_RECT 160
-#define ST_LINE 176
-
-#define ST_SHADOW 0x100
-#define ST_NO_RECT 0x200 // this style works for CT_STATIC in conjunction with ST_MULTI
-#define ST_KEEP_ASPECT_RATIO 0x800
-
-#define ST_TITLE ST_TITLE_BAR + ST_CENTER
-
-// Slider styles
-#define SL_DIR 0x400
-#define SL_VERT 0
-#define SL_HORZ 0x400
-
-#define SL_TEXTURES 0x10
-
-// Listbox styles
-#define LB_TEXTURES 0x10
-#define LB_MULTI 0x20
-#define FontCSE "PuristaMedium"
-
-class cse_gui_backgroundBase {
- type = CT_STATIC;
- idc = -1;
- style = ST_PICTURE;
- colorBackground[] = {0,0,0,0};
- colorText[] = {1, 1, 1, 1};
- font = FontCSE;
- text = "";
- sizeEx = 0.032;
-};
-class cse_gui_editBase
-{
- access = 0;
- type = 2;
- x = 0;
- y = 0;
- h = 0.04;
- w = 0.2;
- colorBackground[] =
- {
- 0,
- 0,
- 0,
- 1
- };
- colorText[] =
- {
- 0.95,
- 0.95,
- 0.95,
- 1
- };
- colorSelection[] =
- {
- "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])",
- 1
- };
- autocomplete = "";
- text = "";
- size = 0.2;
- style = "0x00 + 0x40";
- font = "PuristaMedium";
- shadow = 2;
- sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorDisabled[] =
- {
- 1,
- 1,
- 1,
- 0.25
- };
-};
-
-
-
-class cse_gui_buttonBase {
- idc = -1;
- type = 16;
- style = ST_LEFT;
- text = "";
- action = "";
- x = 0.0;
- y = 0.0;
- w = 0.25;
- h = 0.04;
- size = 0.03921;
- sizeEx = 0.03921;
- color[] = {1.0, 1.0, 1.0, 1};
- color2[] = {1.0, 1.0, 1.0, 1};
- /*colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.5])"};
- colorbackground2[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.4};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- colorFocused[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])", 0.8};
- colorBackgroundFocused[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.8};
- */
-
- colorBackground[] = {1,1,1,0.95};
- colorbackground2[] = {1,1,1,0.95};
- colorDisabled[] = {1,1,1,0.6};
- colorFocused[] = {1,1,1,1};
- colorBackgroundFocused[] = {1,1,1,1};
- periodFocus = 1.2;
- periodOver = 0.8;
- default = false;
- class HitZone {
- left = 0.00;
- top = 0.00;
- right = 0.00;
- bottom = 0.00;
- };
-
- class ShortcutPos {
- left = 0.00;
- top = 0.00;
- w = 0.00;
- h = 0.00;
- };
-
- class TextPos {
- left = 0.002;
- top = 0.0004;
- right = 0.0;
- bottom = 0.00;
- };
- textureNoShortcut = "";
- animTextureNormal = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDisabled = "cse\cse_gui\data\buttonDisabled_gradient.paa";
- animTextureOver = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureFocused = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTexturePressed = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDefault = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- period = 0.5;
- font = FontCSE;
- soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
- soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0};
- soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1};
- soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
- class Attributes {
- font = FontCSE;
- color = "#E5E5E5";
- align = "center";
- shadow = "true";
- };
- class AttributesImage {
- font = FontCSE;
- color = "#E5E5E5";
- align = "left";
- shadow = "true";
- };
-};
-
-class cse_gui_RscProgress {
- type = 8;
- style = 0;
- colorFrame[] = {1,1,1,0.7};
- colorBar[] = {1,1,1,0.7};
- texture = "#(argb,8,8,3)color(1,1,1,0.7)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-};
-
-
-class cse_gui_staticBase {
- idc = -1;
- type = CT_STATIC;
- x = 0.0;
- y = 0.0;
- w = 0.183825;
- h = 0.104575;
- style = ST_LEFT;
- font = FontCSE;
- sizeEx = 0.03921;
- colorText[] = {0.95, 0.95, 0.95, 1.0};
- colorBackground[] = {0, 0, 0, 0};
- text = "";
-};
-
-class RscListBox;
-class cse_gui_listBoxBase : RscListBox{
- type = CT_LISTBOX;
- style = ST_MULTI;
- font = FontCSE;
- sizeEx = 0.03921;
- color[] = {1, 1, 1, 1};
- colorText[] = {0.543, 0.5742, 0.4102, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 1};
- colorSelectBackground2[] = {0.543, 0.5742, 0.4102, 1.0};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- period = 1.2;
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 1};
- maxHistoryDelay = 1.0;
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- soundSelect[] = {"",0.1,1};
- soundExpand[] = {"",0.1,1};
- soundCollapse[] = {"",0.1,1};
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
- class ScrollBar {
- color[] = {1, 1, 1, 0.6};
- colorActive[] = {1, 1, 1, 1};
- colorDisabled[] = {1, 1, 1, 0.3};
- thumb = "";
- arrowFull = "";
- arrowEmpty = "";
- border = "";
- };
-};
-
-
-class cse_gui_listNBox {
- access = 0;
- type = CT_LISTNBOX;// 102;
- style =ST_MULTI;
- w = 0.4;
- h = 0.4;
- font = FontCSE;
- sizeEx = 0.031;
-
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- columns[] = {0.0};
- color[] = {1, 1, 1, 1};
-
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.5};
- colorActive[] = {0,0,0,1};
- colorDisabled[] = {0,0,0,0.3};
- rows = 1;
-
- drawSideArrows = 0;
- idcLeft = -1;
- idcRight = -1;
- maxHistoryDelay = 1;
- soundSelect[] = {"", 0.1, 1};
- period = 1;
- shadow = 2;
- class ScrollBar {
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- border = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- thumb = "#(argb,8,8,3)color(1,1,1,1)";
- };
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-class RscCombo;
-class cse_gui_comboBoxBase: RscCombo {
- idc = -1;
- type = 4;
- style = "0x10 + 0x200";
- x = 0;
- y = 0;
- w = 0.3;
- h = 0.035;
- color[] = {0,0,0,0.6};
- colorActive[] = {1,0,0,1};
- colorBackground[] = {0,0,0,1};
- colorDisabled[] = {1,1,1,0.25};
- colorScrollbar[] = {1,0,0,1};
- colorSelect[] = {0,0,0,1};
- colorSelectBackground[] = {1,1,1,0.7};
- colorText[] = {1,1,1,1};
-
- arrowEmpty = "";
- arrowFull = "";
- wholeHeight = 0.45;
- font = FontCSE;
- sizeEx = 0.031;
- soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1};
- soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1};
- soundCollapse[] = {"\A3\ui_f\data\sound\RscCombo\soundCollapse",0.1,1};
- maxHistoryDelay = 1.0;
- class ScrollBar
- {
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- border = "";
- };
- class ComboScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-
-class cse_gui_mapBase {
- moveOnEdges = 1;
- x = "SafeZoneXAbs";
- y = "SafeZoneY + 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "SafeZoneWAbs";
- h = "SafeZoneH - 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- type = 100; // Use 100 to hide markers
- style = 48;
- shadow = 0;
-
- ptsPerSquareSea = 5;
- ptsPerSquareTxt = 3;
- ptsPerSquareCLn = 10;
- ptsPerSquareExp = 10;
- ptsPerSquareCost = 10;
- ptsPerSquareFor = 9;
- ptsPerSquareForEdge = 9;
- ptsPerSquareRoad = 6;
- ptsPerSquareObj = 9;
- showCountourInterval = 0;
- scaleMin = 0.001;
- scaleMax = 1.0;
- scaleDefault = 0.16;
- maxSatelliteAlpha = 0.85;
- alphaFadeStartScale = 0.35;
- alphaFadeEndScale = 0.4;
- colorBackground[] = {0.969,0.957,0.949,1.0};
- colorSea[] = {0.467,0.631,0.851,0.5};
- colorForest[] = {0.624,0.78,0.388,0.5};
- colorForestBorder[] = {0.0,0.0,0.0,0.0};
- colorRocks[] = {0.0,0.0,0.0,0.3};
- colorRocksBorder[] = {0.0,0.0,0.0,0.0};
- colorLevels[] = {0.286,0.177,0.094,0.5};
- colorMainCountlines[] = {0.572,0.354,0.188,0.5};
- colorCountlines[] = {0.572,0.354,0.188,0.25};
- colorMainCountlinesWater[] = {0.491,0.577,0.702,0.6};
- colorCountlinesWater[] = {0.491,0.577,0.702,0.3};
- colorPowerLines[] = {0.1,0.1,0.1,1.0};
- colorRailWay[] = {0.8,0.2,0.0,1.0};
- colorNames[] = {0.1,0.1,0.1,0.9};
- colorInactive[] = {1.0,1.0,1.0,0.5};
- colorOutside[] = {0.0,0.0,0.0,1.0};
- colorTracks[] = {0.84,0.76,0.65,0.15};
- colorTracksFill[] = {0.84,0.76,0.65,1.0};
- colorRoads[] = {0.7,0.7,0.7,1.0};
- colorRoadsFill[] = {1.0,1.0,1.0,1.0};
- colorMainRoads[] = {0.9,0.5,0.3,1.0};
- colorMainRoadsFill[] = {1.0,0.6,0.4,1.0};
- colorGrid[] = {0.1,0.1,0.1,0.6};
- colorGridMap[] = {0.1,0.1,0.1,0.6};
- colorText[] = {1, 1, 1, 0.85};
-font = "PuristaMedium";
-sizeEx = 0.0270000;
-stickX[] = {0.20, {"Gamma", 1.00, 1.50} };
-stickY[] = {0.20, {"Gamma", 1.00, 1.50} };
-onMouseButtonClick = "";
-onMouseButtonDblClick = "";
-
- fontLabel = "PuristaMedium";
- sizeExLabel = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontGrid = "TahomaB";
- sizeExGrid = 0.02;
- fontUnits = "TahomaB";
- sizeExUnits = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontNames = "PuristaMedium";
- sizeExNames = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2";
- fontInfo = "PuristaMedium";
- sizeExInfo = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontLevel = "TahomaB";
- sizeExLevel = 0.02;
- text = "#(argb,8,8,3)color(1,1,1,1)";
- class ActiveMarker {
- color[] = {0.30, 0.10, 0.90, 1.00};
- size = 50;
- };
- class Legend
- {
- x = "SafeZoneX + ( ((safezoneW / safezoneH) min 1.2) / 40)";
- y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
- h = "3.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- font = "PuristaMedium";
- sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- colorBackground[] = {1,1,1,0.5};
- color[] = {0,0,0,1};
- };
- class Task
- {
- icon = "\A3\ui_f\data\map\mapcontrol\taskIcon_CA.paa";
- iconCreated = "\A3\ui_f\data\map\mapcontrol\taskIconCreated_CA.paa";
- iconCanceled = "\A3\ui_f\data\map\mapcontrol\taskIconCanceled_CA.paa";
- iconDone = "\A3\ui_f\data\map\mapcontrol\taskIconDone_CA.paa";
- iconFailed = "\A3\ui_f\data\map\mapcontrol\taskIconFailed_CA.paa";
- color[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])"};
- colorCreated[] = {1,1,1,1};
- colorCanceled[] = {0.7,0.7,0.7,1};
- colorDone[] = {0.7,1,0.3,1};
- colorFailed[] = {1,0.3,0.2,1};
- size = 27;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- };
- class Waypoint
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class WaypointCompleted
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypointCompleted_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class CustomMark
- {
- icon = "\A3\ui_f\data\map\mapcontrol\custommark_ca.paa";
- size = 24;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {0,0,0,1};
- };
- class Command
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- size = 18;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {1,1,1,1};
- };
- class Bush
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = "14/2";
- importance = "0.2 * 14 * 0.05 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Rock
- {
- icon = "\A3\ui_f\data\map\mapcontrol\rock_ca.paa";
- color[] = {0.1,0.1,0.1,0.8};
- size = 12;
- importance = "0.5 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class SmallTree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.6 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Tree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.9 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class busstop
- {
- icon = "\A3\ui_f\data\map\mapcontrol\busstop_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class fuelstation
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fuelstation_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class hospital
- {
- icon = "\A3\ui_f\data\map\mapcontrol\hospital_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class church
- {
- icon = "\A3\ui_f\data\map\mapcontrol\church_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class lighthouse
- {
- icon = "\A3\ui_f\data\map\mapcontrol\lighthouse_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class power
- {
- icon = "\A3\ui_f\data\map\mapcontrol\power_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powersolar
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powersolar_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwave
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwave_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwind
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwind_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class quay
- {
- icon = "\A3\ui_f\data\map\mapcontrol\quay_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class shipwreck
- {
- icon = "\A3\ui_f\data\map\mapcontrol\shipwreck_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class transmitter
- {
- icon = "\A3\ui_f\data\map\mapcontrol\transmitter_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class watertower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\watertower_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class Cross
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Cross_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Chapel
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Chapel_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Bunker
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 14;
- importance = "1.5 * 14 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fortress
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 16;
- importance = "2 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fountain
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fountain_ca.paa";
- size = 11;
- importance = "1 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Ruin
- {
- icon = "\A3\ui_f\data\map\mapcontrol\ruin_ca.paa";
- size = 16;
- importance = "1.2 * 16 * 0.05";
- coefMin = 1;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Stack
- {
- icon = "\A3\ui_f\data\map\mapcontrol\stack_ca.paa";
- size = 20;
- importance = "2 * 16 * 0.05";
- coefMin = 0.9;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Tourism
- {
- icon = "\A3\ui_f\data\map\mapcontrol\tourism_ca.paa";
- size = 16;
- importance = "1 * 16 * 0.05";
- coefMin = 0.7;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class ViewTower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\viewtower_ca.paa";
- size = 16;
- importance = "2.5 * 16 * 0.05";
- coefMin = 0.5;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
-};
-
-#endif
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_launchers/backblast/CfgFunctions.h b/TO_MERGE/cse/sys_launchers/backblast/CfgFunctions.h
deleted file mode 100644
index d63428835d..0000000000
--- a/TO_MERGE/cse/sys_launchers/backblast/CfgFunctions.h
+++ /dev/null
@@ -1,8 +0,0 @@
-class CfgFunctions {
- class CSE {
- class Backblast {
- file = "cse\cse_sys_launchers\backblast\functions";
- class handleBackBlast_BB { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_launchers/backblast/CfgVehicles.h b/TO_MERGE/cse/sys_launchers/backblast/CfgVehicles.h
deleted file mode 100644
index 115bcf8b6f..0000000000
--- a/TO_MERGE/cse/sys_launchers/backblast/CfgVehicles.h
+++ /dev/null
@@ -1,45 +0,0 @@
-class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class cse_sys_backblast: Module_F {
- scope = 2;
- displayName = "Backblast [CSE]";
- icon = "\cse\cse_main\data\cse_backblast_module.paa";
- category = "cse_equipment";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- class inBuilding {
- displayName = "Affect Buildings";
- description = "Should backblast be affected by structures";
- typeName = "BOOL";
- };
- class forAI {
- displayName = "Enable for AI";
- description = "Should backblast be enabled for AI";
- typeName = "BOOL";
- };
- class damageModifier {
- displayName = "Damage modifier";
- description = "Select the aggressiveness of the backblast damage";
- typeName = "NUMBER";
- class values {
- class recruit { name = "Recruit"; value = 0.5; };
- class regular { name = "Regular"; value = 1.0; default = 1; };
- class veteran { name = "Veteran"; value = 1.2; };
- class expert { name = "Expert"; value = 1.4; };
- };
- };
- class advanced {
- displayName = "Advanced Backblast";
- description = "Should enviroment and walls have an effect on backblast?";
- typeName = "BOOL";
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_launchers/backblast/CfgWeapons.h b/TO_MERGE/cse/sys_launchers/backblast/CfgWeapons.h
deleted file mode 100644
index 9194336d8f..0000000000
--- a/TO_MERGE/cse/sys_launchers/backblast/CfgWeapons.h
+++ /dev/null
@@ -1,9 +0,0 @@
-class CfgWeapons {
- class Launcher;
- class Launcher_Base_F: Launcher {
- cse_backblastAngle = 75;
- cse_backblastDamage = 1;
- cse_backblast_maxDistance = 5;
- cse_backblast_noObjectDistance = 5;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_launchers/backblast/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_launchers/backblast/Combat_Space_Enhancement.h
deleted file mode 100644
index 387fa6b562..0000000000
--- a/TO_MERGE/cse/sys_launchers/backblast/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,13 +0,0 @@
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_backblast {
- init = "call compile preprocessFile 'cse\cse_sys_launchers\backblast\init_sys_backblast.sqf';";
- name = "Backblast";
- class EventHandlers {
- class CAManBase {
- FiredNear = "_this call cse_fnc_handleBackBlast_BB;";
- };
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_launchers/backblast/config.cpp b/TO_MERGE/cse/sys_launchers/backblast/config.cpp
deleted file mode 100644
index 48ad7fe65e..0000000000
--- a/TO_MERGE/cse/sys_launchers/backblast/config.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-class CfgPatches {
- class cse_sys_backblast {
- units[] = {};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_f_eh","cse_main"};
- versionDesc = "CSE Backblast";
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-class cse_sys_weaponrest {
- class PreloadAddons {
- class cse_sys_backblast {
- list[] = {"cse_sys_backblast"};
- };
- };
-};
-
-#include "CfgVehicles.h"
-#include "CfgWeapons.h"
-#include "CfgFunctions.h"
-#include "Combat_Space_Enhancement.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_launchers/backblast/functions/fn_handleBackblast_BB.sqf b/TO_MERGE/cse/sys_launchers/backblast/functions/fn_handleBackblast_BB.sqf
deleted file mode 100644
index 68e723075f..0000000000
--- a/TO_MERGE/cse/sys_launchers/backblast/functions/fn_handleBackblast_BB.sqf
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * fn_handleBackblast_BB.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_unitFired","_firedDistance","_weaponFired","_backblastAngle","_backblastRange","_backblastDamage","_direction","_distance","_relativePosition","_relativeDirection","_relativeAzimuth","_relativeInclination","_return","_handle","_percentage","_doDamage", "_weaponDir", "_positionEndLauncher", "_positionBehindMax", "_positionBehindNoObj"];
-
-_unit = _this select 0;
-if (!local _unit) exitwith {};
-_unitFired = _this select 1;
-_firedDistance = _this select 2;
-_weaponFired = _this select 3;
-
-if (!CSE_BACKBLAST_EFFECT_AI_BB && !(IsPlayer _unit)) exitwith {};
-if (vehicle _unit != _unit) exitWith {};
-
-_return = false;
-
-_backblastDamage = getNumber (configFile >> "CfgWeapons" >> _weaponFired >> "cse_backblastDamage");
-if (_backblastDamage == 0) exitwith {};
-if (_unit != _unitFired) then {
- _noObjectDistance = getNumber (configFile >> "CfgWeapons" >> _weaponFired >> "cse_backblast_noObjectDistance");
- _backblastDistance = (getNumber (configFile >> "CfgWeapons" >> _weaponFired >> "cse_backblast_maxDistance"));
- if ((_noObjectDistance + _backblastDistance) < _firedDistance) exitwith {};
-
- _doDamage = _backblastDamage;
- if (_firedDistance > _noObjectDistance ) then {
- _percentage = (_firedDistance / _backblastDistance);
- if (_percentage < 1) then {
- _doDamage = _backblastDamage * _percentage;
- };
- };
- // _doDamage = _backblastDamage / (_backblastDistance-(_firedDistance^(1/2)));
-
- _doDamage = _doDamage * CSE_BACKBLAST_DAMAGE_MODIFIER_BB;
-
- _weaponDir = _unitFired weaponDirection currentWeapon _unitFired;
- _positionEndLauncher = ATLtoASL ((_unitFired modelToWorld (_unitFired selectionPosition "RightHand")) vectorAdd (_weaponDir vectorMultiply (0.5)));
- _positionBehindNoObj = _positionEndLauncher vectorAdd (_weaponDir vectorMultiply _noObjectDistance);
- _positionBehindMax = _positionEndLauncher vectorAdd (_weaponDir vectorMultiply (_noObjectDistance + _backblastDistance));
-
-
- _direction = direction _unitFired;
-
- _backblastAngle = getNumber (configFile >> "CfgWeapons" >> _weaponFired >> "cse_backblastAngle");
- if ([position _unitFired,_direction - 180,_backblastAngle / 2,position _unit] call BIS_fnc_inAngleSector) then {
-
- _line = [_positionEndLauncher, eyePos _unit, _unit, _unitFired];
- if ((!lineIntersects _line) /*&& {!terrainIntersect [_positionEndLauncher, getPosASL _unit]}*/) then {
- _return = true;
-
- if (["cse_sys_medical"] call cse_fnc_isModuleEnabled_F) then {
- if (random(1)>0.5) then {
- [_unit,"body",(damage _unit + (random(_doDamage))),_unitFired,_weaponFired,"backblast"] spawn cse_fnc_handleDamage_CMS;
- };
- if (random(1)>0.5) then {
- [_unit,"head",(damage _unit + (random(_doDamage))),_unitFired,_weaponFired,"backblast"] spawn cse_fnc_handleDamage_CMS;
- };
- if (random(1)>0.5) then {
- [_unit,"legs",(damage _unit + (random(_doDamage))),_unitFired,_weaponFired,"backblast"] spawn cse_fnc_handleDamage_CMS;
- };
- if (random(1)>0.5) then {
- [_unit,"arms",(damage _unit + (random(_doDamage))),_unitFired,_weaponFired,"backblast"] spawn cse_fnc_handleDamage_CMS;
- };
- [_unit, _backblastDamage, 0] call cse_fnc_increasePain_CMS;
-
- if (random(1)>0.1) then {
- [_unit] call cse_fnc_setProne;
- [_unit] call cse_fnc_setUnconsciousState;
- } else {
- [_unit,_doDamage] call cse_fnc_reactionToHit_CMS;
- };
- } else {
- _unit setDamage (damage _unit + _doDamage) min 0.95;
- if (random(1)>0.1) then {
- [_unit] call cse_fnc_setProne;
- };
- };
-
- if (isPlayer _unit) then {
- playSound "combat_deafness";
- [_doDamage] call BIS_fnc_bloodEffect;
- [_unit,0.5] call BIS_fnc_dirtEffect;
- };
- };
- };
-} else {
- _noObjectDistance = getNumber (configFile >> "CfgWeapons" >> _weaponFired >> "cse_backblast_noObjectDistance");
- if (CSE_BACKBLAST_AFFECTS_INBUILDING_BB || CSE_BACKBLAST_AFFECTS_ADVANCED_BB) then {
- if ([_unitFired] call cse_fnc_isInBuilding || CSE_BACKBLAST_AFFECTS_ADVANCED_BB) then {
- private ["_eyePos","_buildingBehind","_obj"];
- _eyePos = eyePos _unit;
- _buildingBehind = false;
-
- _weaponDir = _unitFired weaponDirection currentWeapon _unitFired;
- _positionEndLauncher = ATLtoASL ((_unitFired modelToWorld (_unitFired selectionPosition "RightHand")) vectorAdd (_weaponDir vectorMultiply (0.5)));
- _positionBehindNoObj = _positionEndLauncher vectorAdd (_weaponDir vectorMultiply _noObjectDistance);
- _positionBehindMax = _positionEndLauncher vectorAdd (_weaponDir vectorMultiply (_noObjectDistance + _backblastDistance));
-
-
- _obj = (lineIntersectsWith [_positionEndLauncher, _positionBehindNoObj, _unit]);
- _buildingBehind = ({(_x isKindOf "Building")}count _obj) > 0;
-
- if (CSE_BACKBLAST_AFFECTS_ADVANCED_BB) then {
- if (!_buildingBehind) then {
- _buildingBehind = (terrainIntersect [_positionEndLauncher, _positionBehindNoObj]);
- };
- };
-
- if (_buildingBehind) then {
- _return = true;
- //_backblastDamage = _backblastDamage * CSE_BACKBLAST_DAMAGE_MODIFIER_BB;
- if (["cse_sys_medical"] call cse_fnc_isModuleEnabled_F) then {
- if (random(1)>0.5) then {
- _handle = [_unit,"body",(damage _unit + (random(_backblastDamage))),_unitFired,_weaponFired,"backblast"] spawn cse_fnc_handleDamage_CMS;
- };
- if (random(1)>0.5) then {
- _handle = [_unit,"head",(damage _unit + (random(_backblastDamage))),_unitFired,_weaponFired,"backblast"] spawn cse_fnc_handleDamage_CMS;
- };
- if (random(1)>0.5) then {
- _handle = [_unit,"legs",(damage _unit + (random(_backblastDamage))),_unitFired,_weaponFired,"backblast"] spawn cse_fnc_handleDamage_CMS;
- };
- if (random(1)>0.5) then {
- _handle = [_unit,"arms",(damage _unit + (random(_backblastDamage))),_unitFired,_weaponFired,"backblast"] spawn cse_fnc_handleDamage_CMS;
- };
- [_unit,_backblastDamage,0] call cse_fnc_increasePain_CMS;
-
- if (random(1)>0.1) then {
- [_unit] call cse_fnc_setUnconsciousState;
- } else {
- [_unit,_backblastDamage] call cse_fnc_reactionToHit_CMS;
- };
- } else {
- _unit setDamage (damage _unit + 0.2);
- if (random(1)>0.1) then {
- [_unit] call cse_fnc_setProne;
- };
- };
- if (isPlayer _unit) then {
- playSound "combat_deafness";
- [_backblastDamage] call BIS_fnc_bloodEffect;
- [_unit,0.5] call BIS_fnc_dirtEffect;
- };
- };
- };
- };
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_launchers/backblast/init_sys_backblast.sqf b/TO_MERGE/cse/sys_launchers/backblast/init_sys_backblast.sqf
deleted file mode 100644
index 4ad04eb716..0000000000
--- a/TO_MERGE/cse/sys_launchers/backblast/init_sys_backblast.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-CSE_BACKBLAST_AFFECTS_INBUILDING_BB = false;
-CSE_BACKBLAST_EFFECT_AI_BB = false;
-CSE_BACKBLAST_AFFECTS_ADVANCED_BB = false;
-CSE_BACKBLAST_DAMAGE_MODIFIER_BB = 0.5;
-private ["_args"];
-_args = _this;
-
-{
- if (_x select 0 == "inBuilding") then {
- CSE_BACKBLAST_AFFECTS_INBUILDING_BB = _x select 1;
- };
- if (_x select 0 == "forAI") then {
- CSE_BACKBLAST_EFFECT_AI_BB = _x select 1;
- };
- if (_x select 0 == "damageModifier") then {
- CSE_BACKBLAST_DAMAGE_MODIFIER_BB = _x select 1;
- };
- if (_x select 0 == "advanced") then {
- CSE_BACKBLAST_AFFECTS_ADVANCED_BB = _x select 1;
- };
-}foreach _args;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_launchers/backblast/stringtable.xml b/TO_MERGE/cse/sys_launchers/backblast/stringtable.xml
deleted file mode 100644
index a1df2063e2..0000000000
--- a/TO_MERGE/cse/sys_launchers/backblast/stringtable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/CfgFunctions.h b/TO_MERGE/cse/sys_logistics/CfgFunctions.h
deleted file mode 100644
index 3270411518..0000000000
--- a/TO_MERGE/cse/sys_logistics/CfgFunctions.h
+++ /dev/null
@@ -1,14 +0,0 @@
-class CfgFunctions {
- class CSE {
- class Logistics {
- file = "cse\cse_sys_logistics\functions";
- class hideObjCargo_LOG { recompile = 1; };
- class findVehicle_LOG { recompile = 1; };
- class loadObject_LOG { recompile = 1; };
- class unloadObject_LOG { recompile = 1; };
- class canCarryObj_LOG { recompile = 1; };
- class canDragObj_LOG { recompile = 1; };
- class dragObject_LOG { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/CfgVehicles.h b/TO_MERGE/cse/sys_logistics/CfgVehicles.h
deleted file mode 100644
index ab14a81a96..0000000000
--- a/TO_MERGE/cse/sys_logistics/CfgVehicles.h
+++ /dev/null
@@ -1,35 +0,0 @@
-class CfgVehicles
-{
- class Logic;
- class Module_F: Logic
- {
- class ArgumentsBaseUnits
- {
- };
- };
- class cse_sys_logistics: Module_F
- {
- scope = 2;
- displayName = "Logistics [CSE]";
- icon = "\cse\cse_main\data\cse_basic_module.paa";
- category = "cseModules";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments
- {
-
- };
- };
-
-/* class NATO_Box_Base;
- class cse_logisticCrate : NATO_Box_Base {
- scope = 2;
- accuracy = 1000;
- displayName = "Logistic Crate";
- model = "\cse\cse_sys_logistics\data\crate\crate.p3d";
- author = "Combat Space Enhancement";
- };*/
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_logistics/Combat_Space_Enhancement.h
deleted file mode 100644
index 049cc8ef3a..0000000000
--- a/TO_MERGE/cse/sys_logistics/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,8 +0,0 @@
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_logistics {
- init = "call compile preprocessFile 'cse\cse_sys_logistics\init_sys_logistics.sqf';";
- name = "Logistics Module";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/GUI.h b/TO_MERGE/cse/sys_logistics/GUI.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/TO_MERGE/cse/sys_logistics/config.cpp b/TO_MERGE/cse/sys_logistics/config.cpp
deleted file mode 100644
index d55f707993..0000000000
--- a/TO_MERGE/cse/sys_logistics/config.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#define _ARMA_
-class CfgPatches
-{
- class cse_sys_logistics
- {
- units[] = {};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_gui","cse_main","cse_f_modules"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_logistics {
- list[] = {"cse_sys_logistics"};
- };
- };
-};
-
-#include "CfgVehicles.h"
-#include "CfgFunctions.h"
-#include "Combat_Space_Enhancement.h"
-#include "GUI.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/data/crate/crate.p3d b/TO_MERGE/cse/sys_logistics/data/crate/crate.p3d
deleted file mode 100644
index 2fe8b0775a..0000000000
Binary files a/TO_MERGE/cse/sys_logistics/data/crate/crate.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_logistics/data/crate/crate.rvmat b/TO_MERGE/cse/sys_logistics/data/crate/crate.rvmat
deleted file mode 100644
index 7549f8f750..0000000000
--- a/TO_MERGE/cse/sys_logistics/data/crate/crate.rvmat
+++ /dev/null
@@ -1,32 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={0.5,0.5,0.5,1};
-forcedDiffuse[]={0.5,0.5,0.5,0};
-emmisive[]={0,0,0,1};
-specular[]={0.30000001,0.30000001,0.30000001,0};
-specularPower=57.799999;
-PixelShaderID="NormalMapSpecularDIMap";
-VertexShaderID="NormalMap";
-class Stage1
-{
- texture="cse\cse_sys_medical\equipment\crate\crate_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
-class Stage2
-{
- texture="cse\cse_sys_medical\equipment\crate\crate_smdi.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_logistics/data/crate/crate_co.paa b/TO_MERGE/cse/sys_logistics/data/crate/crate_co.paa
deleted file mode 100644
index 77cccead11..0000000000
Binary files a/TO_MERGE/cse/sys_logistics/data/crate/crate_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_logistics/data/crate/crate_nohq.paa b/TO_MERGE/cse/sys_logistics/data/crate/crate_nohq.paa
deleted file mode 100644
index 119f1810d1..0000000000
Binary files a/TO_MERGE/cse/sys_logistics/data/crate/crate_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_logistics/data/crate/crate_smdi.paa b/TO_MERGE/cse/sys_logistics/data/crate/crate_smdi.paa
deleted file mode 100644
index cd10050fc0..0000000000
Binary files a/TO_MERGE/cse/sys_logistics/data/crate/crate_smdi.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_logistics/functions/fn_canCarryObj_LOG.sqf b/TO_MERGE/cse/sys_logistics/functions/fn_canCarryObj_LOG.sqf
deleted file mode 100644
index ef783d9933..0000000000
--- a/TO_MERGE/cse/sys_logistics/functions/fn_canCarryObj_LOG.sqf
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * fn_canCarryObj_LOG.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-#define MIN_DISTANCE 4
-
-private ["_caller", "_object", "_log"];
-_caller = _this select 0;
-_object = _this select 1;
-
-if (!(isNull ([_caller] call cse_fnc_getCarriedObj)) || !((_object distance _caller) < MIN_DISTANCE)) exitwith {
- false;
-};
-
-_log = (_object getvariable "CSE_Logistics_Enable");
-if !(isnil "_log") exitwith {
- (_object getVariable ["CSE_Logistics_Enable", false])
-};
-
-false;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/functions/fn_canDragObj_LOG.sqf b/TO_MERGE/cse/sys_logistics/functions/fn_canDragObj_LOG.sqf
deleted file mode 100644
index ff09078de8..0000000000
--- a/TO_MERGE/cse/sys_logistics/functions/fn_canDragObj_LOG.sqf
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * fn_canDragObj_LOG.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-#define MIN_DISTANCE 4
-
-private ["_caller", "_object", "_check"];
-_caller = _this select 0;
-_object = _this select 1;
-
-if (!(isNull ([_caller] call cse_fnc_getCarriedObj)) || !((_object distance _caller) < MIN_DISTANCE)) exitwith {
- false;
-};
-
-_check = _object getvariable "CSE_Logistics_Enable_drag";
-if !(isnil "_check") exitwith {
- _check;
-};
-
-((_object iskindof "StaticWeapon") || ((_object iskindof "ReammoBox") || (_object iskindof "ReammoBox_F")));
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/functions/fn_dragObject_LOG.sqf b/TO_MERGE/cse/sys_logistics/functions/fn_dragObject_LOG.sqf
deleted file mode 100644
index 1a5b60aa32..0000000000
--- a/TO_MERGE/cse/sys_logistics/functions/fn_dragObject_LOG.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_dragObject_LOG.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define DISTANCE_OBJECT 1.3
-
-private ["_caller", "_object", "_attachToPos"];
-_caller = _this select 0;
-_object = _this select 1;
-
-_attachToPos = [0, DISTANCE_OBJECT, (_caller worldToModel (_object modelToWorld [0,0,0])) select 2];
-if ([_caller, _object, _attachToPos, false] call cse_fnc_carryObj) then {
- closeDialog 0;
- [player, "STR_CSE_LOG_DRAG_OBJECT","STR_CSE_LOG_START_DRAGGING"] call cse_fnc_sendDisplayMessageTo;
-
- if (currentWeapon _caller == primaryWeapon _caller) then {
- [_caller, "AcinPknlMstpSrasWrflDnon", true] call cse_fnc_localAnim;
- } else {
- [_caller, "AcinPknlMstpSnonWnonDnon", true] call cse_fnc_localAnim;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/functions/fn_findVehicle_LOG.sqf b/TO_MERGE/cse/sys_logistics/functions/fn_findVehicle_LOG.sqf
deleted file mode 100644
index 4bd4ecee2a..0000000000
--- a/TO_MERGE/cse/sys_logistics/functions/fn_findVehicle_LOG.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * fn_findVehicle_LOG.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_loadcar","_loadhelicopter", "_loadtank", "_vehicle"];
-_unit = _this select 0;
-_loadcar = nearestObject [_unit, "car"];
-_loadhelicopter = nearestObject [_unit, "air"];
-_loadtank = nearestObject [_unit, "tank"];
-_vehicle = ObjNull;
-
-
-if (_unit distance _loadcar <= 10) then {
- _vehicle = _loadcar;
-} else {
- if (_unit distance _loadhelicopter <= 10) then
- {
- _vehicle = _loadhelicopter;
- } else {
- if (_unit distance _loadtank <= 10) then
- {
- _vehicle = _loadtank;
- } else {
- };
- };
-};
-_vehicle
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/functions/fn_hideObjCargo_LOG.sqf b/TO_MERGE/cse/sys_logistics/functions/fn_hideObjCargo_LOG.sqf
deleted file mode 100644
index 787b77bc1e..0000000000
--- a/TO_MERGE/cse/sys_logistics/functions/fn_hideObjCargo_LOG.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_hideObjCargo_LOG.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_obj","_veh"];
-_obj = _this select 0;
-_veh = _this select 1;
-_hide = _this select 2;
-
-if (_hide) then {
- _obj enableSimulation false;
- _obj hideObject true;
-} else {
- _obj enableSimulation true;
- _obj hideObject false;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/functions/fn_loadObject_LOG.sqf b/TO_MERGE/cse/sys_logistics/functions/fn_loadObject_LOG.sqf
deleted file mode 100644
index 97c8a2e05a..0000000000
--- a/TO_MERGE/cse/sys_logistics/functions/fn_loadObject_LOG.sqf
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * fn_loadObject_LOG.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_obj","_veh","_loaded","_numberLoaded"];
-_obj = _this select 0;
-_veh = _this select 1;
-if (isNull _veh) exitwith {
- hintSilent "Cannot load object in vehicle";
- false;
-};
-if (speed _veh > 1) exitwith {false};
-if (((getPos _veh) select 2) > 3) exitwith {false};
-_loaded = _veh getvariable ["cse_logistics_loadedCargo_LOG",[]];
-_numberLoaded = count _loaded;
-if (_numberLoaded > 5) exitwith {
- // we need to properly implement a check for amount of cargo in vehicle
- hintSilent "This vehicle is full!";
- false;
-};
-_loaded set[ _numberLoaded, _obj];
-_veh setvariable ["cse_logistics_loadedCargo_LOG",_loaded,true];
-detach _obj;
-_obj attachTo [_veh,[0,0,100]];
-
-[[_obj, _veh, true], "cse_fnc_hideObjCargo_LOG", true, false] spawn BIS_fnc_MP;
-
-[[_obj, _veh], "logistics_ObjectLoaded"] call cse_fnc_customEventHandler_F;
-
-true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/functions/fn_unloadObject_LOG.sqf b/TO_MERGE/cse/sys_logistics/functions/fn_unloadObject_LOG.sqf
deleted file mode 100644
index 5c0fdf1c50..0000000000
--- a/TO_MERGE/cse/sys_logistics/functions/fn_unloadObject_LOG.sqf
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * fn_unloadObject_LOG.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_obj","_veh","_loaded","_numberLoaded","_position","_mTw"];
-_obj = _this select 0;
-_veh = _this select 1;
-
-if (speed _veh > 5) exitwith {
- hintSilent "Vehicle is moving to fast";
-};
-if (((getPos _veh) select 2) > 5) exitwith {
- hintSilent "Vehicle is to high";
-};
-
-_position = position _veh findEmptyPosition [0, 50, typeOf _obj];
-if (count _position < 1) exitwith {
- hintSilent "No empty space available - cannot unload cargo!";
-};
-
-_loaded = _veh getvariable ["cse_logistics_loadedCargo_LOG",[]];
-
-_numberLoaded = count _loaded;
-_loaded = _loaded - [_obj];
-_veh setvariable ["cse_logistics_loadedCargo_LOG",_loaded,true];
-detach _obj;
-
-_obj setPos _position;
-//_obj setPos [((getPos _veh) select 0), ((getPos _veh) select 1), (getPos _veh ) select 2];
-[[_obj, _veh, false], "cse_fnc_hideObjCargo_LOG", true, false] spawn BIS_fnc_MP;
-
-if ([player, _obj] call cse_fnc_canCarryObj_LOG) then {
- if ([player,_obj,[0,1.5,1],false] call cse_fnc_carryObj) then {
- hint format["Object unloaded / moving"];
- };
-} else {
- if ([player, _obj] call cse_fnc_canDragObj_LOG) then {
- [player, _obj] call cse_fnc_dragObject_LOG;
- };
-};
-
-[[_obj, _veh], "logistics_ObjectUnloaded"] call cse_fnc_customEventHandler_F;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/init_sys_logistics.sqf b/TO_MERGE/cse/sys_logistics/init_sys_logistics.sqf
deleted file mode 100644
index d93c22d582..0000000000
--- a/TO_MERGE/cse/sys_logistics/init_sys_logistics.sqf
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- NAME: init
- USAGE: CSE SYS Logistics init file
- AUTHOR: Glowbal
- RETURN: void
-
-*/
-
-
-waituntil{!isnil "cse_gui"};
-[format["LOG - Logistics Module initialised"],2] call cse_fnc_debug;
-
-_entries = [
- [localize "STR_CSE_LOG_CARRY", cse_fnc_canCarryObj_LOG, CSE_ICON_PATH + "icon_movement.paa",
- {
- if ([_this select 0,_this select 1,[0,1.5,1],false] call cse_fnc_carryObj) then {
- closeDialog 0;
- [player, "STR_CSE_LOG_MOVE_OBJECT","STR_CSE_LOG_OBJECT_PICKED_UP"] call cse_fnc_sendDisplayMessageTo;
-
- [player, 10] call cse_fnc_limitSpeed;
- };
- }, localize "STR_CSE_LOG_CARRY_OBJECT"],
-
- [localize "STR_CSE_LOG_DRAG", cse_fnc_canDragObj_LOG, CSE_ICON_PATH + "icon_movement.paa", cse_fnc_dragObject_LOG, localize "STR_CSE_LOG_DRAG_OBJECT"],
-
- [localize "STR_CSE_LOG_DROP",{(!isNull ([(_this select 0)] call cse_fnc_getCarriedObj)) && !(([(_this select 0)] call cse_fnc_getCarriedObj) isKindOf "CaManBase")}, CSE_ICON_PATH + "icon_placedown.paa",
- {
- ([_this select 0,ObjNull,[0,1,1]] call cse_fnc_carryObj);
- [player, "STR_CSE_LOG_DROPPED_OBJECT","STR_CSE_LOG_PLACED_DOWN_OBJECT"] call cse_fnc_sendDisplayMessageTo;
- closeDialog 0;
- player switchMove "";
- [player, -1] call cse_fnc_limitSpeed;
- },localize "STR_CSE_LOG_DROP_OBJECT"],
-
- [localize "STR_CSE_LOG_LOAD",{(!isNull ([(_this select 0)] call cse_fnc_getCarriedObj)) && !(([(_this select 0)] call cse_fnc_getCarriedObj) isKindOf "CaManBase")}, CSE_ICON_PATH + "icon_place_in.paa",
- {
- ([_this select 0,ObjNull,[0,1,1]] call cse_fnc_carryObj);
- if ([(_this select 1),[(_this select 1)] call cse_fnc_findVehicle_LOG] call cse_fnc_loadObject_LOG) then {
- [player, "STR_CSE_LOG_LOAD_OBJECT","STR_CSE_LOG_LOADED_OBJECT"] call cse_fnc_sendDisplayMessageTo;
- };
- player switchMove "";
- closeDialog 0;
- [player, -1] call cse_fnc_limitSpeed;
- }, localize "STR_CSE_LOG_LOAD_OBJECT"]
-];
-["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
- //call compile preprocessFile "cse\cse_sys_logistics\scripts\addactions.sqf";
-
diff --git a/TO_MERGE/cse/sys_logistics/scripts/addactions.sqf b/TO_MERGE/cse/sys_logistics/scripts/addactions.sqf
deleted file mode 100644
index 6c2de1e5fe..0000000000
--- a/TO_MERGE/cse/sys_logistics/scripts/addactions.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- NAME: Addactions
- USAGE: Adds the interaction options to objects
- AUTHOR: gobbo
- RETURN: void
-
-*/
-
-// == Carry system ==
-//CSE_Logistics_Pickup = player addaction ["Pick up object", "cse\cse_sys_logistics\scripts\carry\pickup.sqf", [], 6, false, true, "","(alive cursorTarget) AND (cursorTarget distance player <= 5) AND (cursortarget getVariable [""CSE_Logistics_Enable"", true]) AND ((cursortarget iskindof ""ReammoBox"") OR (cursortarget iskindof ""ReammoBox_F"")) && (isNull ([player] call cse_fnc_getCarriedObj))"];
-
-//CSE_Logistics_Drop = player addaction ["Drop object", "cse\cse_sys_logistics\scripts\carry\drop.sqf", [], 6, false, true, "","(!isNull ([player] call cse_fnc_getCarriedObj))"];
-
-// == Load system ==
-//CSE_Logistics_Load = player addaction ["Load object", "cse\cse_sys_logistics\scripts\load\load.sqf", [], 6, false, true, "","(!isNull ([player] call cse_fnc_getCarriedObj)) && !(([player] call cse_fnc_getCarriedObj) isKindof 'Man') "];
-
-//CSE_Logistics_Unload = player addaction ["Unload object", "cse\cse_sys_logistics\scripts\load\unload.sqf", [], 6, false, true, "","(alive cursorTarget) AND (cursorTarget distance player <= 10) AND (cursortarget getVariable [""CSE_Logistics_Loaded"", 0] > 0) AND (player getVariable [""CSE_HandsFree"", true])"];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_logistics/stringtable.xml b/TO_MERGE/cse/sys_logistics/stringtable.xml
deleted file mode 100644
index 286551b0a0..0000000000
--- a/TO_MERGE/cse/sys_logistics/stringtable.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
- Carry
- Transportar
-
-
- Carry Object
- Transportar Objeto
-
-
- Drag
- Arrastrar
-
-
- Drag Object
- Arrastrar Objeto
-
-
- Drop
- Soltar
-
-
- Drop Object
- Soltar Objeto
-
-
- Load
- Cargar
-
-
- Load Object
- Cargar Objeto
-
-
-
-
-
- Moving Object
- Moviendo Objeto
-
-
- Dropped Object
- Objeto Liberado
-
-
- Object picked up
- Objeto Tomado
-
-
-
- You start dragging the object
- Arrastrando Objeto
-
-
- You placed down the object
- Objeto Liberado
-
-
- You loaded the object in a vehicle
- Objeto cargado en el vehículo
-
-
-
-
diff --git a/TO_MERGE/cse/sys_medical/CfgFactionClasses.h b/TO_MERGE/cse/sys_medical/CfgFactionClasses.h
deleted file mode 100644
index 19f4307cb5..0000000000
--- a/TO_MERGE/cse/sys_medical/CfgFactionClasses.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgFactionClasses
-{
- class NO_CATEGORY;
- class cse_medical: NO_CATEGORY {
- displayName = "CSE Medical";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/CfgFunctions.h b/TO_MERGE/cse/sys_medical/CfgFunctions.h
deleted file mode 100644
index 88845199f1..0000000000
--- a/TO_MERGE/cse/sys_medical/CfgFunctions.h
+++ /dev/null
@@ -1,157 +0,0 @@
-class CfgFunctions {
- class CSE {
- class Medical {
- file = "cse\cse_sys_medical\functions";
- class initForUnit_CMS { recompile = 1; };
- class getSelectedBodyPart_CMS { recompile = 1; };
- class getBandageOptions_CMS { recompile = 1; };
- class getAdvancedOptions_CMS { recompile = 1; };
- class getExamineOptions_CMS { recompile = 1; };
- class getAirwayOptions_CMS { recompile = 1; };
- class getMedicationOptions_CMS { recompile = 1; };
- class getToggleOptions_CMS { recompile = 1; };
- class getTriageCardOptions_CMS { recompile = 1; };
- class getDragOptions_CMS { recompile = 1; };
- class getOptionsForCategory_CMS { recompile = 1; };
- class updateAttributes_CMS { recompile = 1; };
- class getBloodLoss_CMS { recompile = 1; };
- class effectsLoop_CMS { recompile = 1; };
- class inMedicalFacility_CMS { recompile = 1; };
- class medicClass_CMS { recompile = 1; };
- class playInjuredSound_CMS { recompile = 1; };
- class setDead_CMS { recompile = 1; };
- class setMedicRole_CMS { recompile = 1; };
- class assignMedicRoles_CMS { recompile = 1;};
- class assignMedicalFacility_CMS { recompile = 1;};
- class assignMedicalVehicle_CMS { recompile = 1; };
- class assignMedicalEquipment_CMS { recompile = 1; };
- class addOpenWounds_CMS { recompile = 1; };
- class isMedicalVehicle_CMS { recompile = 1; };
- class canAccessMedicalEquipment_CMS;
- class hasMedicalEnabled_CMS { recompile = 1; };
- class placeInBodyBag_CMS { recompile = 1; };
- class canPutInBodyBag_CMS { recompile = 1; };
- class hasOpenWounds_CMS { recompile = 1; };
- };
-
- class Blood {
- file = "cse\cse_sys_medical\functions\blood";
- class BloodConditions_CMS { recompile = 1; };
- class cardiacArrest_CMS { recompile = 1; };
- };
-
- class ActivityLog {
- file = "cse\cse_sys_medical\functions\activityLog";
- class addActivityToLog_CMS { recompile = 1; };
- class getActivityLog_CMS { recompile = 1; };
- class addToQuickViewLog_CMS { recompile = 1; };
- class getQuickViewLog_CMS { recompile = 1; };
- };
-
- class MedicalUI {
- file = "cse\cse_sys_medical\functions\ui";
- class openMenu_CMS { recompile = 1; };
- class onMenuOpen_CMS { recompile = 1; };
- class updateUIInfo_CMS { recompile = 1; };
- class displayOptions_CMS { recompile = 1; };
- class updateActivityLog_CMS { recompile = 1; };
- class updateBodyImg_CMS { recompile = 1; };
- class dropDownTriageCard_CMS { recompile = 1; };
- class updateIcons_CMS { recompile = 1; };
- class getCurrentSelectedInjuryData_CMS { recompile = 1; };
- };
-
- class handleDamage {
- file = "cse\cse_sys_medical\functions\handledamage";
- class handleDamage_CMS { recompile = 1; };
- class getBodyPartNumber_CMS { recompile = 1; };
- class getNewDamageBodyPart_CMS { recompile = 1; };
- class getTypeOfDamage_CMS { recompile = 1; };
- class assignOpenWounds_CMS { recompile = 1; };
- class assignFractures_CMS { recompile = 1; };
- class assignAirwayStatus_CMS { recompile = 1; };
- class determineIfFatal_CMS { recompile = 1; };
- class determineIfUnconscious_CMS { recompile = 1; };
- class reactionToHit_CMS { recompile = 1; };
- class increasePain_CMS { recompile = 1; };
- class damageBodyPart_CMS { recompile = 1; };
-
- };
- class BasicMedical {
- file = "cse\cse_sys_medical\functions\basic";
- class basicBandage_CMS { recompile = 1; };
- class fromNumberToBodyPart_CMS { recompile = 1; };
- };
-
- class MedicalTreatment {
- file = "cse\cse_sys_medical\functions\treatment";
- class treatmentMutex_CMS { recompile = 1; };
- class isSetTreatmentMutex_CMS { recompile = 1; };
- class bandage_CMS { recompile = 1; };
- class bandageLocal_CMS { recompile = 1; };
- class bandageOpening_CMS { recompile = 1; };
- class iv_CMS { recompile = 1; };
- class ivLocal_CMS { recompile = 1; };
- class medication_CMS { recompile = 1; };
- class medicationLocal_CMS { recompile = 1; };
- class removeTourniquet_CMS { recompile = 1; };
- class tourniquet_CMS { recompile = 1; };
- class tourniquetLocal_CMS { recompile = 1; };
- class hasTourniquetAppliedTo_CMS {recompile = 1; };
- class performCPR_CMS { recompile = 1; };
- class performCPRLocal_CMS { recompile = 1; };
- class performCPRProvider_CMS { recompile = 1; };
- class performCPRSuccess_CMS { recompile = 1; };
- class heal_CMS { recompile = 1; };
- class healLocal_CMS { recompile = 1; };
- class handleHeal_CMS { recompile = 1; };
- class treatmentAirway_CMS { recompile = 1; };
- class treatmentAirwayLocal_CMS { recompile = 1; };
- class hasEquipment_CMS { recompile = 1; };
- class useEquipment_CMS { recompile = 1; };
- class performStitching_CMS { recompile = 1; };
- };
-
- class MedicalDrag {
- file = "cse\cse_sys_medical\functions\drag";
- class switchBody_CMS { recompile = 1; };
- class drag_CMS { recompile = 1; };
- class carry_CMS { recompile = 1; };
- class drop_CMS { recompile = 1; };
- };
-
- class MedicalLoading {
- file = "cse\cse_sys_medical\functions\loading";
- class load_CMS { recompile = 1; };
- class loadLocal_CMS { recompile = 1; };
- class unload_CMS { recompile = 1; };
- };
-
- class MedicalExamine {
- file = "cse\cse_sys_medical\functions\examine";
- class checkPulseLocal_CMS { recompile = 1; };
- class checkBloodPressureLocal_CMS { recompile = 1; };
- class checkPulse_CMS { recompile = 1; };
- class checkBloodPressure_CMS { recompile = 1; };
- class checkResponse_CMS { recompile = 1; };
- };
-
- class TriageCard {
- file = "cse\cse_sys_medical\functions\triage";
- class getTriageList_CMS { recompile = 1; };
- class addToTriageList_CMS { recompile = 1; };
- class setTriageStatus_CMS { recompile = 1; };
- class getTriageStatus_CMS { recompile = 1; };
- };
-
- class Vitals {
- file = "cse\cse_sys_medical\functions\vitals";
- class updateVitals_CMS { recompile = 1; };
- class getHeartRateChange_CMS { recompile = 1; };
- class getBloodVolumeChange_CMS { recompile = 1; };
- class getBloodPressure_CMS { recompile = 1; };
- class addHeartRateAdjustment_CMS { recompile = 1; };
- class getCardiacOutput_CMS { recompile = 1; };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/CfgHints.h b/TO_MERGE/cse/sys_medical/CfgHints.h
deleted file mode 100644
index ac1b693273..0000000000
--- a/TO_MERGE/cse/sys_medical/CfgHints.h
+++ /dev/null
@@ -1,38 +0,0 @@
-class CfgHints
-{
- class Combat_Space_Enhancement
- {
- displayName = "Combat Space Enhancement";
- class CSE_CMS_Module
- {
- displayName = "Combat Medical System";
- displayNameShort = "Combat Medical System";
- description = "Combat Medical System is an advanced medical system for players and AI.";
- tip = "";
- arguments[] = {};
- image = "";
- noImage = true;
- };
- class Assessment
- {
- displayName = "Patient Assessment";
- displayNameShort = "Patient Assessment";
- description = "It is essential when treating a casualty that you fully assess each of the areas of the casualty to determine not only the injuries but the priority of each in severity. You cna assess a patient by clicking on the Assessment ICON Use Check Pulse, check Blood Pressure and Check Response to get an overview.";
- tip = "Medics will get a faster and more accurate result when assessing patients.";
- arguments[] = {};
- image = "";
- noImage = true;
- };
-
- class Bleeding
- {
- displayName = "Bandaging a wound";
- displayNameShort = "Bandaging a wound";
- description = "For casualties the first priority is to stop the bleeding. You will want to bandage the largest wounds first, before attending to the smaller ones. You can apply a tourniquet on the limbs to stem the bleeding faster, but remember to remove it!";
- tip = "Select a wound in the injury list to bandage that one first!";
- arguments[] = {};
- image = "";
- noImage = true;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/CfgMagazines.h b/TO_MERGE/cse/sys_medical/CfgMagazines.h
deleted file mode 100644
index d3f2e51356..0000000000
--- a/TO_MERGE/cse/sys_medical/CfgMagazines.h
+++ /dev/null
@@ -1,224 +0,0 @@
-class CfgMagazines
-{
- class Default;
- class CA_magazine: Default{};
- class cse_backwardsCompatMagazineBase_CMS: CA_magazine {};
- class cse_bandage_basic: cse_backwardsCompatMagazineBase_CMS
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_BANDAGE_BASIC_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\field_dressing.paa";
- model = "\cse\cse_sys_medical\equipment\bandages\fielddressing.p3d";
- descriptionShort = $STR_CSE_MAG_BANDAGE_BASIC_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_BANDAGE_BASIC_DESC_USE;
- mass = 0.5;
- };
- class cse_packing_bandage: cse_backwardsCompatMagazineBase_CMS
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_PACKING_BANDAGE_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\packing_bandage.paa";
- descriptionShort = $STR_CSE_MAG_PACKING_BANDAGE_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_PACKING_BANDAGE_DESC_USE;
- mass = 1;
- // model = "\A3\Structures_F_EPA\Items\Medical\Bandage_F.p3d";
- model = "\cse\cse_sys_medical\equipment\bandages\packingbandage.p3d";
- };
- class cse_bandageElastic: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_BANDAGE_ELASTIC_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\bandageElastic.paa";
- model = "\A3\Structures_F_EPA\Items\Medical\Bandage_F.p3d";
- descriptionShort = $STR_CSE_MAG_BANDAGE_ELASTIC_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_BANDAGE_ELASTIC_DESC_USE;
- mass = 1;
- };
- class cse_tourniquet: cse_backwardsCompatMagazineBase_CMS
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_TOURNIQUET_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\tourniquet.paa";
- model = "\cse\cse_sys_medical\equipment\Tourniquet.p3d";
- descriptionShort = $STR_CSE_MAG_TOURNIQUET_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_TOURNIQUET_DESC_USE;
- mass = 1;
- };
- class cse_splint: cse_backwardsCompatMagazineBase_CMS
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_SPLINT_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\splint.paa";
- descriptionUse = $STR_CSE_MAG_SPLINT_DESC_USE;
- descriptionShort = $STR_CSE_MAG_SPLINT_DESC_SHORT;
- mass = 1;
- };
- class cse_morphine: cse_backwardsCompatMagazineBase_CMS
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_MORPHINE_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\morphine.paa";
- model = "\cse\cse_sys_medical\equipment\Morphinpen.p3d";
- descriptionShort = $STR_CSE_MAG_MORPHINE_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_MORPHINE_DESC_USE;
- mass = 1;
- };
- class cse_atropine: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_ATROPINE_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\atropine.paa";
- model = "\cse\cse_sys_medical\equipment\Atropin-pen.p3d";
- descriptionShort = $STR_CSE_MAG_ATROPINE_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_ATROPINE_DESC_USE;
- mass = 1;
- };
- class cse_epinephrine: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_EPINEPHRINE_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\epinephrine.paa";
- model = "\cse\cse_sys_medical\equipment\Epipen.p3d";
- descriptionShort = $STR_CSE_MAG_EPINEPHRINE_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_EPINEPHRINE_DESC_USE;
- mass = 1;
- };
- class cse_plasma_iv: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- mass = 1;
- displayName = $STR_CSE_MAG_PLASMA_IV;
- picture = "\cse\cse_sys_medical\equipment\img\plasma_iv.paa";
- descriptionShort = $STR_CSE_MAG_PLASMA_IV_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_PLASMA_IV_DESC_USE;
- };
- class cse_plasma_iv_500: cse_plasma_iv {
- displayName = $STR_CSE_MAG_PLASMA_IV_500;
- };
- class cse_plasma_iv_250: cse_plasma_iv_500 {
- displayName = $STR_CSE_MAG_PLASMA_IV_250;
- };
- class cse_blood_iv: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- mass = 1;
- model = "\A3\Structures_F_EPA\Items\Medical\BloodBag_F.p3d";
- displayName = $STR_CSE_MAG_BLOOD_IV;
- picture = "\cse\cse_sys_medical\equipment\img\bloodbag.paa";
- descriptionShort = $STR_CSE_MAG_BLOOD_IV_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_BLOOD_IV_DESC_USE;
- };
- class cse_blood_iv_500: cse_blood_iv {
- displayName = $STR_CSE_MAG_BLOOD_IV_500;
- };
- class cse_blood_iv_250: cse_blood_iv_500 {
- displayName = $STR_CSE_MAG_BLOOD_IV_250;
- };
- class cse_saline_iv: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- mass = 1;
- displayName = $STR_CSE_MAG_SALINE_IV;
- picture = "\cse\cse_sys_medical\equipment\img\saline_iv.paa";
- descriptionShort = $STR_CSE_MAG_SALINE_IV_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_SALINE_IV_DESC_USE;
- };
- class cse_saline_iv_500: cse_saline_iv {
- displayName = $STR_CSE_MAG_SALINE_IV_500;
- };
- class cse_saline_iv_250: cse_saline_iv_500 {
- displayName = $STR_CSE_MAG_SALINE_IV_250;
- };
- class cse_quikclot: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_QUIKCLOT_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\quickclot.paa";
- descriptionShort = $STR_CSE_MAG_QUIKCLOT_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_QUIKCLOT_DESC_USE;
- mass = 1;
- };
- class cse_nasopharyngeal_tube: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_NPA_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\nasopharyngeal_tube.paa";
- descriptionUse = $STR_CSE_MAG_NPA_DESC_USE;
- descriptionShort = $STR_CSE_MAG_NPA_DESC_SHORT;
- mass = 1;
- };
- class cse_opa: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_OPA_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\nasopharyngeal_tube.paa";
- descriptionShort = $STR_CSE_MAG_OPA_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_OPA_DESC_USE;
- mass = 1;
- };
- class cse_liquidSkin: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_LIQUID_SKIN_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\liquidSkin.paa";
- model = "\cse\cse_sys_medical\equipment\skinliquid.p3d";
- descriptionShort = $STR_CSE_MAG_LIQUID_SKIN_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_LIQUID_SKIN_DESC_USE;
- mass = 1;
- };
- class cse_chestseal: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_CHEST_SEAL_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\chestseal.paa";
- descriptionShort = $STR_CSE_MAG_CHEST_SEAL_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_CHEST_SEAL_DESC_USE;
- mass = 1;
- };
- class cse_personal_aid_kit: cse_backwardsCompatMagazineBase_CMS {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_AID_KIT_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\personal_aid_kit.paa";
- model = "\cse\cse_sys_medical\equipment\Personal-aidkits\MTP.p3d";
- descriptionShort = $STR_CSE_MAG_AID_KIT_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_AID_KIT_DESC_USE;
- mass = 2;
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/CfgSounds.h b/TO_MERGE/cse/sys_medical/CfgSounds.h
deleted file mode 100644
index 6249bbe13a..0000000000
--- a/TO_MERGE/cse/sys_medical/CfgSounds.h
+++ /dev/null
@@ -1,45 +0,0 @@
-class CfgSounds
-{
- class cse_heartbeat_fast_1
- {
- name = "cse_heartbeat_fast_1";
- sound[] = {"cse\cse_sys_medical\sounds\heart_beats\fast_1.wav","db-1",1};
- titles[] = {};
- };
- class cse_heartbeat_fast_2
- {
- name = "cse_heartbeat_fast_2";
- sound[] = {"cse\cse_sys_medical\sounds\heart_beats\fast_2.wav","db-1",1};
- titles[] = {};
- };
- class cse_heartbeat_fast_3
- {
- name = "cse_heartbeat_fast_3";
- sound[] = {"cse\cse_sys_medical\sounds\heart_beats\fast_3.wav","db-1",1};
- titles[] = {};
- };
- class cse_heartbeat_norm_1
- {
- name = "cse_heartbeat_norm_1";
- sound[] = {"cse\cse_sys_medical\sounds\heart_beats\norm_1.wav","db-1",1};
- titles[] = {};
- };
- class cse_heartbeat_norm_2
- {
- name = "cse_heartbeat_norm_2";
- sound[] = {"cse\cse_sys_medical\sounds\heart_beats\norm_2.wav","db-1",1};
- titles[] = {};
- };
- class cse_heartbeat_slow_1
- {
- name = "cse_heartbeat_slow_1";
- sound[] = {"cse\cse_sys_medical\sounds\heart_beats\slow_1.wav","db-1",1};
- titles[] = {};
- };
- class cse_heartbeat_slow_2
- {
- name = "cse_heartbeat_slow_2";
- sound[] = {"cse\cse_sys_medical\sounds\heart_beats\slow_2.wav","db-1",1};
- titles[] = {};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/CfgVehicles.h b/TO_MERGE/cse/sys_medical/CfgVehicles.h
deleted file mode 100644
index f7f084a6e8..0000000000
--- a/TO_MERGE/cse/sys_medical/CfgVehicles.h
+++ /dev/null
@@ -1,762 +0,0 @@
-class CfgVehicles
-{
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class cse_sys_medical: Module_F {
- scope = 2;
- displayName = "Combat Medical System [CSE]";
- icon = "\cse\cse_main\data\cse_medical_module.paa";
- category = "cse_medical";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class openingOfWounds {
- displayName = "Advanced Wounds";
- description = "When set to true, bandaged wounds could on occasion re-open, resulting in new open wounds that need to be bandaged.";
- typeName = "BOOL";
- defaultValue = 1;
- };
- class medicSetting {
- displayName = "Advanced Medic roles";
- description = "Medics only are able to view the detailed information";
- typeName = "BOOL";
- defaultValue = 1;
- };
- class difficultySetting {
- displayName = "Survival Difficulty";
- description = "Select the aggressiveness of the medical simulation";
- typeName = "NUMBER";
- class values {
- class recruit {
- name = "Recruit";
- value = 0.5;
- };
- class regular {
- name = "Regular";
- value = 1;
- default = 1;
- };
- class veteran {
- name = "Veteran";
- value = 1.2;
- };
- class expert {
- name = "Expert";
- value = 1.5;
- };
- };
- };
- class enableFor {
- displayName = "Enabled for";
- description = "Select what units CMS will be enabled for";
- typeName = "NUMBER";
- class values {
- class playableUnits {
- name = "Players only";
- value = 0;
- default = 1;
- };
- class playableUnitsAndAI {
- name = "Players and AI";
- value = 1;
- };
- };
- };
- class enableAirway {
- displayName = "Enable Airway";
- description = "Should CMS Airway system be enabled?";
- typeName = "NUMBER";
- class values {
- class enable {
- name = "Yes";
- value = 1;
- };
- class disable {
- name = "No";
- value = 0;
- default = 1;
- };
- };
- };
- class vehCrashes {
- displayName = "Vehicle Crashes";
- description = "Enable injuries on vehicle crashes";
- typeName = "BOOL";
- defaultValue = 1;
- };
-
- class aidKitUponUsage {
- displayName = "Disposable Aid kit";
- description = "Is a personal aid kit disposable?";
- typeName = "BOOL";
- defaultValue = false;
- };
- class aidKitMedicsOnly {
- displayName = "Medics only";
- description = "Are aid kits restricted to medics only?";
- typeName = "BOOL";
- defaultValue = false;
- };
- class aidKitRestrictions {
- displayName = "Aid kit";
- description = "When can an Aid kit be used?";
- typeName = "NUMBER";
- class values {
- class medFacility {
- name = "Medical Facility";
- value = 0;
- default = 1;
- };
- class medFAcilityNoBleeding {
- name = "Medical Facility & No bleeding";
- value = 1;
- };
- class Everywhere {
- name = "Everywhere";
- value = 2;
- };
- class EverywhereNoBleeding {
- name = "Everywhere & No Bleeding";
- value = 3;
- };
- };
- };
- class bandageTime {
- displayName = "Bandage Time";
- description = "Time it takes for a bandage action to be completed";
- typeName = "NUMBER";
- defaultValue = 5;
- };
- class stitchingAllow {
- displayName = "Can Stitch";
- description = "What units can use stitching?";
- typeName = "NUMBER";
- defaultValue = 0;
- class values {
- class medicsOnly {
- name = "Medics Only";
- value = 0;
- default = 1;
- };
- class everyone {
- name = "Everyone";
- value = 1;
- };
- class noOne {
- name = "No units";
- value = -1;
- };
- };
- };
-
- };
- class ModuleDescription {
- description = "Provides a more realistic medical system for both players and AI."; // Short description, will be formatted as structured text
- sync[] = {};
- };
- };
- class cse_assignMedicRoles_CMS: Module_F {
- scope = 2;
- displayName = "Set Medic Class [CSE]";
- icon = "\cse\cse_main\data\cse_medical_module.paa";
- category = "cse_medical";
- function = "cse_fnc_assignMedicRoles_CMS";
- functionPriority = 10;
- isGlobal = 2;
- isTriggerActivated = 0;
- isDisposable = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class EnableList {
- displayName = "List";
- description = "List of unit names that will be classified as medic, separated by commas.";
- defaultValue = "";
- };
- class class {
- displayName = "Is Medic";
- description = "Medics allow for more advanced treatment in case of Advanced Medic roles enabled";
- typeName = "BOOL";
- defaultValue = true;
- };
- };
- class ModuleDescription {
- description = "Assigns the CSE medic class to a unit"; // Short description, will be formatted as structured text
- sync[] = {};
- };
- };
-
- class cse_assignMedicalVehicle_CMS: Module_F {
- scope = 2;
- displayName = "set Medical Vehicle [CSE]";
- icon = "\cse\cse_main\data\cse_medical_module.paa";
- category = "cse_medical";
- function = "cse_fnc_assignMedicalVehicle_CMS";
- functionPriority = 10;
- isGlobal = 2;
- isTriggerActivated = 0;
- isDisposable = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class EnableList {
- displayName = "List";
- description = "List of object names that will be classified as medical vehicle, separated by commas.";
- defaultValue = "";
- };
- class enabled {
- displayName = "Is Medical Vehicle";
- description = "Whatever or not the objects in the list will be a medical vehicle.";
- typeName = "BOOL";
- defaultValue = true;
- };
- };
- class ModuleDescription {
- description = "Assigns the CSE medical vehicle class to a vehicle.";
- sync[] = {};
- };
- };
-
- class cse_assignMedicalFacility_CMS: Module_F {
- scope = 2;
- displayName = "Set Medical Facility [CSE]";
- icon = "\cse\cse_main\data\cse_medical_module.paa";
- category = "cse_medical";
- function = "cse_fnc_assignMedicalFacility_CMS";
- functionPriority = 10;
- isGlobal = 2;
- isTriggerActivated = 0;
- isDisposable = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class class {
- displayName = "Is Medical Facility";
- description = "Registers an object as a medical facility for CMS";
- typeName = "BOOL";
- };
- };
- class ModuleDescription {
- description = "Defines an object as a medical facility for CMS. This allows for more advanced treatments. Can be used on buildings and vehicles. ";
- sync[] = {};
- };
- };
- class cse_assignMedicalEquipment_CMS: Module_F {
- scope = 2;
- displayName = "Assign Medical Equipment [CSE]";
- icon = "\cse\cse_main\data\cse_medical_module.paa";
- category = "cse_medical";
- function = "cse_fnc_assignMedicalEquipment_CMS";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class equipment {
- displayName = "Assign Equipment";
- description = "Assign Medical equipment to all players";
- typeName = "NUMBER";
- defaultValue = 0;
- class values {
- class AllPlayers {
- name = "All Players";
- value = 0;
- default = 1;
- };
- class MedicsOnly {
- name = "Medics only";
- value = 1;
- };
- };
- };
- };
- class ModuleDescription {
- description = "Assigns medical equipment to units";
- sync[] = {};
- };
- };
-
-
- class MapBoard_altis_F;
- class cse_bodyBag: MapBoard_altis_F {
- scope = 1;
- side = -1;
- model = "\cse\cse_sys_medical\equipment\bodybag.p3d";
- icon = "";
- displayName = $STR_CSE_MAG_BODYBAG_DISPLAY;
- };
-
-
- class Item_Base_F;
- class cse_bandage_basicItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_BANDAGE_BASIC_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_bandage_basic
- {
- name = "cse_bandage_basic";
- count = 1;
- };
- };
- };
- class cse_packing_bandageItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_PACKING_BANDAGE_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_packing_bandage
- {
- name = "cse_packing_bandage";
- count = 1;
- };
- };
- };
- class cse_bandageElasticItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_BANDAGE_ELASTIC_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_bandageElastic
- {
- name = "cse_bandageElastic";
- count = 1;
- };
- };
- };
- class cse_tourniquetItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_TOURNIQUET_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_tourniquet
- {
- name = "cse_tourniquet";
- count = 1;
- };
- };
- };
- class cse_splintItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_SPLINT_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_splint
- {
- name = "cse_splint";
- count = 1;
- };
- };
- };
- class cse_morphineItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_MORPHINE_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_morphine
- {
- name = "cse_morphine";
- count = 1;
- };
- };
- };
- class cse_atropineItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_ATROPINE_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_atropine
- {
- name = "cse_atropine";
- count = 1;
- };
- };
- };
- class cse_epinephrineItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_EPINEPHRINE_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_epinephrine
- {
- name = "cse_epinephrine";
- count = 1;
- };
- };
- };
- class cse_plasma_ivItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_PLASMA_IV;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_plasma_iv
- {
- name = "cse_plasma_iv";
- count = 1;
- };
- };
- };
- class cse_plasma_iv_500Item: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_PLASMA_IV_500;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_plasma_iv_500
- {
- name = "cse_plasma_iv_500";
- count = 1;
- };
- };
- };
- class cse_plasma_iv_250Item: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_PLASMA_IV_250;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_plasma_iv_250
- {
- name = "cse_plasma_iv_250";
- count = 1;
- };
- };
- };
- class cse_blood_ivItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_BLOOD_IV;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_blood_iv
- {
- name = "cse_blood_iv";
- count = 1;
- };
- };
- };
- class cse_blood_iv_500Item: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_BLOOD_IV_500;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_blood_iv_500
- {
- name = "cse_blood_iv_500";
- count = 1;
- };
- };
- };
- class cse_blood_iv_250Item: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_BLOOD_IV_250;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_blood_iv_250
- {
- name = "cse_blood_iv_250";
- count = 1;
- };
- };
- };
- class cse_saline_ivItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_SALINE_IV;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_saline_iv
- {
- name = "cse_saline_iv";
- count = 1;
- };
- };
- };
- class cse_saline_iv_500Item: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_SALINE_IV_500;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_saline_iv_500
- {
- name = "cse_saline_iv_500";
- count = 1;
- };
- };
- };
- class cse_saline_iv_250Item: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_SALINE_IV_250;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_saline_iv_250
- {
- name = "cse_saline_iv_250";
- count = 1;
- };
- };
- };
- class cse_quikclotItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_QUIKCLOT_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_quikclot
- {
- name = "cse_quikclot";
- count = 1;
- };
- };
- };
- class cse_nasopharyngeal_tubeItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_NPA_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_nasopharyngeal_tube
- {
- name = "cse_nasopharyngeal_tube";
- count = 1;
- };
- };
- };
- class cse_opaItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_OPA_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_opa
- {
- name = "cse_opa";
- count = 1;
- };
- };
- };
- class cse_liquidSkinItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_LIQUID_SKIN_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_liquidSkin
- {
- name = "cse_liquidSkin";
- count = 1;
- };
- };
- };
- class cse_chestsealItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_CHEST_SEAL_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_chestseal
- {
- name = "cse_chestseal";
- count = 1;
- };
- };
- };
- class cse_personal_aid_kitItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_AID_KIT_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_personal_aid_kit
- {
- name = "cse_personal_aid_kit";
- count = 1;
- };
- };
- };
- class cse_bodyBagItem: Item_Base_F {
- scope = 2;
- scopeCurator = 2;
- displayName = $STR_CSE_MAG_BODYBAG_DISPLAY;
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_itemBodyBag
- {
- name = "cse_itemBodyBag";
- count = 1;
- };
- };
- };
-
-
- class NATO_Box_Base;
- class cse_medical_supply_crate_cms : NATO_Box_Base {
- scope = 2;
- accuracy = 1000;
- displayName = "Medical Supply Crate (CSE)";
- model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
- author = "Combat Space Enhancement";
- class TransportItems {
- class cse_bandage_basic {
- name = "cse_bandage_basic";
- count = 25;
- };
- class cse_packing_bandage {
- name = "cse_packing_bandage";
- count = 25;
- };
- class cse_tourniquet {
- name = "cse_tourniquet";
- count = 25;
- };
- class cse_splint {
- name = "cse_splint";
- count = 25;
- };
- class cse_plasma_iv {
- name = "cse_plasma_iv";
- count = 25;
- };
- class cse_plasma_iv_500 {
- name = "cse_plasma_iv_500";
- count = 25;
- };
- class cse_plasma_iv_250 {
- name = "cse_plasma_iv_250";
- count = 25;
- };
- class cse_blood_iv {
- name = "cse_blood_iv";
- count = 25;
- };
- class cse_blood_iv_500 {
- name = "cse_blood_iv_500";
- count = 25;
- };
- class cse_blood_iv_250 {
- name = "cse_blood_iv_250";
- count = 25;
- };
- class cse_saline_iv {
- name = "cse_saline_iv";
- count = 25;
- };
- class cse_saline_iv_500 {
- name = "cse_saline_iv_500";
- count = 25;
- };
- class cse_saline_iv_250 {
- name = "cse_saline_iv_250";
- count = 25;
- };
- class cse_morphine {
- name = "cse_morphine";
- count = 25;
- };
- class cse_epinephrine {
- name = "cse_epinephrine";
- count = 25;
- };
- class cse_atropine {
- name = "cse_atropine";
- count = 25;
- };
- class cse_quikclot {
- name = "cse_quikclot";
- count = 25;
- };
- class cse_nasopharyngeal_tube {
- name = "cse_nasopharyngeal_tube";
- count = 25;
- };
- class cse_bandageElastic {
- name = "cse_bandageElastic";
- count = 25;
- };
- class cse_liquidSkin {
- name = "cse_liquidSkin";
- count = 25;
- };
- class cse_chestseal {
- name = "cse_chestseal";
- count = 25;
- };
- class cse_personal_aid_kit {
- name = "cse_personal_aid_kit";
- count = 25;
- };
- class cse_surgical_kit {
- name = "cse_surgical_kit";
- count = 25;
- };
- class cse_itemBodyBag {
- name = "cse_itemBodyBag";
- count = 5;
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/CfgWeapons.h b/TO_MERGE/cse/sys_medical/CfgWeapons.h
deleted file mode 100644
index 02bfc614c4..0000000000
--- a/TO_MERGE/cse/sys_medical/CfgWeapons.h
+++ /dev/null
@@ -1,317 +0,0 @@
-class CfgWeapons {
- class ItemCore;
- class InventoryItem_Base_F;
- class cse_bandage_basic: ItemCore
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_BANDAGE_BASIC_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\field_dressing.paa";
- model = "\cse\cse_sys_medical\equipment\bandages\fielddressing.p3d";
- descriptionShort = $STR_CSE_MAG_BANDAGE_BASIC_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_BANDAGE_BASIC_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=0.5;
- type=201;
- };
- };
- class cse_packing_bandage: ItemCore
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_PACKING_BANDAGE_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\packing_bandage.paa";
- descriptionShort = $STR_CSE_MAG_PACKING_BANDAGE_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_PACKING_BANDAGE_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- model = "\cse\cse_sys_medical\equipment\bandages\packingbandage.p3d";
- };
- class cse_bandageElastic: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_BANDAGE_ELASTIC_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\bandageElastic.paa";
- model = "\A3\Structures_F_EPA\Items\Medical\Bandage_F.p3d";
- descriptionShort = $STR_CSE_MAG_BANDAGE_ELASTIC_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_BANDAGE_ELASTIC_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_tourniquet: ItemCore
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_TOURNIQUET_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\tourniquet.paa";
- model = "\cse\cse_sys_medical\equipment\Tourniquet.p3d";
- descriptionShort = $STR_CSE_MAG_TOURNIQUET_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_TOURNIQUET_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_splint: ItemCore
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_SPLINT_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\splint.paa";
- descriptionUse = $STR_CSE_MAG_SPLINT_DESC_USE;
- descriptionShort = $STR_CSE_MAG_SPLINT_DESC_SHORT;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_morphine: ItemCore
- {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_MORPHINE_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\morphine.paa";
- model = "\cse\cse_sys_medical\equipment\Morphinpen.p3d";
- descriptionShort = $STR_CSE_MAG_MORPHINE_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_MORPHINE_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_atropine: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_ATROPINE_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\atropine.paa";
- model = "\cse\cse_sys_medical\equipment\Atropin-pen.p3d";
- descriptionShort = $STR_CSE_MAG_ATROPINE_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_ATROPINE_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_epinephrine: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_EPINEPHRINE_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\epinephrine.paa";
- model = "\cse\cse_sys_medical\equipment\Epipen.p3d";
- descriptionShort = $STR_CSE_MAG_EPINEPHRINE_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_EPINEPHRINE_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_plasma_iv: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- displayName = $STR_CSE_MAG_PLASMA_IV;
- picture = "\cse\cse_sys_medical\equipment\img\plasma_iv.paa";
- descriptionShort = $STR_CSE_MAG_PLASMA_IV_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_PLASMA_IV_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_plasma_iv_500: cse_plasma_iv {
- displayName = $STR_CSE_MAG_PLASMA_IV_500;
- };
- class cse_plasma_iv_250: cse_plasma_iv_500 {
- displayName = $STR_CSE_MAG_PLASMA_IV_250;
- };
- class cse_blood_iv: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- model = "\A3\Structures_F_EPA\Items\Medical\BloodBag_F.p3d";
- displayName = $STR_CSE_MAG_BLOOD_IV;
- picture = "\cse\cse_sys_medical\equipment\img\bloodbag.paa";
- descriptionShort = $STR_CSE_MAG_BLOOD_IV_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_BLOOD_IV_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_blood_iv_500: cse_blood_iv {
- displayName = $STR_CSE_MAG_BLOOD_IV_500;
- };
- class cse_blood_iv_250: cse_blood_iv_500 {
- displayName = $STR_CSE_MAG_BLOOD_IV_250;
- };
- class cse_saline_iv: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- displayName = $STR_CSE_MAG_SALINE_IV;
- picture = "\cse\cse_sys_medical\equipment\img\saline_iv.paa";
- descriptionShort = $STR_CSE_MAG_SALINE_IV_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_SALINE_IV_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_saline_iv_500: cse_saline_iv {
- displayName = $STR_CSE_MAG_SALINE_IV_500;
- };
- class cse_saline_iv_250: cse_saline_iv_500 {
- displayName = $STR_CSE_MAG_SALINE_IV_250;
- };
- class cse_quikclot: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_QUIKCLOT_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\quickclot.paa";
- descriptionShort = $STR_CSE_MAG_QUIKCLOT_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_QUIKCLOT_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_nasopharyngeal_tube: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_NPA_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\nasopharyngeal_tube.paa";
- descriptionUse = $STR_CSE_MAG_NPA_DESC_USE;
- descriptionShort = $STR_CSE_MAG_NPA_DESC_SHORT;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_opa: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_OPA_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\nasopharyngeal_tube.paa";
- descriptionShort = $STR_CSE_MAG_OPA_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_OPA_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_liquidSkin: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_LIQUID_SKIN_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\liquidSkin.paa";
- model = "\cse\cse_sys_medical\equipment\skinliquid.p3d";
- descriptionShort = $STR_CSE_MAG_LIQUID_SKIN_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_LIQUID_SKIN_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_chestseal: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_CHEST_SEAL_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\chestseal.paa";
- descriptionShort = $STR_CSE_MAG_CHEST_SEAL_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_CHEST_SEAL_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=1;
- type=201;
- };
- };
- class cse_personal_aid_kit: ItemCore {
- scope = 2;
- value = 1;
- count = 1;
- type = 16;
- displayName = $STR_CSE_MAG_AID_KIT_DISPLAY;
- picture = "\cse\cse_sys_medical\equipment\img\personal_aid_kit.paa";
- model = "\cse\cse_sys_medical\equipment\Personal-aidkits\MTP.p3d";
- descriptionShort = $STR_CSE_MAG_AID_KIT_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_AID_KIT_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass=2;
- type=201;
- };
- };
- class cse_surgical_kit: ItemCore
- {
- scope=2;
- displayName= $STR_CSE_MAG_SURGICALKIT_DISPLAY;
- model="\cse\cse_sys_medical\equipment\surgical_kit.p3d";
- picture="\cse\cse_sys_medical\equipment\img\surgical_kit.paa";
- descriptionShort = $STR_CSE_MAG_SURGICALKIT_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_SURGICALKIT_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass= 5;
- type=201;
- };
- };
- class cse_itemBodyBag: ItemCore
- {
- scope=2;
- displayName= $STR_CSE_MAG_BODYBAG_DISPLAY;
- model="\cse\cse_sys_medical\equipment\bodybagItem.p3d";
- picture="\cse\cse_sys_medical\equipment\img\bodybag.paa";
- descriptionShort = $STR_CSE_MAG_BODYBAG_DESC_SHORT;
- descriptionUse = $STR_CSE_MAG_BODYBAG_DESC_USE;
- class ItemInfo: InventoryItem_Base_F
- {
- mass= 15;
- type=201;
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_medical/Combat_Space_Enhancement.h
deleted file mode 100644
index 1b043d924a..0000000000
--- a/TO_MERGE/cse/sys_medical/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#define MENU_KEYBINDING 1
-#define ACTION_KEYBINDING 2
-#define CLIENT_SETTING 3
-
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_sys_medical {
- init = "call compile preprocessFile 'cse\cse_sys_medical\init_sys_medical.sqf';";
- name = "Combat Medical System";
- class EventHandlers {
- class CAManBase {
- init = "_this call cse_fnc_initForUnit_CMS;";
- handleDamage = "_this call cse_fnc_handleDamage_CMS;";
- handleHeal = "_this call cse_fnc_handleHeal_CMS;";
- killed = "_this call cse_eh_killed_CMS;";
- local = "_this call cse_eh_local_CMS;";
- };
- };
- class Configurations {
- class combat_medical_system_openMenu {
- type = MENU_KEYBINDING;
- title = $STR_OPEN_CMS_MENU_TITLE;
- description = $STR_OPEN_CMS_MENU_DESC;
- value[] = {0,0,0,0};
- onPressed = "[] call cse_fnc_openMenu_CMS";
- idd = 314412;
- };
- };
- };
- };
-
- class CustomEventHandlers {
- class getMedicationOptions_CMS {}; // [target]
- class getExamineOptions_CMS {}; // [target]
- class getDragOptions_CMS {}; // [target]
- class getBandageOptions_CMS {}; // [target]
- class getAirwayOptions_CMS {}; // [target]
- class getAdvancedOptions_CMS {}; // [target]
- class onDropInjured {}; // [_caller, _unit, number (0=from drag, 1=from carry)]
- class onDragInjured {}; // [_caller, _unit]
- class onCarryInjured {}; // [_caller, _unit]
-
- class setUnconsciousState {
- class cse_sys_medical_onUnconscious {
- onCall = "_this call cse_fnc_onUnconscious_CMS;";
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/bodyParts.h b/TO_MERGE/cse/sys_medical/bodyParts.h
deleted file mode 100644
index 1838cecfd1..0000000000
--- a/TO_MERGE/cse/sys_medical/bodyParts.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define HEAD 0
-#define TORSO 1
-#define ARM_R 2
-#define ARM_L 3
-#define LEG_R 4
-#define LEG_L 5
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/config.cpp b/TO_MERGE/cse/sys_medical/config.cpp
deleted file mode 100644
index dcc8ad4f36..0000000000
--- a/TO_MERGE/cse/sys_medical/config.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#define _ARMA_
-class CfgPatches
-{
- class cse_sys_medical
- {
- units[] = {"cse_medical_supply_crate_cms", "cse_bandage_basicItem","cse_packing_bandageItem","cse_bandageElasticItem","cse_tourniquetItem","cse_splintItem","cse_morphineItem","cse_atropineItem","cse_epinephrineItem","cse_plasma_ivItem","cse_plasma_iv_500Item","cse_plasma_iv250Item","cse_blood_ivItem","cse_blood_iv_500Item","cse_blood_iv_250Item","cse_saline_ivItem","cse_saline_iv_500Item","cse_saline_iv_250Item","cse_quikclotItem","cse_nasopharyngeal_tubeItem","cse_opaItem","cse_liquidSkinItem","cse_chestsealItem","cse_personal_aid_kitItem"};
- weapons[] = {"cse_surgical_kit"};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_gui","cse_main"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_medical {
- list[] = {"cse_sys_medical"};
- };
- };
-};
-#include "CfgFactionClasses.h"
-#include "CfgFunctions.h"
-
-// TODO To be removed at a later stage, as it is being replaced by items (CfgWeapons.h). Will stay around for backwards compatability for now.
-// #include "CfgMagazines.h"
-
-// Replacing the old magazine approach by items.
-#include "CfgWeapons.h"
-
-
-#include "CfgSounds.h"
-#include "CfgVehicles.h"
-#include "CfgHints.h"
-#include "Combat_Space_Enhancement.h"
-#include "ui\define.hpp"
-#include "ui\menu.hpp"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/data/body_arm_left.paa b/TO_MERGE/cse/sys_medical/data/body_arm_left.paa
deleted file mode 100644
index 245cc4ba31..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_arm_left.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_arm_right.paa b/TO_MERGE/cse/sys_medical/data/body_arm_right.paa
deleted file mode 100644
index 2023d1e0b4..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_arm_right.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_arms.paa b/TO_MERGE/cse/sys_medical/data/body_arms.paa
deleted file mode 100644
index b4b272f73d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_arms.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_background.paa b/TO_MERGE/cse/sys_medical/data/body_background.paa
deleted file mode 100644
index d3f7440e68..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_background.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_head.paa b/TO_MERGE/cse/sys_medical/data/body_head.paa
deleted file mode 100644
index 77ddd995bc..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_head.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_img-arms.paa b/TO_MERGE/cse/sys_medical/data/body_img-arms.paa
deleted file mode 100644
index f469a59359..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_img-arms.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_img-head.paa b/TO_MERGE/cse/sys_medical/data/body_img-head.paa
deleted file mode 100644
index 2f7d15e1ca..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_img-head.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_img-legs.paa b/TO_MERGE/cse/sys_medical/data/body_img-legs.paa
deleted file mode 100644
index 35f68d8635..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_img-legs.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_img-torso.paa b/TO_MERGE/cse/sys_medical/data/body_img-torso.paa
deleted file mode 100644
index cc5ecb9d60..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_img-torso.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_leg_left.paa b/TO_MERGE/cse/sys_medical/data/body_leg_left.paa
deleted file mode 100644
index a116305258..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_leg_left.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_leg_right.paa b/TO_MERGE/cse/sys_medical/data/body_leg_right.paa
deleted file mode 100644
index 02ce66ba70..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_leg_right.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_legs.paa b/TO_MERGE/cse/sys_medical/data/body_legs.paa
deleted file mode 100644
index 9af3adc2ca..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_legs.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/body_torso.paa b/TO_MERGE/cse/sys_medical/data/body_torso.paa
deleted file mode 100644
index 0a7212ac95..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/body_torso.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/border_arm_left.paa b/TO_MERGE/cse/sys_medical/data/border_arm_left.paa
deleted file mode 100644
index eae1d751cf..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/border_arm_left.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/border_arm_right.paa b/TO_MERGE/cse/sys_medical/data/border_arm_right.paa
deleted file mode 100644
index 0aea4ce20e..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/border_arm_right.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/border_head.paa b/TO_MERGE/cse/sys_medical/data/border_head.paa
deleted file mode 100644
index 3b2e7aaf10..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/border_head.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/border_leg_left.paa b/TO_MERGE/cse/sys_medical/data/border_leg_left.paa
deleted file mode 100644
index 7ff3b170fa..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/border_leg_left.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/border_leg_right.paa b/TO_MERGE/cse/sys_medical/data/border_leg_right.paa
deleted file mode 100644
index bef0f70779..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/border_leg_right.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/border_torso.paa b/TO_MERGE/cse/sys_medical/data/border_torso.paa
deleted file mode 100644
index 2b70076939..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/border_torso.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/buttonDisabled_gradient.paa b/TO_MERGE/cse/sys_medical/data/buttonDisabled_gradient.paa
deleted file mode 100644
index 43b1b8d100..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/buttonDisabled_gradient.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient.paa b/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient.paa
deleted file mode 100644
index 2210f98741..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient2.paa b/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient2.paa
deleted file mode 100644
index cabe6c7fed..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient3.paa b/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient3.paa
deleted file mode 100644
index 7da9fbcf8a..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient3.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient_top.paa b/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient_top.paa
deleted file mode 100644
index 904e1a62f7..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/buttonNormal_gradient_top.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/cse_background_img.paa b/TO_MERGE/cse/sys_medical/data/cse_background_img.paa
deleted file mode 100644
index de59065e3b..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/cse_background_img.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/advanced_treatment_small.paa b/TO_MERGE/cse/sys_medical/data/icons/advanced_treatment_small.paa
deleted file mode 100644
index 8becb9d2df..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/advanced_treatment_small.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/airway_management_small.paa b/TO_MERGE/cse/sys_medical/data/icons/airway_management_small.paa
deleted file mode 100644
index ab4da47958..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/airway_management_small.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/bandage_fracture_small.paa b/TO_MERGE/cse/sys_medical/data/icons/bandage_fracture_small.paa
deleted file mode 100644
index a869f260ec..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/bandage_fracture_small.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/examine_patient_small.paa b/TO_MERGE/cse/sys_medical/data/icons/examine_patient_small.paa
deleted file mode 100644
index 2e9fc9831d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/examine_patient_small.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_advanced_treatment.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_advanced_treatment.paa
deleted file mode 100644
index d6bf6effd9..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_advanced_treatment.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_airway_management.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_airway_management.paa
deleted file mode 100644
index f444f5f385..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_airway_management.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_bandage_fracture.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_bandage_fracture.paa
deleted file mode 100644
index df8d1de571..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_bandage_fracture.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_bleeding.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_bleeding.paa
deleted file mode 100644
index d11c2ed496..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_bleeding.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_carry.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_carry.paa
deleted file mode 100644
index 7ebb830b03..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_carry.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_examine_patient.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_examine_patient.paa
deleted file mode 100644
index 12eb06c890..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_examine_patient.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_medication.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_medication.paa
deleted file mode 100644
index 98893ad863..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_medication.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_toggle_self.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_toggle_self.paa
deleted file mode 100644
index 3078eb5dd5..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_toggle_self.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_tourniquet.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_tourniquet.paa
deleted file mode 100644
index 8b34a7bfbb..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_tourniquet.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_tourniquet_small.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_tourniquet_small.paa
deleted file mode 100644
index a457e2c0d5..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_tourniquet_small.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/icon_triage_card.paa b/TO_MERGE/cse/sys_medical/data/icons/icon_triage_card.paa
deleted file mode 100644
index 850ab0f4ce..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/icon_triage_card.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/medication_small.paa b/TO_MERGE/cse/sys_medical/data/icons/medication_small.paa
deleted file mode 100644
index b6acd670c8..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/medication_small.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/toggle_self_small.paa b/TO_MERGE/cse/sys_medical/data/icons/toggle_self_small.paa
deleted file mode 100644
index 73108e5a98..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/toggle_self_small.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/icons/triage_card_small.paa b/TO_MERGE/cse/sys_medical/data/icons/triage_card_small.paa
deleted file mode 100644
index 92eb0f0d20..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/icons/triage_card_small.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/data/ui_background.paa b/TO_MERGE/cse/sys_medical/data/ui_background.paa
deleted file mode 100644
index f1c42c7d7d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/data/ui_background.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Atropin-pen.p3d b/TO_MERGE/cse/sys_medical/equipment/Atropin-pen.p3d
deleted file mode 100644
index 84d210518d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Atropin-pen.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Atropin-pen_used.p3d b/TO_MERGE/cse/sys_medical/equipment/Atropin-pen_used.p3d
deleted file mode 100644
index ba2e4c4c38..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Atropin-pen_used.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Bandage elastic.p3d b/TO_MERGE/cse/sys_medical/equipment/Bandage elastic.p3d
deleted file mode 100644
index 1ada83c00e..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Bandage elastic.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Bandage-Pack.p3d b/TO_MERGE/cse/sys_medical/equipment/Bandage-Pack.p3d
deleted file mode 100644
index 4e48818373..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Bandage-Pack.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Bandage-elastic.p3d b/TO_MERGE/cse/sys_medical/equipment/Bandage-elastic.p3d
deleted file mode 100644
index 1b29b17f7c..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Bandage-elastic.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Epipen.p3d b/TO_MERGE/cse/sys_medical/equipment/Epipen.p3d
deleted file mode 100644
index 437e15c0bb..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Epipen.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Epipen_used.p3d b/TO_MERGE/cse/sys_medical/equipment/Epipen_used.p3d
deleted file mode 100644
index 5359c83a23..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Epipen_used.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Morphinpen.p3d b/TO_MERGE/cse/sys_medical/equipment/Morphinpen.p3d
deleted file mode 100644
index af3f03ec6a..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Morphinpen.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Morphinpen_used.p3d b/TO_MERGE/cse/sys_medical/equipment/Morphinpen_used.p3d
deleted file mode 100644
index 80489bd74d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Morphinpen_used.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/DPM-wood.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/DPM-wood.p3d
deleted file mode 100644
index dad1a7880e..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/DPM-wood.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Flecktarn-desert.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Flecktarn-desert.p3d
deleted file mode 100644
index 2597ddd826..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Flecktarn-desert.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Flecktarn-wood.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Flecktarn-wood.p3d
deleted file mode 100644
index 13502cb0fa..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Flecktarn-wood.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/MTP.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/MTP.p3d
deleted file mode 100644
index fb5ee9fddc..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/MTP.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-desert.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-desert.p3d
deleted file mode 100644
index 9ee93c126d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-desert.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-grey.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-grey.p3d
deleted file mode 100644
index 8464bbb9eb..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-grey.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-wood.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-wood.p3d
deleted file mode 100644
index a3599f3ace..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Marpat-wood.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Multicam.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Multicam.p3d
deleted file mode 100644
index 51651d7144..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/Multicam.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/DPM-Desert.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/DPM-Desert.paa
deleted file mode 100644
index 94478b8c58..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/DPM-Desert.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/DPM-wood.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/DPM-wood.paa
deleted file mode 100644
index 435fdd434c..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/DPM-wood.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Flecktarn-desert.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Flecktarn-desert.paa
deleted file mode 100644
index a4beb7de20..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Flecktarn-desert.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Flecktarn-wood.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Flecktarn-wood.paa
deleted file mode 100644
index 1def142a27..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Flecktarn-wood.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/MTP_co.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/MTP_co.paa
deleted file mode 100644
index 660ebe3477..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/MTP_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Marpat-grey.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Marpat-grey.paa
deleted file mode 100644
index 8b3fc21a60..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Marpat-grey.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Marpat-wood.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Marpat-wood.paa
deleted file mode 100644
index 94e2187dc2..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Marpat-wood.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Mulitcam.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Mulitcam.paa
deleted file mode 100644
index 3e55892c84..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Mulitcam.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit.rvmat b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit.rvmat
deleted file mode 100644
index 5da2e3099b..0000000000
--- a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit.rvmat
+++ /dev/null
@@ -1,32 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={0.5,0.5,0.5,1};
-forcedDiffuse[]={0.5,0.5,0.5,0};
-emmisive[]={0,0,0,1};
-specular[]={0.30000001,0.30000001,0.30000001,0};
-specularPower=100;
-PixelShaderID="NormalMapSpecularDIMap";
-VertexShaderID="NormalMap";
-class Stage1
-{
- texture="cse\cse_sys_medical\equipment\Personal-aidkits\data\Personalaidkit_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
-class Stage2
-{
- texture="cse\cse_sys_medical\equipment\Personal-aidkits\data\Personalaidkit_smdi.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit_nohq.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit_nohq.paa
deleted file mode 100644
index 0d03b45372..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit_smdi.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit_smdi.paa
deleted file mode 100644
index 2fb8bec533..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/Personalaidkit_smdi.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/marpat-desert.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/marpat-desert.paa
deleted file mode 100644
index 6b9262427b..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/data/marpat-desert.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/dpm-desert.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/dpm-desert.p3d
deleted file mode 100644
index a94b619260..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/dpm-desert.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/MTP_cross.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/MTP_cross.p3d
deleted file mode 100644
index 017426e3f8..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/MTP_cross.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-desert_cross.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-desert_cross.p3d
deleted file mode 100644
index 2a8dfa1c88..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-desert_cross.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-grey_cross.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-grey_cross.p3d
deleted file mode 100644
index 1e1e4a846e..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-grey_cross.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-wood_cross.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-wood_cross.p3d
deleted file mode 100644
index 4116d04741..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Marpat-wood_cross.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Multicam_cross.p3d b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Multicam_cross.p3d
deleted file mode 100644
index 459f25ae24..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/Multicam_cross.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/MTP-cross.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/MTP-cross.paa
deleted file mode 100644
index 4f6fea84ee..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/MTP-cross.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-desert-cross.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-desert-cross.paa
deleted file mode 100644
index 1069ce681c..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-desert-cross.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-grey-cross.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-grey-cross.paa
deleted file mode 100644
index 773080a8e4..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-grey-cross.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-wood-cross.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-wood-cross.paa
deleted file mode 100644
index 1d5fa1f674..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/Marpat-wood-cross.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/multicam-cross.paa b/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/multicam-cross.paa
deleted file mode 100644
index e7a0460256..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personal-aidkits/mediccross/data/multicam-cross.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Personalaidkit.p3d b/TO_MERGE/cse/sys_medical/equipment/Personalaidkit.p3d
deleted file mode 100644
index e121de645d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Personalaidkit.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/QuickClot.p3d b/TO_MERGE/cse/sys_medical/equipment/QuickClot.p3d
deleted file mode 100644
index 25a596f9e5..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/QuickClot.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/Tourniquet.p3d b/TO_MERGE/cse/sys_medical/equipment/Tourniquet.p3d
deleted file mode 100644
index 31330499cd..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/Tourniquet.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing.p3d b/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing.p3d
deleted file mode 100644
index 53c53ac9fa..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing.rvmat b/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing.rvmat
deleted file mode 100644
index c643c4f0c1..0000000000
--- a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing.rvmat
+++ /dev/null
@@ -1,32 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={0.5,0.5,0.5,1};
-forcedDiffuse[]={0.5,0.5,0.5,0};
-emmisive[]={0,0,0,1};
-specular[]={0.30000001,0.30000001,0.30000001,0};
-specularPower=57.799999;
-PixelShaderID="NormalMapSpecularDIMap";
-VertexShaderID="NormalMap";
-class Stage1
-{
- texture="cse\cse_sys_medical\equipment\bandages\fielddressing_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
-class Stage2
-{
- texture="cse\cse_sys_medical\equipment\bandages\fielddressing_smdi.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_color.paa b/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_color.paa
deleted file mode 100644
index 7d68a365c2..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_color.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_garbage.p3d b/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_garbage.p3d
deleted file mode 100644
index f3eed095d3..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_garbage.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_nohq.paa b/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_nohq.paa
deleted file mode 100644
index c66785cf13..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_smdi.paa b/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_smdi.paa
deleted file mode 100644
index 96376989f7..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/fielddressing_smdi.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage.p3d b/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage.p3d
deleted file mode 100644
index 0c530a097f..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage.rvmat b/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage.rvmat
deleted file mode 100644
index df5beda1a4..0000000000
--- a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage.rvmat
+++ /dev/null
@@ -1,32 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={0.5,0.5,0.5,1};
-forcedDiffuse[]={0.5,0.5,0.5,0};
-emmisive[]={0,0,0,1};
-specular[]={0.30000001,0.30000001,0.30000001,0};
-specularPower=57.799999;
-PixelShaderID="NormalMapSpecularDIMap";
-VertexShaderID="NormalMap";
-class Stage1
-{
- texture="cse\cse_sys_medical\equipment\bandages\packingbandage_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
-class Stage2
-{
- texture="cse\cse_sys_medical\equipment\bandages\packingbandage_smdi.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_color.paa b/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_color.paa
deleted file mode 100644
index 54b1f75e2e..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_color.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_garbage.p3d b/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_garbage.p3d
deleted file mode 100644
index b0bbf671a3..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_garbage.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_nohq.paa b/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_nohq.paa
deleted file mode 100644
index 1b3782c501..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_smdi.paa b/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_smdi.paa
deleted file mode 100644
index 8d5b3848ac..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bandages/packingbandage_smdi.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bodybag.p3d b/TO_MERGE/cse/sys_medical/equipment/bodybag.p3d
deleted file mode 100644
index 854c46059c..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bodybag.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/bodybagItem.p3d b/TO_MERGE/cse/sys_medical/equipment/bodybagItem.p3d
deleted file mode 100644
index 778752ca7e..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/bodybagItem.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Atropinpen_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/Atropinpen_co.paa
deleted file mode 100644
index 3e44836bee..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/Atropinpen_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Epipen_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/Epipen_co.paa
deleted file mode 100644
index 2a1afe1f33..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/Epipen_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing.rvmat b/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing.rvmat
deleted file mode 100644
index e4c98edc42..0000000000
--- a/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing.rvmat
+++ /dev/null
@@ -1,32 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={0.5,0.5,0.5,1};
-forcedDiffuse[]={0.5,0.5,0.5,0};
-emmisive[]={0,0,0,1};
-specular[]={0.30000001,0.30000001,0.30000001,0};
-specularPower=57.799999;
-PixelShaderID="NormalMapSpecularDIMap";
-VertexShaderID="NormalMap";
-class Stage1
-{
- texture="cse\cse_sys_medical\equipment\data\Field-Dressing_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
-class Stage2
-{
- texture="cse\cse_sys_medical\equipment\data\Field-Dressing_smdi.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,1};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing_nohq.paa b/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing_nohq.paa
deleted file mode 100644
index 6972636a3d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing_smdi.paa b/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing_smdi.paa
deleted file mode 100644
index f450605958..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/Field-Dressing_smdi.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Field-dressing.paa b/TO_MERGE/cse/sys_medical/equipment/data/Field-dressing.paa
deleted file mode 100644
index 07bae7d595..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/Field-dressing.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Liquid-skin.paa b/TO_MERGE/cse/sys_medical/equipment/data/Liquid-skin.paa
deleted file mode 100644
index fda64304bc..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/Liquid-skin.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Morphin_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/Morphin_co.paa
deleted file mode 100644
index 8d91fd0e10..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/Morphin_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/Tournequit_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/Tournequit_co.paa
deleted file mode 100644
index e83aada994..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/Tournequit_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/bandage-elastic.paa b/TO_MERGE/cse/sys_medical/equipment/data/bandage-elastic.paa
deleted file mode 100644
index 3164b5d4ca..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/bandage-elastic.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/bodybag.rvmat b/TO_MERGE/cse/sys_medical/equipment/data/bodybag.rvmat
deleted file mode 100644
index d2955e1c4a..0000000000
--- a/TO_MERGE/cse/sys_medical/equipment/data/bodybag.rvmat
+++ /dev/null
@@ -1,92 +0,0 @@
-ambient[]={1.000000,1.000000,1.000000,1.000000};
-diffuse[]={1.000000,1.000000,1.000000,1.000000};
-forcedDiffuse[]={0.000000,0.000000,0.000000,0.000000};
-emmisive[]={0.000000,0.000000,0.000000,1.000000};
-specular[]={0.703999,0.703999,0.703999,0.000000};
-specularPower=70.000000;
-PixelShaderID="Super";
-VertexShaderID="Super";
-class Stage1
-{
- texture="cse\cse_sys_medical\equipment\data\bodybag_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage2
-{
- texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage3
-{
- texture="#(argb,8,8,3)color(0,0,0,0,MC)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage4
-{
- texture="#(argb,8,8,3)color(1,1,1,1,AS)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage5
-{
- texture="#(argb,8,8,3)color(0,0.05,1,1,SMDI)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage6
-{
- texture="#(ai,32,128,1)fresnel(0.98,1.02)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage7
-{
- texture="cse\cse_sys_medical\equipment\data\env_co.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem.rvmat b/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem.rvmat
deleted file mode 100644
index 8be756a025..0000000000
--- a/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem.rvmat
+++ /dev/null
@@ -1,32 +0,0 @@
-ambient[]={1.000000,1.000000,1.000000,1.000000};
-diffuse[]={1.000000,1.000000,1.000000,1.000000};
-forcedDiffuse[]={0.000000,0.000000,0.000000,0.000000};
-emmisive[]={0.000000,0.000000,0.000000,1.000000};
-specular[]={1.000000,1.000000,1.000000,1.000000};
-specularPower=20.000000;
-PixelShaderID="NormalMapSpecularDIMap";
-VertexShaderID="NormalMap";
-class Stage1
-{
- texture="cse\cse_sys_medical\equipment\data\bodybagItem_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage2
-{
- texture="cse\cse_sys_medical\equipment\data\bodybagItem_smdi.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_co.paa
deleted file mode 100644
index d04f8ec64c..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_nohq.paa b/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_nohq.paa
deleted file mode 100644
index 5699ec5e04..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_smdi.paa b/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_smdi.paa
deleted file mode 100644
index cf4cf805e3..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/bodybagItem_smdi.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/bodybag_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/bodybag_co.paa
deleted file mode 100644
index 21996761b7..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/bodybag_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/bodybag_nohq.paa b/TO_MERGE/cse/sys_medical/equipment/data/bodybag_nohq.paa
deleted file mode 100644
index 5c6b35c595..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/bodybag_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/env_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/env_co.paa
deleted file mode 100644
index 77645347b5..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/env_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/quickclot_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/quickclot_co.paa
deleted file mode 100644
index bf0edccd7e..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/quickclot_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit.rvmat b/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit.rvmat
deleted file mode 100644
index 4af111299b..0000000000
--- a/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit.rvmat
+++ /dev/null
@@ -1,92 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={1,1,1,1};
-forcedDiffuse[]={0,0,0,0};
-emmisive[]={0,0,0,1};
-specular[]={0.70399898,0.70399898,0.70399898,0};
-specularPower=70;
-PixelShaderID="Super";
-VertexShaderID="Super";
-class Stage1
-{
- texture="cse\cse_sys_medical\equipment\data\surgical_kit_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage2
-{
- texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage3
-{
- texture="#(argb,8,8,3)color(0,0,0,0,MC)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage4
-{
- texture="#(argb,8,8,3)color(1,1,1,1,AS)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage5
-{
- texture="#(argb,8,8,3)color(0,0.05,1,1,SMDI)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage6
-{
- texture="#(ai,32,128,1)fresnel(0.98,1.02)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage7
-{
- texture="cse\cse_sys_medical\equipment\data\env_co.tga";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_co.paa b/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_co.paa
deleted file mode 100644
index 3e622afe48..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_metal.rvmat b/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_metal.rvmat
deleted file mode 100644
index 65192a777f..0000000000
--- a/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_metal.rvmat
+++ /dev/null
@@ -1,22 +0,0 @@
-ambient[]={1,1,1,0};
-diffuse[]={1,1,1,0};
-forcedDiffuse[]={0,0,0,0};
-emmisive[]={0,0,0,0};
-specular[]={0.5,0.5,0.5,0};
-specularPower=11.6;
-renderFlags[]=
-{
- "NoAlphaWrite"
-};
-PixelShaderID="Glass";
-VertexShaderID="Glass";
-class Stage1
-{
- texture="#(argb,8,8,3)color(1,1,1,0.9)";
- uvSource="none";
-};
-class Stage2
-{
- texture="a3\data_f\env_chrome_co.paa";
- uvSource="none";
-};
diff --git a/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_nohq.paa b/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_nohq.paa
deleted file mode 100644
index b8027515bc..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/data/surgical_kit_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/field_dressing.p3d b/TO_MERGE/cse/sys_medical/equipment/field_dressing.p3d
deleted file mode 100644
index a94a398b68..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/field_dressing.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/field_dressing_used.p3d b/TO_MERGE/cse/sys_medical/equipment/field_dressing_used.p3d
deleted file mode 100644
index 7d6765db10..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/field_dressing_used.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/chestseal.paa b/TO_MERGE/cse/sys_medical/equipment/img/chestseal.paa
deleted file mode 100644
index be0f4f77bf..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/img/chestseal.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/liquidSkin.paa b/TO_MERGE/cse/sys_medical/equipment/img/liquidSkin.paa
deleted file mode 100644
index 40e72038ec..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/img/liquidSkin.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/nasopharyngeal_tube.paa b/TO_MERGE/cse/sys_medical/equipment/img/nasopharyngeal_tube.paa
deleted file mode 100644
index 6629605519..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/img/nasopharyngeal_tube.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/splint.paa b/TO_MERGE/cse/sys_medical/equipment/img/splint.paa
deleted file mode 100644
index 87c1cb8686..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/img/splint.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/skinliquid.p3d b/TO_MERGE/cse/sys_medical/equipment/skinliquid.p3d
deleted file mode 100644
index 485457a54a..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/skinliquid.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/splint.p3d b/TO_MERGE/cse/sys_medical/equipment/splint.p3d
deleted file mode 100644
index 42f3ad14b7..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/splint.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/surgical_kit.p3d b/TO_MERGE/cse/sys_medical/equipment/surgical_kit.p3d
deleted file mode 100644
index 0c01cc8add..0000000000
Binary files a/TO_MERGE/cse/sys_medical/equipment/surgical_kit.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/functions.sqf b/TO_MERGE/cse/sys_medical/functions.sqf
deleted file mode 100644
index 53a52d84a7..0000000000
--- a/TO_MERGE/cse/sys_medical/functions.sqf
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-functions.sqf
-Usage: compileFinals the function SQF files into variables for use
-Author: Glowbal
-
-Arguments: none
-Returns: none
-
-Affects: n/a
-Executes:
-*/
-
-cse_fnc_unitLoop_CMS = {
- _unit = _this select 0;
- if !(local _unit) exitwith{};
- if !(_unit getvariable["cse_fnc_unitLoop_CMS",false]) then{
- _unit setvariable ["cse_fnc_unitLoop_CMS",true];
- };
-
- if ([_unit] call cse_fnc_hasMedicalEnabled_CMS) then {
- if (isnil "CSE_MEDICAL_COMBINED_LOOP_CMS") then {
- CSE_MEDICAL_COMBINED_LOOP_CMS = [];
- };
- if (_unit in CSE_MEDICAL_COMBINED_LOOP_CMS) exitwith {};
- CSE_MEDICAL_COMBINED_LOOP_CMS pushback _unit;
- [format["Added %1 to unitLoop",_unit]] call cse_fnc_debug;
- };
-};
-
-cse_fnc_onBodySwitch_CMS = {
- private ["_unit","_newUnit"];
- _unit = _this select 0;
- _newUnit = _this select 1;
- if (!dialog) exitwith{};
- if (CSE_SYS_MEDICAL_INTERACTION_TARGET == _unit) then {
- CSE_SYS_MEDICAL_INTERACTION_TARGET = _newUnit;
- };
-};
-
-cse_eh_killed_CMS = {
- private["_unit"];
- _unit = _this select 0;
- if (!local _unit) exitwith {};
- [_unit, "cse_pain",0,true] call cse_fnc_setVariable;
- [_unit, "cse_heartRate",0,true] call cse_fnc_setVariable;
- [_unit, "cse_bloodPressure", [0,0],true] call cse_fnc_setVariable;
- if (_unit getvariable["cse_unconscious_non_captive_f",false]) then {
- _unit setCaptive false;
- _unit setvariable["cse_unconscious_non_captive_f",nil];
- };
-};
-
-cse_eh_local_CMS = {
- private["_unit"];
- _unit = _this select 0;
- _local = _this select 1;
- [format["Locality changed for: %1",_this]] call cse_fnc_Debug;
- if (_local) then {
- if (_unit getvariable["cse_fnc_unitLoop_CMS",false]) then {
- [_unit] call cse_fnc_unitLoop_CMS;
- };
- } else {
-
- };
-};
diff --git a/TO_MERGE/cse/sys_medical/functions/activityLog/fn_addActivityToLog_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/activityLog/fn_addActivityToLog_CMS.sqf
deleted file mode 100644
index 57cf285406..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/activityLog/fn_addActivityToLog_CMS.sqf
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * fn_addActivityToLog_CMS.sqf
- * @Descr: adds an item to the activity log
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, type STRING, message STRING]
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit","_caller","_type","_activity","_log"];
-
-_unit = _this select 0;
-_type = _this select 1;
-_message = _this select 2;
-
-if (!local _unit) exitwith {
- [_this, "cse_fnc_addActivityToLog_CMS", _unit, false] spawn BIS_fnc_MP;
-};
-_lastNumber = date select 4;
-_moment = format["%1:%2",date select 3, _lastNumber];
-if (_lastNumber < 10) then {
- _moment = format["%1:0%2",date select 3, _lastNumber];
-};
-
-
-_log = [_unit, "cse_activityLog_CMS"] call cse_fnc_getVariable;
-if (count _log >= 8) then {
- _newLog = [];
- _counter = 0;
- {
- // ensure the first element will not be added
- if (_counter > 0) then {
- _newLog pushback _x;
- } else {
- _counter = _counter + 1;
- };
- }foreach _log;
- _log = _newLog;
-};
-_log pushback [_message,_moment,_type];
-
-[_unit, "cse_activityLog_CMS",_log] call cse_fnc_setVariable;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/activityLog/fn_addToQuickViewLog_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/activityLog/fn_addToQuickViewLog_CMS.sqf
deleted file mode 100644
index 53088849a4..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/activityLog/fn_addToQuickViewLog_CMS.sqf
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * fn_addToQuickViewLog_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit","_caller","_type","_activity","_log"];
-
-_unit = _this select 0;
-_type = _this select 1;
-_message = _this select 2;
-_lastNumber = date select 4;
-if (!local _unit) exitwith {
- [_this, "cse_fnc_addToQuickViewLog_CMS", _unit, false] spawn BIS_fnc_MP;
-};
-_moment = format["%1:%2",date select 3, _lastNumber];
-if (_lastNumber < 10) then {
- _moment = format["%1:0%2",date select 3, _lastNumber];
-};
-
-
-_log = [_unit,"cse_quickviewLog_CMS"] call cse_fnc_getVariable;
-if (count _log >= 8) then {
- _newLog = [];
- _counter = 0;
- {
- if (_counter > 0) then {
- _newLog pushback _x;
- } else {
- _counter = _counter + 1;
- };
- }foreach _log;
- _log = _newLog;
-};
-_log pushback [_message,_moment,_type];
-
-[_unit,"cse_quickviewLog_CMS",_log] call cse_fnc_setVariable;
diff --git a/TO_MERGE/cse/sys_medical/functions/activityLog/fn_getActivityLog_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/activityLog/fn_getActivityLog_CMS.sqf
deleted file mode 100644
index 68d82d4cf5..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/activityLog/fn_getActivityLog_CMS.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_getActivityLog_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private["_unit"];
-_unit = _this select 0;
-_log = [_unit,"cse_activityLog_CMS"] call cse_fnc_getVariable;
-
-if (isnil "_log") then {
- _log = [];
-};
-if (typeName _log != typeName []) then {
- _log = [];
-};
-_log
diff --git a/TO_MERGE/cse/sys_medical/functions/activityLog/fn_getQuickViewLog_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/activityLog/fn_getQuickViewLog_CMS.sqf
deleted file mode 100644
index 2e9e50d827..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/activityLog/fn_getQuickViewLog_CMS.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * fn_getQuickViewLog_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private["_unit"];
-_unit = _this select 0;
-_log = [_unit,"cse_quickviewLog_CMS"] call cse_fnc_getVariable;
-if (isnil "_log") then {
- _log = [];
-};
-if (typeName _log != typeName []) then {
- _log = [];
-};
-_log
diff --git a/TO_MERGE/cse/sys_medical/functions/basic/fn_basicBandage_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/basic/fn_basicBandage_CMS.sqf
deleted file mode 100644
index 80622fb40a..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/basic/fn_basicBandage_CMS.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * fn_basicBandage_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_removeItem = _this select 2;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_treatingPerson] call cse_fnc_treatmentMutex_CMS;
-
-if (!([_treatingPerson,_removeItem] call cse_fnc_hasMagazine)) exitwith { [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS; };
- [_treatingPerson,_removeItem] call cse_fnc_useMagazine;
-if (dialog) then {
- [] call cse_fnc_gui_refreshLastSubMenu;
-};
-
-if (vehicle _treatingPerson == _treatingPerson && (vehicle _injuredPerson == _injuredPerson)) then {
- [_treatingPerson,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_broadcastAnim;
-};
-
-_spot = 0;
-_openWounds = [_injuredPerson,"cse_openWounds"] call cse_fnc_getvariable;
-_counter = 0;
-_highestTotal = 0;
-{
- _totalNumber = 0;
- {
- _totalNumber = _totalNumber + _x;
- }foreach _x;
- if (_totalNumber > _highestTotal) then {
- [format["_totalNumber vs _highestTotal",_totalNumber,_highestTotal]] call cse_fnc_debug;
- _spot = _counter;
- _highestTotal = _totalNumber;
- };
- _counter = _counter + 1;
-}foreach _openWounds;
-
-if (_spot < 0) exitwith { [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS; };
-_selectionName = [_spot] call cse_fnc_fromNumberToBodyPart_CMS;
-[format["CONVERTED NUMBER TO: %1 TO %2",_spot,_selectionName]] call cse_fnc_debug;
-_name = [_injuredPerson,"cse_name"] call cse_fnc_getVariable;
-_messageSend = formatText ["You apply a bandage on %1 - %2", _name,_selectionName];
-[_treatingPerson,_messageSend] call cse_fnc_sendHintTo;
-[[_injuredPerson, _treatingPerson, _selectionName, _removeItem], "cse_fnc_bandageLocal_CMS", _injuredPerson, false] spawn BIS_fnc_MP;
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/basic/fn_fromNumberToBodyPart_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/basic/fn_fromNumberToBodyPart_CMS.sqf
deleted file mode 100644
index 1995516ba7..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/basic/fn_fromNumberToBodyPart_CMS.sqf
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * fn_fromNumberToBodyPart_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_selectionName","_part"];
-_part = _this select 0;
-_selectionName = "";
-_selectionName = switch (_part) do {
- case 0: {
- "head"
- };
- case 1: {
- "body"
- };
- case 2: {
- "hand_l"
- };
- case 3: {
- "hand_r"
- };
- case 4: {
- "leg_l"
- };
- case 5: {
- "leg_r"
- };
- default {
- ""
- };
-};
-_selectionName
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/blood/fn_bloodConditions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/blood/fn_bloodConditions_CMS.sqf
deleted file mode 100644
index c7bc6b68ce..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/blood/fn_bloodConditions_CMS.sqf
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * fn_bloodConditions_CMS.sqf
- * @Descr: Check if any of the unconscious or dead conditions are true for given unit and if so, make the relevant function calls.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECt, bloodVolume NUMBER, bloodPressure ARRAY, heartRate NUMBER]
- * @Return: void
- * @PublicAPI: false
- */
-
-
-private ["_unit","_bloodVolume","_bloodPressure","_heartRate","_bloodPressureL","_bloodPressureH","_bloodLoss"];
-_unit = _this select 0;
-_bloodVolume = _this select 1;
-_bloodPressure = _this select 2;
-_heartRate = _this select 3;
-
-if ((_unit getvariable["CSE_ENABLE_REVIVE_SETDEAD_F",0]) == 0) then {
- _bloodPressureL = _bloodPressure select 0;
- _bloodPressureH = _bloodPressure select 1;
- if (!(_unit getvariable ["cse_cardiacArrest_CMS",false])) then {
- if (_bloodPressureH > 260) then {
- if (random(1) > 0.7) then {
- [_unit] spawn cse_fnc_cardiacArrest_CMS;
- };
- };
- if (_bloodPressureL < 40 && _heartRate > 190) then {
- if (random(1) > 0.7) then {
- [_unit] spawn cse_fnc_cardiacArrest_CMS;
- };
- };
- if (_bloodPressureH > 145 && _heartRate > 150) then {
- if (random(1) > 0.7) then {
- [_unit] spawn cse_fnc_cardiacArrest_CMS;
- };
- };
- if (_heartRate > 200) then {
- [_unit] spawn cse_fnc_cardiacArrest_CMS;
- };
-
- if (_heartRate < 20) then {
- [_unit] spawn cse_fnc_cardiacArrest_CMS;
- };
- };
- if ([_unit] call cse_fnc_isAwake) then {
- if (_bloodVolume < 60) then {
- if (random(1) > 0.9) then {
- [_unit] call cse_fnc_setUnconsciousState;
- };
- };
- if (_heartRate < 10 || _bloodPressureH < 30 || _bloodVolume < 20) then {
- [_unit] call cse_fnc_setUnconsciousState; // safety check to at least ensure unconsciousness for units if they are not dead already.
- };
- };
-};
-if (_bloodVolume < 30) then {
- [_unit] call cse_fnc_setDead_CMS;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/blood/fn_cardiacArrest_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/blood/fn_cardiacArrest_CMS.sqf
deleted file mode 100644
index fb296aacb4..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/blood/fn_cardiacArrest_CMS.sqf
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * fn_cardiacArrest_CMS.sqf
- * @Descr: Triggers a unit into the Cardiac Arrest state from CMS. Will put the unit in an unconscious state and run a countdown timer until unit dies. Timer is a random value between 120 and 720 seconds.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT (The unit that will be put in cardiac arrest state)]
- * @Return: void
- * @PublicAPI: true
- */
-
-
-private ["_unit", "_modifier","_timer","_counter", "_heartRate"];
-_unit = _this select 0;
-
-if (_unit getvariable ["cse_cardiacArrest_CMS",false]) exitwith {};
-[format["%1 is put into cardiac arrest",_unit]] call cse_fnc_debug;
-_unit setvariable ["cse_cardiacArrest_CMS", true,true];
-[_unit,"cse_heartRate", 0] call cse_fnc_setVariable;
-
-
-[_unit] call cse_fnc_setUnconsciousState;
-_counter = 120 + round(random(600));
-_timer = 0;
-while {(_timer < _counter && alive _unit)} do {
- _heartRate = [_unit,"cse_heartRate"] call cse_fnc_getVariable;
- if (_heartRate > 0) exitwith {
- [format["%1 is moved out of cardiac: %2",_unit, _heartRate]] call cse_fnc_debug;
- _unit setvariable ["cse_cardiacArrest_CMS", nil,true];
- };
- if (_counter - _timer < 1) exitwith {
- [_unit] call cse_fnc_setDead_CMS;
- };
- sleep 1;
- _timer = _timer + 1;
-};
-
-_unit setvariable ["cse_cardiacArrest_CMS", nil,true];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/drag/fn_carry_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/drag/fn_carry_CMS.sqf
deleted file mode 100644
index c23b51af7c..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/drag/fn_carry_CMS.sqf
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- fnc_carry.sqf
- Usage: makes the calling unit start carrying the specified unit
- Author: Glowbal
-
- Arguments: array [caller (object), target (object)]
- 1: caller (OBJECT), Object of type Man
- 2: target (OBJECT), Object of type Man
- Returns: none
-
- Affects: Caller and target locality
- Executes: spawn
-*/
-
-private ["_caller", "_unit", "_positionUnit", "_killOnDrop"];
-_caller = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
-_unit = [_this, 1, objNull, [objNull]] call BIS_fnc_param;
-
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_caller] call cse_fnc_treatmentMutex_CMS;
-
-if (!(_unit isKindOf "CaManBase") || !(_caller isKindOf "CaManBase")) exitwith{ [_caller,"release"] call cse_fnc_treatmentMutex_CMS; };
-if (vehicle _caller != _caller || vehicle _unit != _unit) exitwith { [_caller,"release"] call cse_fnc_treatmentMutex_CMS;};
-
-if (!([_caller] call cse_fnc_canInteract) || {_caller == _unit} || {(([_unit] call cse_fnc_isAwake))}) exitwith {
- ["cse_fnc_drag_CMS call failed condition: canInteract, equal, is awake"] call cse_fnc_debug;
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-
-if (([_caller] call cse_fnc_getCarriedObj) != _unit && !(isNull ([_caller] call cse_fnc_getCarriedObj)) || {!isNull(_unit getvariable ["cse_beingDragged_CMS",objNull]) || !isNull(_caller getvariable ["cse_dragging_CMS",objNull])} || {!isNull(_unit getvariable ["cse_beingCarried_CMS",objNull]) || !isNull(_caller getvariable ["cse_carrying_CMS",objNull])}) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
- ["carryobj reset"] call cse_fnc_debug;
- [_caller,objNull] call cse_fnc_carryObj;
-};
-_killOnDrop = false;
-if (!alive _unit) then {
- _killOnDrop = true;
- _unit = [_unit,_caller] call cse_fnc_makeCopyOfBody_F;
-};
-if (isNull _unit) exitwith {};
-
-if !([_caller,_unit] call cse_fnc_carryObj) exitwith {
- ["couldn't carry object!"] call cse_fnc_debug; [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-_unit setvariable ["cse_beingCarried_CMS",_caller,true];
-_caller setvariable ["cse_carrying_CMS",_unit,true];
-_caller selectWeapon (primaryWeapon _caller);
-
-[_caller,"acinpercmstpsraswrfldnon",true] call cse_fnc_broadcastAnim;
-_unit attachTo [_caller, [0.1, -0.1, -1.25], "LeftShoulder"];
-[_unit,"AinjPfalMstpSnonWnonDf_carried_dead",true] call cse_fnc_broadcastAnim;
-
-if (!isnil "CSE_DROP_ADDACTION_CMS") then {
- _caller removeAction CSE_DROP_ADDACTION_CMS;
- CSE_DROP_ADDACTION_CMS = nil;
-};
-
-CSE_DROP_ADDACTION_CMS = _caller addAction [format["Drop %1",[_unit] call cse_fnc_getName], {[_this select 1, _this select 2] call cse_fnc_drop_CMS;}];
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-
-[[_caller, _unit],"onCarryInjured"] call cse_fnc_customEventHandler_F;
-
-waituntil {((isNull ([_caller] call cse_fnc_getCarriedObj)) || !([_caller] call cse_fnc_isAwake) || !(vehicle _caller == _caller))};
-[_caller,ObjNull] call cse_fnc_carryObj;
-
-if (([_caller] call cse_fnc_isAwake)) then {
- if (vehicle _unit == _unit) then {
- if (([_unit] call cse_fnc_isAwake)) then {
- [_unit,"",false] call cse_fnc_broadcastAnim;
- } else {
- [_unit,([_unit] call cse_fnc_getDeathAnim),false] call cse_fnc_broadcastAnim;
- };
- };
- if (vehicle _caller == _caller) then {
- [_caller,"",false] call cse_fnc_broadcastAnim;
- };
-} else {
- if (vehicle _unit == _unit) then {
- if (([_unit] call cse_fnc_isAwake)) then {
- [_unit,"",false] call cse_fnc_broadcastAnim;
- } else {
- [_unit,([_unit] call cse_fnc_getDeathAnim),false] call cse_fnc_broadcastAnim;
- };
- };
-};
-if (!surfaceIsWater getPos _caller) then {
- sleep 0.5;
- if (vehicle _unit == _unit) then {
- if (vehicle _caller == _caller) then {
- _positionUnit = getPosATL _unit;
- _positionUnit set [2, (getPosATL _caller) select 2];
- _unit setPosATL _positionUnit;
- };
- };
-};
-if (_killOnDrop) then {
- _unit setDamage 1;
-};
-_unit setvariable ["cse_beingCarried_CMS",objNull,true];
-_caller setvariable ["cse_carrying_CMS",objNull,true];
-
-[[_caller, _unit, 1],"onDropInjured"] call cse_fnc_customEventHandler_F;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/drag/fn_drag_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/drag/fn_drag_CMS.sqf
deleted file mode 100644
index 542f209392..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/drag/fn_drag_CMS.sqf
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-fnc_drag.sqf
-Usage: makes the calling unit start dragging the specified unit
-Author: Glowbal
-
-Arguments: array [unit (object), unit (object)]
- 1: Caller OBJECT. Unit that initiats the dragging
- 2: Target OBJECT. Unit that will be dragged
-Returns: none
-
-Affects: Caller and target Locality
-Executes: spawn
-*/
-private ["_caller", "_unit", "_positionUnit", "_killOnDrop"];
-_caller = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
-_unit = [_this, 1, objNull, [objNull]] call BIS_fnc_param;
-
-["cse_fnc_drag_CMS has been called",2] call cse_fnc_debug;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_caller] call cse_fnc_treatmentMutex_CMS;
-
-if (!(_unit isKindOf "CaManBase") || !(_caller isKindOf "CaManBase")) exitwith{ [_caller,"release"] call cse_fnc_treatmentMutex_CMS;};
-if (vehicle _caller != _caller || vehicle _unit != _unit) exitwith { [_caller,"release"] call cse_fnc_treatmentMutex_CMS;};
-
-if (!([_caller] call cse_fnc_canInteract) || {_caller == _unit} || {(([_unit] call cse_fnc_isAwake))}) exitwith { ["cse_fnc_drag_CMS call failed condition: canInteract, equal, is awake"] call cse_fnc_debug;
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-
-if (([_caller] call cse_fnc_getCarriedObj) != _unit && !(isNull ([_caller] call cse_fnc_getCarriedObj)) || {!isNull(_unit getvariable ["cse_beingDragged_CMS",objNull]) || !isNull(_caller getvariable ["cse_dragging_CMS",objNull])}) exitwith {
- ["carryobj reset"] call cse_fnc_debug;
- [_caller,objNull] call cse_fnc_carryObj;
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-_caller action ["WeaponOnBack", _caller];
-
-
-_killOnDrop = false;
-if (!alive _unit) then {
- _unit = [_unit,_caller] call cse_fnc_makeCopyOfBody_F;
- _killOnDrop = true;
- _unit playMove "AinjPpneMstpSnonWrflDb";
-};
-if (isNull _unit) exitwith {};
-
-if !([_caller,_unit,[0.125, 1.007, 0]] call cse_fnc_carryObj) exitwith { [_caller,"release"] call cse_fnc_treatmentMutex_CMS; };
-_unit setDir 180;
-[_unit,"AinjPpneMstpSnonWrflDb",true] call cse_fnc_broadcastAnim;
-_caller selectWeapon (primaryWeapon _caller);
-
-if (currentWeapon _caller == primaryWeapon _caller) then {
- [_caller,"AcinPknlMstpSrasWrflDnon",true] call cse_fnc_localAnim;
-} else {
- [_caller,"AcinPknlMstpSnonWnonDnon",true] call cse_fnc_localAnim;
-};
-
-_unit setvariable ["cse_beingDragged_CMS",_caller,true];
-_caller setvariable ["cse_dragging_CMS",_unit,true];
-if (!isnil "CSE_DROP_ADDACTION_CMS") then {
-_caller removeAction CSE_DROP_ADDACTION_CMS;
- CSE_DROP_ADDACTION_CMS = nil;
-};
-CSE_DROP_ADDACTION_CMS = _caller addAction [format["Drop %1",[_unit] call cse_fnc_getName], {[_this select 1, _this select 2] call cse_fnc_drop_CMS;}];
-
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-
-[[_caller, _unit],"onDragInjured"] call cse_fnc_customEventHandler_F;
-
-waituntil {((isNull ([_caller] call cse_fnc_getCarriedObj)) || !([_caller] call cse_fnc_isAwake))};
-[_caller,ObjNull] call cse_fnc_carryObj;
-
-_unit setvariable ["cse_beingDragged_CMS",objNull,true];
-_caller setvariable ["cse_dragging_CMS",objNull,true];
-
-
-if (([_caller] call cse_fnc_isAwake)) then {
- if (vehicle _unit == _unit) then {
- if (([_unit] call cse_fnc_isAwake)) then {
- [_unit,"AinjPpneMstpSnonWrflDb_release",false] call cse_fnc_broadcastAnim;
- //[_unit,"aidlppnemstpsraswrfldnon0s",false] call cse_fnc_broadcastAnim;
- } else {
- [_unit,([_unit] call cse_fnc_getDeathAnim)] call cse_fnc_broadcastAnim;
- };
- };
- if (vehicle _caller == _caller) then {
- [_caller,"amovpercmstpsraswrfldnon_amovpknlmstpslowwrfldnon",false] call cse_fnc_broadcastAnim;
- };
-} else {
- if (([_unit] call cse_fnc_isAwake)) then {
- if (vehicle _unit == _unit) then {
- [_unit,"AinjPpneMstpSnonWrflDb_release",false] call cse_fnc_broadcastAnim;
- //[_unit,"aidlppnemstpsraswrfldnon0s",false] call cse_fnc_broadcastAnim;
- } else {
- [_unit,"",false] call cse_fnc_broadcastAnim;
- };
- } else {
- [_unit,([_unit] call cse_fnc_getDeathAnim)] call cse_fnc_broadcastAnim;
- };
-};
-if (!surfaceIsWater getPos _caller) then {
- sleep 0.5;
- if (vehicle _unit == _unit) then {
- if (vehicle _caller == _caller) then {
- _positionUnit = getPosATL _unit;
- _positionUnit set [2, (getPosATL _caller) select 2];
- _unit setPosATL _positionUnit;
- };
- };
-};
-
-if (_killOnDrop) then {
- _unit setDamage 1;
-};
-
-[[_caller, _unit, 0],"onDropInjured"] call cse_fnc_customEventHandler_F;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/drag/fn_drop_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/drag/fn_drop_CMS.sqf
deleted file mode 100644
index 29b4bc28b6..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/drag/fn_drop_CMS.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- fnc_drop.sqf
- Usage: makes the calling unit start dragging the specified unit
- Author: Glowbal
-
- Arguments: array [unit (object), unit (object)]
- Returns: none
-
- Affects:
- Executes:
-*/
-
-private ["_caller", "_unit","_info","_draggedPerson"];
-_caller = _this select 0;
-_unit = _this select 1;
-[_caller,objNull] call cse_fnc_carryObj;
-if (!isnil "CSE_DROP_ADDACTION_CMS") then {
-_caller removeAction CSE_DROP_ADDACTION_CMS;
- CSE_DROP_ADDACTION_CMS = nil;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/drag/fn_switchBody_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/drag/fn_switchBody_CMS.sqf
deleted file mode 100644
index 9271d19bea..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/drag/fn_switchBody_CMS.sqf
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * fn_switchBody_CMS.sqf
- * @Descr: DEPCRECATED
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_oldBody","_newUnit","_class","_group","_position","_side","_allVariables"];
-_oldBody = _this select 0;
-_caller = _this select 1;
-
- if (alive _oldBody) exitwith {};
- _name = _oldBody getvariable ["cse_name","unknown"];
- _class = typeof _oldBody;
- _side = side _caller;
- _group = createGroup _side;
- _position = getPos _oldBody;
-
- //_group = (group _oldBody);
- //_newUnit = _group createUnit [_class, _position, [], 3, "FORM"];
- _newUnit = _group createUnit [typeof _oldBody, _position, [], 0, "NONE"];
-
-
-
- _allVariables = [_oldBody] call cse_fnc_getAllSetVariables;
- // [NAME (STRING), TYPENAME (STRING), VALUE (ANY), DEFAULT GLOBAL (BOOLEAN)]
- {
- [_newUnit,_x select 0, _x select 2] call cse_fnc_setVariable;
- }foreach _allVariables;
- _newUnit setVariable ["cse_name",_name,true];
-
- _newUnit disableAI "TARGET";
- _newUnit disableAI "AUTOTARGET";
- _newUnit disableAI "MOVE";
- _newUnit disableAI "ANIM";
- _newUnit disableAI "FSM";
- _newUnit setvariable ["cse_isDead",true,true];
-
- _newUnit setvariable ["cse_heartRate", 0];
- _newUnit setvariable ["cse_bloodPressure", [0,0]];
-
- removeallweapons _newUnit;
- removeallassigneditems _newUnit;
- removeUniform _newUnit;
- removeHeadgear _newUnit;
- removeBackpack _newUnit;
- removeVest _newUnit;
-
-
- _newUnit addHeadgear (headgear _oldBody);
- _newUnit addBackpack (backpack _oldBody);
- clearItemCargoGlobal (backpackContainer _newUnit);
- clearMagazineCargoGlobal (backpackContainer _newUnit);
- clearWeaponCargoGlobal (backpackContainer _newUnit);
-
- _newUnit addVest (vest _oldBody);
- clearItemCargoGlobal (backpackContainer _newUnit);
- clearMagazineCargoGlobal (backpackContainer _newUnit);
- clearWeaponCargoGlobal (backpackContainer _newUnit);
-
- _newUnit addUniform (uniform _oldBody);
- clearItemCargoGlobal (backpackContainer _newUnit);
- clearMagazineCargoGlobal (backpackContainer _newUnit);
- clearWeaponCargoGlobal (backpackContainer _newUnit);
-
- {_newUnit addMagazine _x} count (magazines _oldBody);
- {_newUnit addWeapon _x} count (weapons _oldBody);
- {_newUnit addItem _x} count (items _oldBody);
-
- _newUnit selectWeapon (primaryWeapon _newUnit);
- [_newUnit,([_newUnit] call cse_fnc_getDeathAnim)] call cse_fnc_broadcastAnim;
-
- if (CSE_SYS_MEDICAL_INTERACTION_TARGET == _oldBody) then {
- CSE_SYS_MEDICAL_INTERACTION_TARGET = _newUnit;
- };
-// [[_oldBody,_newUnit],_name,"cse_fnc_onBodySwtich_CMS",true,false] spawn BIS_fnc_MP;
-
- deleteVehicle _oldBody;
-_newUnit
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkBloodPressureLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/examine/fn_checkBloodPressureLocal_CMS.sqf
deleted file mode 100644
index f883c4ecf6..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkBloodPressureLocal_CMS.sqf
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * fn_checkBloodPressureLocal_CMS.sqf
- * @Descr: Displays specified units current blood pressure
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_caller","_unit","_bloodPressure","_bloodPressureHigh","_bloodPressureLow","_title","_content"];
-_caller = _this select 0;
-_unit = _this select 1;
-
-
- _bloodPressure = [_unit] call cse_fnc_getBloodPressure_CMS;
- if (!alive _unit) then {
- _bloodPressure = [0,0];
- };
-
- _bloodPressureHigh = _bloodPressure select 1;
- _bloodPressureLow = _bloodPressure select 0;
- _output = "";
-_logOutPut = "";
- if ([_caller] call cse_fnc_medicClass_CMS) then {
- _output = "STR_CSE_CMS_CHECK_BLOODPRESSURE_OUTPUT_1";
- _logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)];
- } else {
- if (_bloodPressureHigh > 20) then {
- _output = "STR_CSE_CMS_CHECK_BLOODPRESSURE_OUTPUT_2";
- _logOutPut = "Low";
- if (_bloodPressureHigh > 100) then {
- _output = "STR_CSE_CMS_CHECK_BLOODPRESSURE_OUTPUT_3";
- _logOutPut = "Normal";
- if (_bloodPressureHigh > 160) then {
- _output = "STR_CSE_CMS_CHECK_BLOODPRESSURE_OUTPUT_4";
- _logOutPut = "High";
- };
-
- };
- } else {
- if (random(10) > 3) then {
- _output = "STR_CSE_CMS_CHECK_BLOODPRESSURE_OUTPUT_5";
- _logOutPut = "No Blood Pressure";
- } else {
- _output = "STR_CSE_CMS_CHECK_BLOODPRESSURE_OUTPUT_6";
- };
- };
- };
-
-_title = format["STR_CSE_CMS_CHECK_BLOODPRESSURE"];
-_content = ["STR_CSE_CMS_CHECK_BLOODPRESSURE_CHECKED_MEDIC", _output];
-[_caller, _title, _content, 0,[[_unit] call cse_fnc_getName, round(_bloodPressureHigh),round(_bloodPressureLow)] ] call cse_fnc_sendDisplayInformationTo;
-
-if (_logOutPut != "") then {
- [_unit,"examine",format["%1 checked Blood Pressure: %2",[_caller] call cse_fnc_getName,_logOutPut]] call cse_fnc_addToQuickViewLog_CMS;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkBloodPressure_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/examine/fn_checkBloodPressure_CMS.sqf
deleted file mode 100644
index 0736576321..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkBloodPressure_CMS.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * fn_checkBloodPressure_CMS.sqf
- * @Descr: Displays specified units current blood pressure
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_caller","_unit","_bloodPressure","_bloodPressureHigh","_bloodPressureLow"];
-_caller = _this select 0;
-_unit = _this select 1;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_caller] call cse_fnc_treatmentMutex_CMS;
-_title = format["STR_CSE_CMS_CHECK_BLOODPRESSURE"];
-_content = ["STR_CSE_CMS_CHECK_BLOODPRESSURE_CONTENT"];
-[_caller, _title, _content] call cse_fnc_sendDisplayInformationTo;
-
-
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _caller;
-if !([(2 + round(random(4))),{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-
-[_this, "cse_fnc_checkBloodPressureLocal_CMS", _unit, false] spawn BIS_fnc_MP;
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkPulseLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/examine/fn_checkPulseLocal_CMS.sqf
deleted file mode 100644
index 1b644dfa00..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkPulseLocal_CMS.sqf
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * fn_checkPulseLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_caller","_unit"];
-_caller = _this select 0;
-_unit = _this select 1;
-
- _heartRate = [_unit,"cse_heartRate"] call cse_fnc_getVariable;
- if (!alive _unit) then {
- _heartRate = 0;
- };
- _heartRateOutput = "";
- _logOutPut = "";
- if (_heartRate > 1.0) then {
- if ([_caller] call cse_fnc_medicClass_CMS) then {
- _heartRateOutput = "STR_CSE_CMS_CHECK_PULSE_OUTPUT_1";
- _logOutPut = format["%1",round(_heartRate)];
- } else {
- // non medical personel will only find a pulse/HR
- _heartRateOutput = "STR_CSE_CMS_CHECK_PULSE_OUTPUT_2";
- _logOutPut = "Weak";
- if (_heartRate > 60) then {
- if (_heartRate > 100) then {
- _heartRateOutput = "STR_CSE_CMS_CHECK_PULSE_OUTPUT_3";
- _logOutPut = "Strong";
- } else {
- _heartRateOutput = "STR_CSE_CMS_CHECK_PULSE_OUTPUT_4";
- _logOutPut = "Normal";
- };
- };
- };
- } else {
- _heartRateOutput = "STR_CSE_CMS_CHECK_PULSE_OUTPUT_5";
- _logOutPut = "No heart rate";
- };
-
-_title = "STR_CSE_CMS_CHECK_PULSE";
-_content = ["STR_CSE_CMS_CHECK_PULSE_CHECKED_MEDIC",_heartRateOutput];
-[_caller, _title, _content,0, [[_unit] call cse_fnc_getName, round(_heartRate)]] call cse_fnc_sendDisplayInformationTo;
-
-if (_logOutPut != "") then {
- [_unit,"examine",format["%1 checked Heart Rate: %2",[_caller] call cse_fnc_getName,_logOutPut]] call cse_fnc_addToQuickViewLog_CMS;
-};
diff --git a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkPulse_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/examine/fn_checkPulse_CMS.sqf
deleted file mode 100644
index 812c1bbaf2..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkPulse_CMS.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * fn_checkPulse_CMS.sqf
- * @Descr: Displays specified units current pulse
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_caller","_unit","_title","_content"];
-_caller = _this select 0;
-_unit = _this select 1;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_caller] call cse_fnc_treatmentMutex_CMS;
-_title = format["STR_CSE_CMS_CHECK_PULSE"];
-_content = ["STR_CSE_CMS_CHECK_PULSE_CONTENT"];
-[_caller, _title, _content] call cse_fnc_sendDisplayInformationTo;
-
-
-
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _caller;
-if !([(2 + round(random(4))),{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-
-[_this, "cse_fnc_checkPulseLocal_CMS", _unit, false] spawn BIS_fnc_MP;
-
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkResponse_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/examine/fn_checkResponse_CMS.sqf
deleted file mode 100644
index ead154db66..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/examine/fn_checkResponse_CMS.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_checkResponse_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_caller","_unit"];
-_caller = _this select 0;
-_unit = _this select 1;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_caller] call cse_fnc_treatmentMutex_CMS;
-_title = format["STR_CSE_CMS_CHECK_RESPONSE"];
-_content = ["STR_CSE_CMS_CHECK_RESPONSE_CONTENT"];
-[_caller, _title, _content] call cse_fnc_sendDisplayInformationTo;
-
-
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _caller;
-if !([(2 + round(random(4))),{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-
-_output = "";
-if ([_unit] call cse_fnc_isAwake) then {
- _output = format[localize "STR_CSE_CMS_CHECK_REPONSE_RESPONSIVE",[_unit] call cse_fnc_getName];
-} else {
- _output = format[localize "STR_CSE_CMS_CHECK_REPONSE_UNRESPONSIVE",[_unit] call cse_fnc_getName];
-};
-
-_title = format["STR_CSE_CMS_CHECK_RESPONSE"];
-_content = [format[localize "STR_CSE_CMS_CHECK_REPONSE_YOU_CHECKED",[_unit] call cse_fnc_getName],_output];
-[_caller, _title, _content] call cse_fnc_sendDisplayInformationTo;
-
-[_unit,"examine",_output] call cse_fnc_addToQuickViewLog_CMS;
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_addOpenWounds_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_addOpenWounds_CMS.sqf
deleted file mode 100644
index 5ee4f16d89..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_addOpenWounds_CMS.sqf
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * fn_addOpenWounds_CMS.sqf
- * @Descr: Add open wounds to unit.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT (The object that will recieve the wound), bodyPart STRING, type STRING (Small, medium or large), amount NUMBER (The amount of open wounds added)]
- * @Return: void
- * @PublicAPI: true
- */
-
-private ["_unit", "_bodyPart", "_type", "_openWounds", "_selection", "_amount", "_newAmount"];
-_unit = _this select 0;
-_bodyPart = _this select 1;
-_type = _this select 2;
-_amount = _this select 3;
-
-if (typeName _bodyPart == "STRING") then {
- _bodyPart = [_bodyPart] call cse_fnc_getBodyPartNumber_CMS;
-};
-if (typeName _type == "STRING") then {
- _type = switch (toLower _type) do {
- case "small": {0};
- case "medium": {1};
- case "large": {2};
- default {-1};
- };
-};
-
-if (_type < 0) exitwith {
- [format["Adding an injury with an invalid type: %1",_this], 0] call cse_fnc_debug;
-};
-
-_openWounds = [_unit,"cse_openWounds"] call cse_fnc_getVariable;
-_selection = _openWounds select _bodyPart;
-_newAmount = (_selection select _type) + _amount;
-if (_newAmount < 0) then {
- _newAmount = 0;
-};
-_selection set [ _type, _newAmount];
-_openWounds set [ _bodyPart , _selection];
-[_unit, "cse_openWounds",_openWounds] call cse_fnc_setVariable;
-
-[_unit] call cse_fnc_unitLoop_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_assignMedicRoles_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_assignMedicRoles_CMS.sqf
deleted file mode 100644
index 74d039a2c0..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_assignMedicRoles_CMS.sqf
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * fn_assignMedicRoles_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_logic","_setting","_objects"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-
- [format["AssignMedicalRoles called. Arguments are: %1 %2", _this]] call cse_fnc_debug;
-
-if (!isNull _logic) then {
- _list = _logic getvariable ["EnableList",""];
-
- _splittedList = [_list, ","] call BIS_fnc_splitString;
- _nilCheckPassedList = "";
- {
- _x = [_x] call cse_fnc_string_removeWhiteSpace;
- if !(isnil _x) then {
- if (_nilCheckPassedList == "") then {
- _nilCheckPassedList = _x;
- } else {
- _nilCheckPassedList = _nilCheckPassedList + ","+ _x;
- };
- };
- }foreach _splittedList;
-
- _list = "[" + _nilCheckPassedList + "]";
- _parsedList = [] call compile _list;
- _setting = _logic getvariable ["class",0];
- _objects = synchronizedObjects _logic;
- if (!(_objects isEqualTo []) && _parsedList isEqualTo []) then {
- /*
- This has been enabled again to allow backwards compatability for older CSE missions.
- */
- [["synchronizedObjects for the 'Assign Medic Role' Module is deprecated. Please use the enable for list instead!"], 1] call cse_fnc_debug;
- {
- if (!isnil "_x") then {
- if (typeName _x == typeName objNull) then {
- if (local _x) then {
- [_x,_setting] call cse_fnc_setMedicRole_CMS;
- };
- };
- };
- }foreach _objects;
- };
- {
- if (!isnil "_x") then {
- if (typeName _x == typeName objNull) then {
- if (local _x) then {
- [_x,_setting] call cse_fnc_setMedicRole_CMS;
- };
- };
- };
- }foreach _parsedList;
- };
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalEquipment_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalEquipment_CMS.sqf
deleted file mode 100644
index ce72402043..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalEquipment_CMS.sqf
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * fn_assignMedicalEquipment_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-#define ALL_PLAYERS 0
-#define ONLY_MEDICS 1
-
-
-// TODO add amount of to defines
-#define BASIC_BANDAGES "cse_bandage_basic"
-#define PACKING_BANDAGES "cse_packing_bandage"
-
-
-private ["_logic","_setting","_objects", "_medicsLoadout", "_nonMedics", "_code"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-if (!isNull _logic) then {
- _setting = _logic getvariable ["equipment",0];
- waituntil {!isnil "cse_gui"}; // ensure the player unit is available.
- waituntil {time>0};
-
- _start = diag_tickTime;
- waituntil {(["cse_sys_medical"] call cse_fnc_isModuleEnabled_F) || (diag_tickTime - _start > 10000)};
-
- if (!(["cse_sys_medical"] call cse_fnc_isModuleEnabled_F)) exitwith {};
- // TODO Create functions for adding multiple magazines to a unit
- // TODO Check if unit can store more magazines (ie backpack/vest/uniform are not full)
-
- _medicsLoadout = {
- for "_i" from 1 to 8 do {
- player addItem BASIC_BANDAGES;
- player addItem PACKING_BANDAGES;
- };
- for "_i" from 1 to 3 do {
- player addItem "cse_tourniquet";
- };
- for "_i" from 1 to 3 do {
- player addItem "cse_morphine";
- };
- for "_i" from 1 to 2 do {
- player addItem "cse_epinephrine";
- };
- };
-
- _nonMedics = {
- for "_i" from 1 to 3 do {
- player addItem BASIC_BANDAGES;
- };
- player addItem "cse_tourniquet";
- player addItem "cse_morphine";
- };
-
-
- // TODO make this neat code.
- switch (_setting) do {
- case ALL_PLAYERS: {
- _code = if ([player] call cse_fnc_medicClass_CMS) then {
- _medicsLoadout;
- } else {
- _nonMedics;
- };
-
- call _code;
- player addEventhandler["Respawn", _code];
- };
- case ONLY_MEDICS: {
- _code = if ([player] call cse_fnc_medicClass_CMS) then {
- _medicsLoadout;
- } else {
- {};
- };
- call _code;
- player addEventhandler["Respawn", _code];
- };
- default {};
- };
- };
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalFacility_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalFacility_CMS.sqf
deleted file mode 100644
index 42bda85c80..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalFacility_CMS.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * fn_assignMedicalFacility_CMS.sqf
- * @Descr: Register synchronized objects from passed object as a medical facility for CMS.
- * @Author: Glowbal
- *
- * @Arguments: [logic OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_logic","_setting","_objects"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-if (!isNull _logic) then {
- _setting = _logic getvariable ["class",0];
- _objects = synchronizedObjects _logic;
- {
- if (local _x) then {
- _x setvariable["cse_medical_facility", true, true];
- };
- }foreach _objects;
- };
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalVehicle_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalVehicle_CMS.sqf
deleted file mode 100644
index 8f26dcb8d3..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_assignMedicalVehicle_CMS.sqf
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * fn_assignMedicalVehicle_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_logic","_setting", "_list", "_parsedList", "_splittedList","_nilCheckPassedList", "_objects"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-
- [format["AssignMedicalRoles called. Arguments are: %1 %2", _this]] call cse_fnc_debug;
-
-if (!isNull _logic) then {
- _list = _logic getvariable ["EnableList",""];
- _setting = _logic getvariable ["enabled",0];
-
- _splittedList = [_list, ","] call BIS_fnc_splitString;
- _nilCheckPassedList = "";
- {
- _x = [_x] call cse_fnc_string_removeWhiteSpace;
- if !(isnil _x) then {
- if (_nilCheckPassedList == "") then {
- _nilCheckPassedList = _x;
- } else {
- _nilCheckPassedList = _nilCheckPassedList + ","+ _x;
- };
- };
- }foreach _splittedList;
-
- _list = "[" + _nilCheckPassedList + "]";
- _parsedList = [] call compile _list;
-
- _objects = synchronizedObjects _logic;
- {
- // assign the medical vehicle role for non man type objects that are local only.
- if !(_x isKindOf "CAManBase") then {
- if (local _x) then {
- _x setvariable ["cse_medicalVehicle_CMS", _setting, true];
- };
- };
- }foreach _objects;
-
- {
- if (!isnil "_x") then {
- if (typeName _x == typeName objNull) then {
- // assign the medical vehicle role for non man type objects that are local only.
- if !(_x isKindOf "CAManBase") then {
- if (local _x) then {
- _x setvariable ["cse_medicalVehicle_CMS", _setting, true];
- };
- };
- };
- };
- }foreach _parsedList;
- };
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_canAccessMedicalEquipment_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_canAccessMedicalEquipment_CMS.sqf
deleted file mode 100644
index 133899ea79..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_canAccessMedicalEquipment_CMS.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_canAccessMedicalEquipment_CMS.sqf
- * @Descr: Check if caller can access targets medical equipment, based upon accessLevel
- * @Author: Glowbal
- *
- * @Arguments: [target OBJECT, caller OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_target", "_caller", "_accessLevel", "_return"];
-_target = _this select 0;
-_caller = _this select 1;
-
-_accessLevel = _target getvariable ["cse_allowSharedEquipmentAccess_CMS", -1];
-
-_return = false;
-
-if (_accessLevel >= 0) then {
- if (_accessLevel == 0) exitwith { _return = true; };
- if (_accessLevel == 1) exitwith { _return = (side _target == side _caller); };
- if (_accessLevel == 2) exitwith { _return = (group _target == group _caller); };
-};
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_canPutInBodyBag_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_canPutInBodyBag_CMS.sqf
deleted file mode 100644
index 843b3c5d8b..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_canPutInBodyBag_CMS.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_canPutInBodyBag_CMS.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-private ["_unit","_caller"];
-_unit = _this select 0;
-_caller = _this select 1;
-
-([_caller, "cse_itemBodyBag"] call cse_fnc_hasItem && {(!(alive _unit) || (_unit getvariable ["cse_isDead",false]) || (_unit getvariable ["cse_inReviveState", false]))} && {(_unit distance _caller) < 7.5} && (vehicle _unit == _unit)); // return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_coreLoop_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_coreLoop_CMS.sqf
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_effectsLoop_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_effectsLoop_CMS.sqf
deleted file mode 100644
index 4d0165b285..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_effectsLoop_CMS.sqf
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * fn_effectsLoop_CMS.sqf
- * @Descr: displays visual effects to user
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_bloodLoss","_bloodStatus","_painStatus"];
-_unit = player;
-if (!hasInterface || !isPlayer _unit || !local _unit) exitwith{};
-45 cutRsc ["RscCSEScreenEffectsBlack","PLAIN"];
-cseDisplayingBleedingEffect = false;
-cseDisplayingPainEffect = false;
-cseDisplayingUnconiciousEffect = false;
-
-_hb_effect = {
- _heartRate = _this select 0;
- if (_heartRate < 0.1) exitwith {};
- _hbSoundsFast = ["cse_heartbeat_fast_1", "cse_heartbeat_fast_2", "cse_heartbeat_fast_3", "cse_heartbeat_norm_1", "cse_heartbeat_norm_2"];
- _hbSoundsNorm = ["cse_heartbeat_norm_1", "cse_heartbeat_norm_2"];
- _hbSoundsSlow = ["cse_heartbeat_slow_1", "cse_heartbeat_slow_2", "cse_heartbeat_norm_1", "cse_heartbeat_norm_2"];
- if (isnil "CSE_PLAYING_HB_SOUND") then {
- CSE_PLAYING_HB_SOUND = false;
- };
- if (CSE_PLAYING_HB_SOUND) exitwith {};
- CSE_PLAYING_HB_SOUND = true;
-
- _sleep = 60 / _heartRate;
- if (_heartRate < 60) then {
- _sound = _hbSoundsSlow select (random((count _hbSoundsSlow) -1));
- playSound _sound;
-
- sleep _sleep;
- } else {
- if (_heartRate > 120) then {
- _sound = _hbSoundsFast select (random((count _hbSoundsFast) -1));
- playSound _sound;
- sleep _sleep;
- };
- };
- CSE_PLAYING_HB_SOUND = false;
-};
-
-while {true} do {
- _unit = player;
- if ([_unit] call cse_fnc_isAwake) then {
- sleep 0.25;
- _bloodLoss = _unit call cse_fnc_getBloodLoss_CMS;
- _bloodStatus = [_unit,"cse_bloodVolume",100] call cse_fnc_getVariable;
- _painStatus = [_unit,"cse_pain",0] call cse_fnc_getVariable;
-
- if (_bloodLoss >0) then {
- //["cse_sys_medical_isBleeding", true, "cse\cse_sys_medical\data\icons\icon_bleeding.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
- [_bloodLoss] spawn cse_fnc_effectBleeding;
- } else {
- //["cse_sys_medical_isBleeding", false, "cse\cse_sys_medical\data\icons\icon_bleeding.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
- };
- sleep 0.25 +(random(2));
- if (_painStatus > 0) then {
- [_painStatus] spawn cse_fnc_effectPain;
- };
- sleep 0.25 +(random(1));
- _heartRate = [_unit,"cse_heartRate",70] call cse_fnc_getVariable;
- [_heartRate] spawn _hb_effect;
- } else {
- cseDisplayingBleedingEffect = false;
- };
-};
-
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getAdvancedOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getAdvancedOptions_CMS.sqf
deleted file mode 100644
index 9c14b29db9..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getAdvancedOptions_CMS.sqf
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * fn_getAdvancedOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return"];
-_return = [];
-
-if (CSE_SYS_MEDICAL_INTERACTION_TARGET != player && (isNull ([player] call cse_fnc_getCarriedObj))) then {
-
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET, 'cse_blood_iv'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_BLOODIV_1000ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_blood_iv'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_BLOODIV_1000ML_TOOLTIP"];
- };
- if ([player,CSE_SYS_MEDICAL_INTERACTION_TARGET, 'cse_blood_iv_500'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_BLOODIV_500ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_blood_iv_500'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_BLOODIV_500ML_TOOLTIP"];
- };
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_blood_iv_250'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_BLOODIV_250ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_blood_iv_250'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_BLOODIV_250ML_TOOLTIP"];
- };
-
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_plasma_iv'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_PLASMAIV_1000ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_plasma_iv'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_PLASMAIV_1000ML_TOOLTIP"];
- };
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_plasma_iv_500'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_PLASMAIV_500ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_plasma_iv_500'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_PLASMAIV_500ML_TOOLTIP"];
- };
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_plasma_iv_250'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_PLASMAIV_250ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_plasma_iv_250'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_PLASMAIV_250ML_TOOLTIP"];
- };
-
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_saline_iv'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_SALINEIV_1000ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_saline_iv'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_SALINEIV_1000ML_TOOLTIP"];
- };
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_saline_iv_500'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_SALINEIV_500ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_saline_iv_500'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_SALINEIV_500ML_TOOLTIP"];
- };
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_saline_iv_250'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_SALINEIV_250ml","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_saline_iv_250'] call cse_fnc_iv_CMS;",localize "STR_CSE_ACTION_SALINEIV_250ML_TOOLTIP"];
- };
-
- // TODO refactor this condition into a function.
- if ((CSE_AID_KIT_RESTRICTIONS_CMS == 0 && ([player] call cse_fnc_inMedicalFacility_CMS)) ||
- (CSE_AID_KIT_RESTRICTIONS_CMS == 1 && ([player] call cse_fnc_inMedicalFacility_CMS) && (!([CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_hasOpenWounds_CMS))) ||
- (CSE_AID_KIT_RESTRICTIONS_CMS == 2) ||
- (CSE_AID_KIT_RESTRICTIONS_CMS == 3 && (!([CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_hasOpenWounds_CMS)))) then {
-
- if (CSE_AIDKITMEDICSONLY_CMS && [player] call cse_fnc_medicClass_CMS || !CSE_AIDKITMEDICSONLY_CMS) then {
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_personal_aid_kit'] call cse_fnc_hasEquipment_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_PERSONAL_AID_KIT","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_personal_aid_kit'] call cse_fnc_heal_CMS;",localize "STR_CSE_ACTION_PERSONAL_AID_KIT_TOOLTIP"];
- };
- };
- };
- if (isnil "cse_playerIsProvidingCPR_CMS") then {
- cse_playerIsProvidingCPR_CMS = false;
- };
- if ((CSE_SYS_MEDICAL_INTERACTION_TARGET getvariable ["cse_cardiacArrest_CMS",false]) || !([CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_isAwake) && !cse_playerIsProvidingCPR_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_PERFORM_CPR","[_this select 0,_this select 1] call cse_fnc_performCPR_CMS;", localize "STR_CSE_ACTION_PERFORM_CPR_TOOLTIP"];
- };
- if (cse_playerIsProvidingCPR_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_STOP_CPR","cse_playerIsProvidingCPR_CMS = false;", localize "STR_CSE_ACTION_STOP_CPR_TOOLTIP"];
- };
-
- if ((CSE_STITCHING_ALLOW_CMS == 0 && [player] call cse_fnc_medicClass_CMS) || CSE_STITCHING_ALLOW_CMS == 1) then {
- if ([player, CSE_SYS_MEDICAL_INTERACTION_TARGET, 'cse_surgical_kit'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_STITCHING","[_this select 0,_this select 1, call cse_fnc_getSelectedBodyPart_CMS, 'cse_surgical_kit'] call cse_fnc_performStitching_CMS;", localize "STR_CSE_ACTION_STITCHING_TOOLTIP"];
- };
- };
-
- _return = [CSE_SYS_MEDICAL_INTERACTION_TARGET, "getAdvancedOptions_CMS", _return] call cse_fnc_getOptionsForCategory_CMS;
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getAirwayOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getAirwayOptions_CMS.sqf
deleted file mode 100644
index 6237a0ac3a..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getAirwayOptions_CMS.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_getAirwayOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_return"];
-_return = [];
-
-
-if (CSE_SYS_MEDICAL_INTERACTION_TARGET != player && (isNull ([player] call cse_fnc_getCarriedObj))) then {
- if (CSE_ALLOW_AIRWAY_INJURIES_CMS) then {
- if (([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_nasopharyngeal_tube'] call cse_fnc_hasEquipment_CMS) && !([CSE_SYS_MEDICAL_INTERACTION_TARGET, "cse_airwayTreated"] call cse_fnc_getVariable) && !([CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_isAwake)) then {
- _return pushback [localize "STR_CSE_ACTION_APPLY_NPA", "[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_nasopharyngeal_tube'] call cse_fnc_treatmentAirway_CMS;", localize "STR_CSE_ACTION_APPLY_NPA_TOOLTIP"];
- };
- if ([CSE_SYS_MEDICAL_INTERACTION_TARGET, "cse_airwayTreated"] call cse_fnc_getVariable) then {
- _return pushback [localize "STR_CSE_ACTION_REMOVE_NPA", "CSE_SYS_MEDICAL_INTERACTION_TARGET setvariable ['cse_airwayTreated', nil, true]; player addMagazine 'cse_nasopharyngeal_tube';", localize "STR_CSE_ACTION_REMOVE_NPA_TOOLTIP"];
- };
- _return = [CSE_SYS_MEDICAL_INTERACTION_TARGET, "getAirwayOptions_CMS", _return] call cse_fnc_getOptionsForCategory_CMS;
- };
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getBandageOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getBandageOptions_CMS.sqf
deleted file mode 100644
index 4edc0d7eb9..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getBandageOptions_CMS.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * fn_getBandageOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define HAS_EQUIPMENT(ITEM) [player,CSE_SYS_MEDICAL_INTERACTION_TARGET,ITEM] call cse_fnc_hasEquipment_CMS
-
-
-private ["_return"];
-_return = [];
-
-if (isNull ([player] call cse_fnc_getCarriedObj)) then {
- if (HAS_EQUIPMENT('cse_bandage_basic')) then {
- _return pushback [localize "STR_CSE_ACTION_BANDAGE_BASIC","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_bandage_basic', call cse_fnc_getCurrentSelectedInjuryData_CMS] call cse_fnc_bandage_CMS;",localize "STR_CSE_ACTION_BANDAGE_BASIC_TOOLTIP"];
- };
- if ([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_quikclot'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_QUIKCLOT","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_quikclot', call cse_fnc_getCurrentSelectedInjuryData_CMS] call cse_fnc_bandage_CMS;",localize "STR_CSE_ACTION_QUIKCLOT_TOOLTIP"];
- };
- if ([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_bandageElastic'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_BANDAGE_ELASTIC","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_bandageElastic', call cse_fnc_getCurrentSelectedInjuryData_CMS] call cse_fnc_bandage_CMS;",localize "STR_CSE_ACTION_BANDAGE_ELASTIC_TOOLTIP"];
- };
- if ([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_packing_bandage'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_PACKING_BANDAGE","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_packing_bandage', call cse_fnc_getCurrentSelectedInjuryData_CMS] call cse_fnc_bandage_CMS;",localize "STR_CSE_ACTION_PACKING_BANDAGE_TOOLTIP"];
- };
-
- if (([CSE_SYS_MEDICAL_INTERACTION_TARGET, call cse_fnc_getSelectedBodyPart_CMS] call cse_fnc_hasTourniquetAppliedTo_CMS)) then {
- _return pushback [localize "STR_CSE_ACTION_REMOVE_TOURNIQUET","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_tourniquet'] call cse_fnc_removeTourniquet_CMS;",localize "STR_CSE_ACTION_REMOVE_TOURNIQUET_TOOLTIP"];
- } else {
- if ([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_tourniquet'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_APPLY_TOURNIQUET","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_tourniquet'] call cse_fnc_tourniquet_CMS;",localize "STR_CSE_ACTION_APPLY_TOURNIQUET_TOOLTIP"];
- };
- };
- _return = [CSE_SYS_MEDICAL_INTERACTION_TARGET, "getBandageOptions_CMS", _return] call cse_fnc_getOptionsForCategory_CMS;
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getBloodLoss_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getBloodLoss_CMS.sqf
deleted file mode 100644
index a9ee1cab89..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getBloodLoss_CMS.sqf
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * fn_getBloodLoss_CMS.sqf
- * @Descr: Calculate the total blood loss of a unit.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: NUMBER Total blood loss of unit
- * @PublicAPI: true
- */
-
-#define BLOODLOSS_SMALL_WOUNDS 0.025
-#define BLOODLOSS_MEDIUM_WOUNDS 0.05
-#define BLOODLOSS_LARGE_WOUNDS 0.1
-
-/**
-* The default cardiac output when all stats are set to normal is 5.25.
-*/
-#define DEFAULT_CARDIAC_OUTPUT 5.25
-
-private ["_totalBloodLoss","_tourniquets","_openWounds", "_value", "_cardiacOutput"];
-
-_totalBloodLoss = 0;
-_tourniquets = [_this, "cse_tourniquets"] call cse_fnc_getvariable;
-_openWounds = [_this, "cse_openWounds"] call cse_fnc_getvariable;
-_cardiacOutput = [_this] call cse_fnc_getCardiacOutput_CMS;
-
-{
- if ((_tourniquets select _foreachIndex) < 1) then {
- _totalBloodLoss = _totalBloodLoss + (((BLOODLOSS_SMALL_WOUNDS * (_x select 0))) + ((BLOODLOSS_MEDIUM_WOUNDS * (_x select 1))) + ((BLOODLOSS_LARGE_WOUNDS * (_x select 2))) * (_cardiacOutput / DEFAULT_CARDIAC_OUTPUT));
- };
-}foreach _openWounds;
-
-// cap the blood loss to be no greater as the current cardiac output
-(_totalBloodLoss min _cardiacOutput);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getDragOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getDragOptions_CMS.sqf
deleted file mode 100644
index 427dc219dc..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getDragOptions_CMS.sqf
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * fn_getDragOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return","_nameOfUnit","_unit"];
-_return = [];
-
-if (hasInterface) then {
- //_unit = [player] call cse_fnc_getInteractionTarget;
- _unit = CSE_SYS_MEDICAL_INTERACTION_TARGET;
- if (!isNull _unit) then {
- if (_unit != player && (_unit isKindOf "CaManBase")) then {
- _nameOfUnit = [_unit] call cse_fnc_getName;
- if (vehicle _unit == _unit) then {
- if (([player] call cse_fnc_getCarriedObj) != _unit && (isNull ([player] call cse_fnc_getCarriedObj))) then {
-
- _return pushback [localize "STR_CSE_ACTION_DRAG_PATIENT","[_this select 1,_this select 0] call CSE_fnc_drag_CMS;",format[localize "STR_CSE_ACTION_DRAG_PATIENT_TOOLTIP",_nameOfUnit]];
- _return pushback [localize "STR_CSE_ACTION_CARRY_PATIENT","[_this select 1,_this select 0] call cse_fnc_carry_CMS;",format[localize "STR_CSE_ACTION_CARRY_PATIENT_TOOLTIP",_nameOfUnit]];
- if ([_unit, player] call cse_fnc_canPutInBodyBag_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_BODYBAG","[_this select 0,_this select 1] call cse_fnc_placeInBodyBag_CMS;",localize "STR_CSE_ACTION_BODYBAG_TOOLTIP"];
- };
- } else {
- if (([player] call cse_fnc_getCarriedObj) == _unit) then {
- _return pushback [localize "STR_CSE_ACTION_DROP_PATIENT","[_this select 1,_this select 0] call cse_fnc_drop_CMS;",format[localize "STR_CSE_ACTION_DROP_PATIENT_TOOLTIP",_nameOfUnit]];
- };
- };
- _return pushback [localize "STR_CSE_ACTION_LOAD_PATIENT","[_this select 1,_this select 0] call cse_fnc_load_CMS;",format[localize "STR_CSE_ACTION_LOAD_PATIENT_TOOLTIP",_nameOfUnit]];
- } else {
- _return pushback [localize "STR_CSE_ACTION_UNLOAD_PATIENT","[_this select 1,_this select 0] call cse_fnc_unload_CMS;",format[localize "STR_CSE_ACTION_UNLOAD_PATIENT_TOOLTIP",_nameOfUnit]];
- };
- };
- _return = [_unit, "getDragOptions_CMS", _return] call cse_fnc_getOptionsForCategory_CMS;
- };
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getExamineOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getExamineOptions_CMS.sqf
deleted file mode 100644
index f5ef66b92b..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getExamineOptions_CMS.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_getExamineOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return"];
-_return = [];
-
-_return pushback [localize "STR_CSE_ACTION_CHECK_PULSE","[_this select 1,_this select 0] call cse_fnc_checkPulse_CMS;",localize "STR_CSE_ACTION_CHECK_PULSE_TOOLTIP"];
-
-_return pushback [localize "STR_CSE_ACTION_CHECK_BP","[_this select 1,_this select 0] call cse_fnc_checkBloodPressure_CMS;",localize "STR_CSE_ACTION_CHECK_BP_TOOLTIP"];
-
-_return pushback [localize "STR_CSE_ACTION_CHECK_RESPONSE","[_this select 1,_this select 0] call cse_fnc_checkResponse_CMS;",localize "STR_CSE_ACTION_CHECK_RESPONSE_TOOLTIP"];
-
-_return = [CSE_SYS_MEDICAL_INTERACTION_TARGET, "getExamineOptions_CMS", _return] call cse_fnc_getOptionsForCategory_CMS;
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getMedicationOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getMedicationOptions_CMS.sqf
deleted file mode 100644
index 3705d15099..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getMedicationOptions_CMS.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * fn_getMedicationOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return"];
-_return = [];
-if (isNull ([player] call cse_fnc_getCarriedObj)) then {
- if ([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_morphine'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_MORPHINE","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_morphine'] call cse_fnc_medication_CMS;",localize "STR_CSE_ACTION_MORPHINE_TOOLTIP"];
- };
- if ([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_atropine'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_ATROPINE","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_atropine'] call cse_fnc_medication_CMS;",localize "STR_CSE_ACTION_ATROPINE_TOOLTIP"];
- };
- if ([player,CSE_SYS_MEDICAL_INTERACTION_TARGET,'cse_epinephrine'] call cse_fnc_hasEquipment_CMS) then {
- _return pushback [localize "STR_CSE_ACTION_EPINEPHRINE","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_epinephrine'] call cse_fnc_medication_CMS;",localize "STR_CSE_ACTION_EPINEPHRINE_TOOLTIP"];
- };
-
- _return = [CSE_SYS_MEDICAL_INTERACTION_TARGET, "getMedicationOptions_CMS", _return] call cse_fnc_getOptionsForCategory_CMS;
-
- //_return set [count _return, ["Anti-Biotics","[_this select 0,_this select 1,call cse_fnc_getSelectedBodyPart_CMS,'cse_antiBiotics'] call cse_fnc_medication_CMS;","To counter infections"]];
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getOptionsForCategory_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getOptionsForCategory_CMS.sqf
deleted file mode 100644
index 868aa53835..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getOptionsForCategory_CMS.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * fn_getOptionsForCategory_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_target", "_category", "_return", "_allow", "_resultsOfEH"];
-_target = _this select 0;
-_category = _this select 1;
-_return = _this select 2;
-
-_resultsOfEH = [[_target],_category] call cse_fnc_customEventHandler_F;
-{
- {
- if (count _x == 3) then {
- _allow = true;
- {
- if (typeName _x != typeName "") exitwith {
- _allow = false;
- };
- }foreach _x;
- if (_allow) then {
- _return pushback _x;
- };
- };
- }foreach _x;
-}foreach _resultsOfEH;
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getSelectedBodyPart_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getSelectedBodyPart_CMS.sqf
deleted file mode 100644
index f9ffa3ee22..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getSelectedBodyPart_CMS.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_getSelectedBodyPart_CMS.sqf
- * @Descr: Get the current selected body part for client
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return: STRING bodyPart selected
- * @PublicAPI: true
- */
-
-
- if (isnil "CSE_SELECTED_BODY_PART_CMS") then {
- CSE_SELECTED_BODY_PART_CMS = "head";
- };
-
-CSE_SELECTED_BODY_PART_CMS
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getToggleOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getToggleOptions_CMS.sqf
deleted file mode 100644
index eace6ef0ed..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getToggleOptions_CMS.sqf
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * fn_getToggleOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return"];
-_return = [];
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_getTriageCardOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_getTriageCardOptions_CMS.sqf
deleted file mode 100644
index 7e3ddd11d4..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_getTriageCardOptions_CMS.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_getTriageCardOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return"];
-_return = [];
-
-
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_hasMedicalEnabled_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_hasMedicalEnabled_CMS.sqf
deleted file mode 100644
index ba75151d6b..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_hasMedicalEnabled_CMS.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_hasMedicalEnabled_CMS.sqf
- * @Descr: Check if unit has CMS enabled.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-
-private ["_unit", "_medicalEnabled"];
-_unit = _this select 0;
-
-_medicalEnabled = _unit getvariable "cse_sys_medical_enabled";
-if (isnil "_medicalEnabled") then {
- (((CSE_ENABLE_SETTING_FORUNITS_CMS == 0 && (isPlayer _unit || (_unit getvariable ["cse_isDeadPlayer", false])))) || (CSE_ENABLE_SETTING_FORUNITS_CMS == 1));
-} else {
- _medicalEnabled;
-};
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_hasOpenWounds_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_hasOpenWounds_CMS.sqf
deleted file mode 100644
index 3470e2f634..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_hasOpenWounds_CMS.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * fn_hasOpenWounds_CMS.sqf
- * @Descr: Check if unit has open wounds
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT (The unit to check)]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private "_openWounds";
-_openWounds = [_this select 0,"cse_openWounds"] call cse_fnc_getvariable;
-
-({(((_x select 0) + (_x select 1) + (_x select 2)) > 0)}count _openWounds > 0);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_inMedicalFacility_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_inMedicalFacility_CMS.sqf
deleted file mode 100644
index f13c3e7d44..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_inMedicalFacility_CMS.sqf
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * fn_inMedicalFacility_CMS.sqf
- * @Descr: Checks if a unit is in a designated medical facility
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL true if unit is in a building or under a roof.
- * @PublicAPI: true
- */
-
-private ["_unit","_eyePos","_objects","_isInBuilding","_medicalFacility"];
-_unit = [_this, 0, ObjNull, [ObjNull]] call BIS_fnc_Param;
-
-_eyePos = eyePos _unit;
-_isInBuilding = false;
-
-_medicalFacility =
- [
- "TK_GUE_WarfareBFieldhHospital_Base_EP1",
- "TK_GUE_WarfareBFieldhHospital_EP1",
- "TK_WarfareBFieldhHospital_Base_EP1",
- "TK_WarfareBFieldhHospital_EP1",
- "US_WarfareBFieldhHospital_Base_EP1",
- "US_WarfareBFieldhHospital_EP1",
- "MASH_EP1",
- "MASH",
- "Land_A_Hospital",
- "CDF_WarfareBFieldhHospital",
- "GUE_WarfareBFieldhHospital",
- "INS_WarfareBFieldhHospital",
- "RU_WarfareBFieldhHospital",
- "USMC_WarfareBFieldhHospital"
- ];
-
-_objects = (lineIntersectsWith [_unit modelToWorld [0, 0, (_eyePos select 2)], _unit modelToWorld [0, 0, (_eyePos select 2) +10], _unit]);
-{
- if (((typeOf _x) in _medicalFacility) || (_x getVariable ["cse_medical_facility",false])) exitwith {
- _isInBuilding = true;
- };
-}foreach _objects;
-if (!_isInBuilding) then {
- _objects = position _unit nearObjects 7.5;
- {
- if (((typeOf _x) in _medicalFacility) || (_x getVariable ["cse_medical_facility",false])) exitwith {
- _isInBuilding = true;
- };
- }foreach _objects;
-};
-_isInBuilding
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_initForUnit_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_initForUnit_CMS.sqf
deleted file mode 100644
index 107fc20996..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_initForUnit_CMS.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * fn_initForUnit_CMS.sqf
- * @Descr: Deprecated. Is no longer used, as we dropped init eventhandler methods.
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_handler"];
- _unit = _this select 0;
- if (!local _unit) exitwith {[format["UNIT IS NOT LOCAL: %1",_this]] call cse_fnc_debug;};
- if !(_unit isKindOf "CAManBase") exitwith{[format["UNIT IS NOT CAManBase: %1",_this]] call cse_fnc_debug;};
- if (isPlayer _unit) then {
- [_unit] spawn {
- disableSerialization;
- _CMSFadingBlackUI = uiNamespace getVariable "CMSFadingBlackUI";
- if (!isnil "_CMSFadingBlackUI") then {
- _ctrlFadingBlackUI = _CMSFadingBlackUI displayCtrl 11112;
- 2 fadeSound 1;
- _ctrlFadingBlackUI ctrlSetTextColor [0.0,0.0,0.0,0.0];
- };
- waituntil {!isnil "cse_fnc_effectsLoop_CMS"};
- [_this select 0] call cse_fnc_effectsLoop_CMS;
- };
- };
-
-{
- if(_x == "FirstAidKit" || {_x == "Medikit" || {_x isKindOf "FirstAidKit" || {_x isKindOf "Medikit"}}}) then {
- _unit removeItem _x;
- };
-}foreach (items _unit);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_isMedicalVehicle_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_isMedicalVehicle_CMS.sqf
deleted file mode 100644
index cf498be577..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_isMedicalVehicle_CMS.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_isMedicalVehicle_CMS.sqf
- * @Descr: Check if vehicle is a medical vehicle
- * @Author: Glowbal
- *
- * @Arguments: [vehicle OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_veh"];
-_veh = _this select 0;
-
-if !(_veh getvariable ["cse_medicalVehicle_CMS", true]) exitwith {false}; // exit in case the false is set.
-((getNumber(configFile >> "CfgVehicles" >> typeOf _veh >> "cse_medicalVehicle") == 1) || (_veh getvariable ["cse_medicalVehicle_CMS", false]));
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_medicClass_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_medicClass_CMS.sqf
deleted file mode 100644
index b13c9b0c20..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_medicClass_CMS.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_medicClass_CMS.sqf
- * @Descr: Check if a unit is any medical class above normal.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_unit","_class","_return"];
-_unit = [_this, 0, objNull,[ObjNull]] call BIS_fnc_Param;
-
-if (isnil "CSE_ADVANCED_MEDICAL_ROLES_CMS") exitwith {
- true;
-};
-
-if (CSE_ADVANCED_MEDICAL_ROLES_CMS) then {
- _class = [_unit,"cse_medicClass"] call cse_fnc_getVariable;
- _return = switch (_class) do {
- case 0: {false};
- case 1: {true};
- case 2: {true};
- default {false};
-
- };
-} else {
- _return = true;
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_onUnconscious_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_onUnconscious_CMS.sqf
deleted file mode 100644
index a859c8b996..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_onUnconscious_CMS.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-
-private ["_unit", "_state"];
-_unit = _this select 0;
-_state = _this select 1;
-
-if (_state) then {
- if (CSE_ALLOW_AIRWAY_INJURIES_CMS) then {
- if (random(1) >= 0.3) then {
- _unit setvariable ["cse_airwayOccluded", true, true];
- };
- };
-} else {
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_placeInBodyBag_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_placeInBodyBag_CMS.sqf
deleted file mode 100644
index 0b385fa7a0..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_placeInBodyBag_CMS.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * fn_placeInBodyBag_CMS.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-private ["_unit","_caller"];
-_unit = _this select 0;
-_caller = _this select 1;
-
-if !([_caller, "cse_itemBodyBag"] call cse_fnc_hasItem) exitwith {};
-
-[_caller, "cse_itemBodyBag"] call cse_fnc_useItem;
-
-_nameOfUnit = [_unit] call cse_fnc_getName;
-if (alive _unit) then {
- // force kill the unit.
- [_unit, true] call cse_fnc_setDead;
-};
-_onPosition = getPos _unit;
-_allVariables = [_unit] call cse_fnc_getAllSetVariables;
-deleteVehicle _unit;
-
-_bodyBagCreated = createVehicle ["cse_bodyBag", _onPosition, [], 0, "NONE"];
-_bodyBagCreated setvariable ["cse_nameOfBody", _nameOfUnit, true];
-
-{
-// [_bodyBagCreated,_x select 0, _x select 2] call cse_fnc_setVariable;
-}foreach _allVariables;
-// reset the position to ensure it is on the correct one.
-_bodyBagCreated setPos _onPosition;
-
-[[_bodyBagCreated], "cse_fnc_revealObject_f", true] spawn bis_fnc_MP;
-
-_bodyBagCreated setvariable ["CSE_Logistics_Enable_drag", true, true];
-
-_bodyBagCreated;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_playInjuredSound_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_playInjuredSound_CMS.sqf
deleted file mode 100644
index 06991a7497..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_playInjuredSound_CMS.sqf
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * fn_playInjuredSound_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit","_amountOfDamage","_bodyPartStatus","_availableSounds_A","_availableSounds_B","_availableSounds_C","_sound"];
-_unit = _this select 0;
-if (!local _unit) exitwith{};
-
-if ((_unit getvariable ["CSE_PLAYING_INJURED_SOUND_CMS",false])) exitwith {};
-_unit setvariable ["CSE_PLAYING_INJURED_SOUND_CMS",true];
-_availableSounds_A = [
- "WoundedGuyA_01",
- "WoundedGuyA_02",
- "WoundedGuyA_03",
- "WoundedGuyA_04",
- "WoundedGuyA_05",
- "WoundedGuyA_06",
- "WoundedGuyA_07",
- "WoundedGuyA_08"
-];
-_availableSounds_B = [
- "WoundedGuyB_01",
- "WoundedGuyB_02",
- "WoundedGuyB_03",
- "WoundedGuyB_04",
- "WoundedGuyB_05",
- "WoundedGuyB_06",
- "WoundedGuyB_07",
- "WoundedGuyB_08"
-];
-_availableSounds_C = [
- "WoundedGuyC_01",
- "WoundedGuyC_02",
- "WoundedGuyC_03",
- "WoundedGuyC_04",
- "WoundedGuyC_05"
-];
-
-_bodyPartStatus = [_unit,"cse_bodyPartStatus"] call cse_fnc_getvariable;
-
-_amountOfDamage = 0;
-{
- _amountOfDamage = _amountOfDamage + _x;
-}foreach _bodyPartStatus;
-
-
-if (_amountOfDamage > 0) then {
- _sound = "";
- if (_amountOfDamage > 1) then {
- if (random(1) > 0.5) then {
- _sound = _availableSounds_A select (round(random((count _availableSounds_A) - 1)));
- } else {
- _sound = _availableSounds_B select (round(random((count _availableSounds_B) - 1)));
- };
- } else {
- _sound = _availableSounds_B select (round(random((count _availableSounds_B) - 1)));
- };
- [[_unit,_sound], "cse_fnc_broadcastSound3D_F", true, false] spawn BIS_fnc_MP;
- if (_amountOfDamage < 1) then {
- sleep 10;
- sleep (random(50));
- } else {
- sleep (60 / _amountOfDamage);
- };
-
-};
-_unit setvariable ["CSE_PLAYING_INJURED_SOUND_CMS",nil];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_setDead_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_setDead_CMS.sqf
deleted file mode 100644
index c049473ae8..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_setDead_CMS.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_setDead_CMS.sqf
- * @Descr: Set a unit dead from within CMS.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: void
- * @PublicAPI: true
- */
-
-private ["_unit"];
-_unit = _this select 0;
-
-if (!alive _unit) exitwith{};
-if (!local _unit) exitwith {};
-
-[_unit, "cse_pain",0,true] call cse_fnc_setVariable;
-[_unit, "cse_heartRate",0,true] call cse_fnc_setVariable;
-[_unit, "cse_bloodPressure", [0,0],true] call cse_fnc_setVariable;
-[_unit, "cse_airway", 3, true] call cse_fnc_setVariable;
-
-[_unit] call cse_fnc_setDead; // calling framework function
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_setMedicRole_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_setMedicRole_CMS.sqf
deleted file mode 100644
index 3459341faf..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_setMedicRole_CMS.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_setMedicRole_CMS.sqf
- * @Descr: Register a unit as a medic
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT (Any unit of type CAManBase), value NUMBER (0 is normal. 1 or above is medic)]
- * @Return: void
- * @PublicAPI: true
- */
-
-private ["_unit","_value"];
-_unit = [_this,0,ObjNull,[ObjNull]] call BIS_fnc_param;
-_value = [_this, 1, false,[false]] call BIS_fnc_param;
-
-if (_unit isKindOf "CaManBase") then {
- if (_value) then {
- _unit setvariable ["cse_medicClass",1,true];
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/fn_updateAttributes_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/fn_updateAttributes_CMS.sqf
deleted file mode 100644
index c68b15c954..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/fn_updateAttributes_CMS.sqf
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * fn_updateAttributes_CMS.sqf
- * @Descr: This is the old update vitals script. It is here just in case we need to make the switch back to the old version but is not used.
- * @Author: Glowbal
- * @DEPRECATED
- *
- * @Arguments: [unit OBJECT]
- * @Return: void
- * @PublicAPI: false
- */
-
-
-// OLD ALGHORIM
-private ["_unit","_bloodVolume","_bloodPressure","_bloodPressureLow","_bloodPressureHigh","_heartRate","_totalBloodLoss","_hrIncrease","_bpIncreaseHigh","_bpIncreaseLow","_speed","_ivVolume","_painStatus","_showedHint", "_modifier"];
-_unit = _this select 0;
-
-_bloodVolume = [_unit,"cse_bloodVolume"] call cse_fnc_getVariable;
-_bloodPressure = [_unit,"cse_bloodPressure"] call cse_fnc_getVariable;
-_bloodPressureLow = _bloodPressure select 0;
-_bloodPressureHigh = _bloodPressure select 1;
-_heartRate = [_unit,"cse_heartRate"] call cse_fnc_getVariable;
-_painStatus = [_unit,"cse_pain",0] call cse_fnc_getVariable;
-_totalBloodLoss = _unit call cse_fnc_getBloodLoss_CMS;
-_hrIncrease = 0;
-_bpIncreaseHigh = 0;
-_bpIncreaseLow = 0;
-
-// _totalBloodLoss affecting Heart Rate and bloodpressure
-
- if (_totalBloodLoss >0.0) then {
- if (_totalBloodLoss <0.5) then {
- if (_heartRate < 126) then {
- _hrIncrease = _hrIncrease + 0.5;
- };
- } else {
- if (_totalBloodLoss < 1) then {
- if (_heartRate < 161) then {
- _hrIncrease = _hrIncrease + 1;
- };
- if (_bloodPressureLow > 60 && _bloodVolume < 95) then {
- _bpIncreaseLow = _bpIncreaseLow - 0.5;
- };
- } else {
- if (_heartRate < 220) then {
- _hrIncrease = _hrIncrease + 1.5;
- };
- if (_bloodPressureLow > 60 && _bloodVolume < 95) then {
- _bpIncreaseLow = _bpIncreaseLow - 2;
- };
- };
- };
- };
-
- if ((_totalBloodLoss == 0) && _bloodVolume > 80) then {
- if (_bloodPressureLow < 80) then {
- _bpIncreaseLow = _bpIncreaseLow + 1;
- };
- if (_bloodPressureHigh < 120) then {
- _bpIncreaseHigh = _bpIncreaseHigh + 1;
- };
- if (_bloodPressureLow > 100) then {
- _bpIncreaseLow = _bpIncreaseLow - 1;
- };
- if (_bloodPressureHigh > 120) then {
- _bpIncreaseHigh = _bpIncreaseHigh - 1;
- };
- };
-
- // affecting Heart Rate
- if !(_unit getvariable ["cse_cardiacArrest",false]) then {
- if (_bloodPressureLow > 50 && _bloodPressureHigh < 130) then {
- if (_bloodPressureHigh > 70 && _bloodPressureHigh < 190) then {
- _speed = abs(speed _unit);
- if (_speed > 0 && _bloodVolume > 60) then {
- if (_speed > 10 && (vehicle _unit == _unit)) then {
- if (_heartRate <100) then {
- _hrIncrease = _hrIncrease + (_speed/200);
- };
- };
- } else {
- if (_bloodVolume > 60 && _totalBloodLoss == 0) then {
- if (_heartRate < (60 + round(random(10)))) then {
- _hrIncrease = _hrIncrease + 0.2;
- } else {
- if (_heartRate > (77 + round(random(10)))) then {
- _hrIncrease = _hrIncrease - 0.2;
- };
- };
- };
- };
- if (_bloodVolume < 60 && _bloodPressureLow<60 && _bloodPressureHigh < 90 && _hrIncrease <1) then {
- _hrIncrease = _hrIncrease + 1;
- };
- if (_bloodVolume < 40) then {
- _hrIncrease = _hrIncrease - 3;
- };
- };
- } else {
- };
- };
-
- if (_heartRate > 10) then {
- if (_totalBloodLoss == 0 && _hrIncrease>0) then {
- _bpIncreaseLow = _bpIncreaseLow + (_hrIncrease/2);
- _bpIncreaseHigh = _bpIncreaseHigh + (_hrIncrease/2)
- };
-
- if (_hrIncrease<0) then {
- _bpIncreaseLow = _bpIncreaseLow - 0.5;
- _bpIncreaseHigh = _bpIncreaseHigh - 1.5;
- };
- if (_totalBloodLoss > 0 && _totalBloodLoss < 1 && _hrIncrease>0) then {
- _bpIncreaseLow = _bpIncreaseLow + 0.03;
- _bpIncreaseHigh = _bpIncreaseHigh + 0.03;
- };
- };
- _showedHint = false;
- if (_totalBloodLoss >0) then {
- if !(_unit getvariable ["cse_isBleeding_CMS",false]) then {
- [_unit, "cse_isBleeding_CMS",true] call cse_fnc_setVariable;
- if (CSE_DISPLAY_ADDITIONAL_HINTS_CMS) then {
- _showedHint = true;
- [_unit,"Injured","You are bleeding!",1] call cse_fnc_sendDisplayMessageTo;
- };
- };
- } else {
- if (_unit getvariable ["cse_isBleeding_CMS",false]) then {
- [_unit, "cse_isBleeding_CMS",false] call cse_fnc_setVariable;
- };
- };
- if (_painStatus > 0) then {
- if !(_unit getvariable ["cse_hasPain_CMS",false]) then {
- [_unit, "cse_hasPain_CMS",true] call cse_fnc_setVariable;
- if (CSE_DISPLAY_ADDITIONAL_HINTS_CMS && !_showedHint) then {
- [_unit,"Injured","You are in Pain!",1] call cse_fnc_sendDisplayMessageTo;
- };
- };
-
- } else {
- if (_unit getvariable ["cse_hasPain_CMS",false]) then {
- [_unit, "cse_hasPain_CMS",false] call cse_fnc_setVariable;
- };
- };
-
-_modifier = 1;
-if (!([_unit] call cse_fnc_isAwake)) then {
- _modifier = 0.5;
-};
-
-_bloodVolume = _bloodVolume - (_totalBloodLoss * _modifier);
-
- _heartRate = _heartRate + (_hrIncrease * _modifier);
- _bloodPressureLow = _bloodPressureLow + (_bpIncreaseLow * _modifier);
- _bloodPressureHigh = _bloodPressureHigh + (_bpIncreaseHigh * _modifier);
- // Safety checks, prefent values below zero
- if (_bloodPressureLow <0) then {
- _bloodPressureLow = 0;
- };
- if (_bloodPressureHigh < _bloodPressureLow) then {
- _bloodPressureHigh = _bloodPressureLow + 10;
- };
- _bloodPressure = [_bloodPressureLow, _bloodPressureHigh];
-
- if (_heartRate <0) then {
- _heartRate = 0;
- };
-
-if (_bloodVolume < 100.0) then {
- if (_bloodVolume <0) then {
- _bloodVolume = 0;
- };
- if (([_unit,"cse_salineIVVolume",0] call cse_fnc_getvariable) > 0) then {
- _bloodVolume = _bloodVolume + 0.2;
- _ivVolume = ([_unit,"cse_salineIVVolume",0] call cse_fnc_getvariable) - 0.2;
- _unit setvariable ["cse_salineIVVolume",_ivVolume];
- };
- if (([_unit,"cse_plasmaIVVolume",0] call cse_fnc_getvariable) > 0) then {
- _bloodVolume = _bloodVolume + 0.2;
- _ivVolume = ([_unit,"cse_plasmaIVVolume",0] call cse_fnc_getvariable) - 0.2;
- _unit setvariable ["cse_plasmaIVVolume",_ivVolume];
- };
- if (([_unit,"cse_bloodIVVolume",0] call cse_fnc_getvariable) > 0) then {
- _bloodVolume = _bloodVolume + 0.2;
- _ivVolume = ([_unit,"cse_bloodIVVolume",0] call cse_fnc_getvariable) - 0.2;
- _unit setvariable ["cse_bloodIVVolume",_ivVolume];
- };
-
-} else {
- if (_bloodVolume > 100) then {
- _bloodVolume = 100;
- };
-};
-
-if (_bloodVolume < 90) then {
- if !(_unit getvariable ["cse_hasLostBlood_CMS",false]) then {
- [_unit, "cse_hasLostBlood_CMS",true] call cse_fnc_setVariable;
- };
-} else {
- if (_unit getvariable ["cse_hasLostBlood_CMS",false]) then {
- [_unit, "cse_hasLostBlood_CMS",false] call cse_fnc_setVariable;
- };
-};
-
-[_unit,"cse_bloodVolume",_bloodVolume] call cse_fnc_setVariable;
-[_unit,"cse_bloodPressure",_bloodPressure] call cse_fnc_setVariable;
-[_unit,"cse_heartRate",_heartRate] call cse_fnc_setVariable;
-
-
-[_unit,_bloodVolume,_bloodPressure,_heartRate] call cse_fnc_bloodConditions_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignAirwayStatus_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignAirwayStatus_CMS.sqf
deleted file mode 100644
index 920dd3166c..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignAirwayStatus_CMS.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_assignAirwayStatus_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit", "_amountOfDamage", "_typeOfInjury", "_bodyPartn","_airwayItem","_airwayStatus","_selection", "_airwayIncrease"];
-_unit = _this select 0;
-_amountOfDamage = _this select 1;
-_typeOfInjury = _this select 2;
-_bodyPartn = _this select 3;
-
-// only the head
-if (_bodyPartn != 0) exitwith {};
-
-if (_amountOfDamage > 0.4) then {
- if (random(1) >= 0.8) then {
- _unit setvariable ["cse_airwayCollapsed", true, true];
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignFractures_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignFractures_CMS.sqf
deleted file mode 100644
index 6c180b81c0..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignFractures_CMS.sqf
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * fn_assignFractures_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit", "_amountOfDamage", "_typeOfInjury", "_bodyPartn","_amountOfBrokenBones","_fractures","_size","_selection"];
-_unit = _this select 0;
-_amountOfDamage = _this select 1;
-_typeOfInjury = _this select 2;
-_bodyPartn = _this select 3;
-_amountOfBrokenBones = 1;
-_size = 1;
-if (_amountOfDamage > 0.05) then {
- switch (_typeOfInjury) do {
- case "Bullet": {
- _amountOfBrokenBones = 1;
- _size = round(random(2));
- };
- case "Grenade": {
- _amountOfBrokenBones = 1;
- _size = round(random(2));
- if (_size < 1) then {
- _size = 1;
- };
- };
- case "Explosive": {
- _amountOfBrokenBones = 1;
- _size = round(random(2));
- if (_size < 1) then {
- _size = 1;
- };
- };
- case "Shell": {
- _amountOfBrokenBones = 1;
- _size = round(random(2));
- if (_size < 1) then {
- _size = 1;
- };
- };
- case "Unknown": {
- _amountOfBrokenBones = 1;
- _size = round(random(1));
- };
- case "Crash": {
- _amountOfBrokenBones = 0;
- _size = round(random(0));
- };
- default {
- _amountOfBrokenBones = 1;
- _size = round(random(1));
- };
- };
- if (_size > 2) then {
- _size = 3;
- };
-
- _fractures = [_unit,"cse_fractures"] call cse_fnc_getVariable;
- _selection = _fractures select _bodyPartn;
- _selection set [ _size, (_selection select _size) + _amountOfBrokenBones ];
- _fractures set [ _bodyPartn , _selection];
-
- [_unit, "cse_fractures",_fractures] call cse_fnc_setVariable;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignOpenWounds_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignOpenWounds_CMS.sqf
deleted file mode 100644
index 17727c581f..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_assignOpenWounds_CMS.sqf
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * fn_assignOpenWounds_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit", "_amountOfDamage", "_typeOfInjury", "_bodyPartn","_sizeOfWound","_amountOfNewWounds", "_return"];
-_unit = _this select 0;
-_amountOfDamage = _this select 1;
-_typeOfInjury = _this select 2;
-_bodyPartn = _this select 3;
-_sizeOfWound = 0;
-_amountOfNewWounds = 0;
-
-_return = false;
-if (_amountOfDamage > 0.05) then {
- switch (_typeOfInjury) do {
- case "Bullet": {
- _amountOfNewWounds = 1;
- _sizeOfWound = round(random(2));
- };
- case "Grenade": {
- _amountOfNewWounds = 1;
- _sizeOfWound = round(random(2));
- if (_sizeOfWound < 1) then {
- _sizeOfWound = 1;
- };
- };
- case "Explosive": {
- _amountOfNewWounds = 1;
- _sizeOfWound = round(random(2));
- if (_sizeOfWound < 1) then {
- _sizeOfWound = 1;
- };
- };
- case "Shell": {
- _amountOfNewWounds = 1;
- _sizeOfWound = round(random(2));
- if (_sizeOfWound < 1) then {
- _sizeOfWound = 1;
- };
- };
- case "Unknown": {
- _amountOfNewWounds = 1;
- _sizeOfWound = round(random(1));
- };
- case "VehicleCrash": {
- _amountOfNewWounds = if (random(1)>=0.5) then{0}else{1};
- _sizeOfWound = round(random(1));
- };
- default {
- _amountOfNewWounds = 1;
- _sizeOfWound = round(random(1));
- };
- };
- if (_sizeOfWound > 2) then {
- _sizeOfWound = 3;
- };
- if (_amountOfNewWounds>0) then {
- [_unit, _bodyPartn, _sizeOfWound, _amountOfNewWounds] call cse_fnc_addOpenWounds_CMS;
- _return = true;
- };
-};
-
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_damageBodyPart_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_damageBodyPart_CMS.sqf
deleted file mode 100644
index 6796d65f3a..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_damageBodyPart_CMS.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-private ["_unit", "_bodyPart", "_amountOfDamage"];
-_unit = _this select 0;
-_bodyPart = _this select 1;
-_amountOfDamage = _this select 2;
-if (alive _unit) then {
- _hitPointName = switch (_bodyPart) do {
- case 0: {"hitHead"};
- case 1: {"hitBody"};
- case 2: {"hitHands"};
- case 3: {"hitHands"};
- case 4: {"hitLegs"};
- case 5: {"hitLegs"};
- default {"hitLegs"};
- };
-
- if (_amountOfDamage < 0.95) then {
- _unit setHitPointDamage [_hitPointName, _amountOfDamage];
- _unit setHit [_selectionName, _amountOfDamage];
- } else {
- _unit setHitPointDamage [_hitPointName, 0.95];
- _unit setHit [_selectionName, 0.95];
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_determineIfFatal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_determineIfFatal_CMS.sqf
deleted file mode 100644
index ba0f005d9f..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_determineIfFatal_CMS.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * fn_determineIfFatal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define DEFAULT_DAMAGE_THRESHOLD 1
-
-private ["_unit","_part","_damageThreshold"];
-_unit = _this select 0;
-_part = _this select 1;
-
-if (!alive _unit) exitwith {true};
-
-if ((vehicle _unit != _unit) && {!alive (vehicle _unit)}) exitwith { true };
-
-// Find the correct Damage threshold for unit.
-_damageThreshold = [1,1,1];
-if (isPlayer _unit) then {
- _damageThreshold =_unit getvariable["cse_damageThresholds_players_cms", [CSE_DAMAGE_THRESHOLD_PLAYERS_DMG, CSE_DAMAGE_THRESHOLD_PLAYERS_DMG, CSE_DAMAGE_THRESHOLD_PLAYERS_DMG]];
-} else {
- _damageThreshold =_unit getvariable["cse_damageThresholds_AI_cms", [CSE_DAMAGE_THRESHOLD_AI_DMG, CSE_DAMAGE_THRESHOLD_AI_DMG, CSE_DAMAGE_THRESHOLD_AI_DMG]];
-};
-
-_damageBodyPart = ([_unit,"cse_bodyPartStatus",[0,0,0,0,0,0]] call cse_fnc_getVariable) select _part;
-
-// Check if damage to body part is higher as damage head
-if (_part == 0) exitwith {
- (_damageBodyPart >= (_damageThreshold select 0) && {(random(1) > 0.2)});
-};
-
-// Check if damage to body part is higher as damage torso
-if (_part == 1) exitwith {
- (_damageBodyPart >= (_damageThreshold select 1) && {(random(1) > 0.2)});
-};
-// Check if damage to body part is higher as damage limbs
-(_damageBodyPart >= (_damageThreshold select 2) && {(random(1) > 0.95)});
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_determineIfUnconscious_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_determineIfUnconscious_CMS.sqf
deleted file mode 100644
index dd0ece2d92..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_determineIfUnconscious_CMS.sqf
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * fn_determineIfUnconscious_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_part","_damageThreshold"];
-_unit = _this select 0;
-_part = _this select 1;
-
-if (!alive _unit) exitwith { true };
-
-if ((vehicle _unit != _unit) && {!alive (vehicle _unit)}) exitwith { true };
-
-// Find the correct Damage threshold for unit.
-_damageThreshold = if (isPlayer _unit) then {
- missionNamespace getvariable["cse_damageThresholds_players_cms", [CSE_DAMAGE_THRESHOLD_PLAYERS_DMG, CSE_DAMAGE_THRESHOLD_PLAYERS_DMG, CSE_DAMAGE_THRESHOLD_PLAYERS_DMG]];
-} else {
- missionNamespace getvariable["cse_damageThresholds_AI_cms", [CSE_DAMAGE_THRESHOLD_AI_DMG, CSE_DAMAGE_THRESHOLD_AI_DMG, CSE_DAMAGE_THRESHOLD_AI_DMG]];
-};
-
-_damageBodyPart = ([_unit,"cse_bodyPartStatus",[0,0,0,0,0,0]] call cse_fnc_getVariable) select _part;
-
-// Check if damage to body part is higher as damage head
-if (_part == 0) exitwith {
- ((_damageBodyPart * CSE_MEDICAL_DIFFICULTY) >= ((_damageThreshold select 0) * 0.7) && {(random(1) > 0.35)});
-};
-
-// Check if damage to body part is higher as damage torso
-if (_part == 1) exitwith {
- ((_damageBodyPart * CSE_MEDICAL_DIFFICULTY) >= ((_damageThreshold select 1) * 0.5) && {(random(1) > 0.4)});
-};
-// Check if damage to body part is higher as damage limbs
-((_damageBodyPart * CSE_MEDICAL_DIFFICULTY) >= ((_damageThreshold select 2) * 0.8) && {(random(1) > 0.7)});
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getBodyPartNumber_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getBodyPartNumber_CMS.sqf
deleted file mode 100644
index fbd8e3b0c1..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getBodyPartNumber_CMS.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * fn_getBodyPartNumber_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_selectionName","_part"];
-_selectionName = _this select 0;
-
- _part = -1;
- _part = switch (_selectionName) do {
- case "head": {
- 0
- };
- case "body": {
- 1
- };
- case "hands": {
- if (random(1)>0.499) then {
- 2
- } else {
- 3
- };
- };
- case "hand_l": {
- 2
- };
- case "hand_r": {
- 3
- };
- case "legs": {
- if (random(1)>0.499) then {
- 4
- } else {
- 5
- };
- };
- case "leg_l": {
- 4
- };
- case "leg_r": {
- 5
- };
- default {
- -1
- };
- };
-_part
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getNewDamageBodyPart_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getNewDamageBodyPart_CMS.sqf
deleted file mode 100644
index 4408d288f1..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getNewDamageBodyPart_CMS.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_getNewDamageBodyPart_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit","_selectionName","_newDamage", "_previousDamage", "_origDamage"];
-_unit = _this select 0;
-_amountOfDamage = _this select 1;
-_number = _this select 2;
-
-_previousDamage = _unit getvariable ["cse_bodyPartStatusPrevious_cms", [0,0,0,0,0,0]];
-_newDamage = _amountOfDamage - (_previousDamage select _number);
-_previousDamage set [_number, _newDamage];
-[_unit,"cse_bodyPartStatusPrevious_cms",_previousDamage] call cse_fnc_setVariable;
-
-
-_origDamage = [_unit,"cse_bodyPartStatus",[0,0,0,0,0,0]] call cse_fnc_getVariable;
-_origDamage set [_number, (_origDamage select _number) + _newDamage]; /* We are storing the total Damage done on a body part for determining the damage properly */
-[_unit,"cse_bodyPartStatus",_origDamage] call cse_fnc_setVariable;
-
-_newDamage
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getTypeOfDamage_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getTypeOfDamage_CMS.sqf
deleted file mode 100644
index 9adbcfb217..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_getTypeOfDamage_CMS.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * fn_getTypeOfDamage_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_typeOfProjectile","_typeOfInjury"];
-_typeOfProjectile = _this select 0;
-_typeOfInjury = switch (true) do {
- case (_typeOfProjectile iskindof "BulletBase"): {"Bullet"};
- case (_typeOfProjectile iskindof "GrenadeCore"): {"Grenade"};
- case (_typeOfProjectile iskindof "TimeBombCore"): {"Explosive"};
- case (_typeOfProjectile iskindof "MineCore"): {"Explosive"};
- case (_typeOfProjectile iskindof "FuelExplosion"): {"Explosive"};
- case (_typeOfProjectile iskindof "ShellBase"): {"Shell"};
- case (_typeOfProjectile iskindof "RocketBase"): {"Explosive"};
- case (_typeOfProjectile iskindof "MissileBase"): {"Explosive"};
- case (_typeOfProjectile iskindof "LaserBombCore"): {"Explosive"};
- case (_typeOfProjectile iskindof "BombCore"): {"Explosive"};
- case (_typeOfProjectile iskindof "Grenade"): {"Grenade"};
- case (_typeOfProjectile == "VehicleCrash"): {"VehicleCrash"};
- default {"Unknown"};
-};
-_typeOfInjury
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_handleDamage_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_handleDamage_CMS.sqf
deleted file mode 100644
index 12979ebf57..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_handleDamage_CMS.sqf
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * fn_handleDamage_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_selectionName","_amountOfDamage","_sourceOfDamage", "_typeOfProjectile","_bodyPartn","_newDamage","_typeOfDamage","_caliber", "_hitPointName", "_returnDamage", "_varCheck"];
-_unit = _this select 0;
-_selectionName = _this select 1;
-_amountOfDamage = _this select 2;
-_sourceOfDamage = _this select 3;
-_typeOfProjectile = _this select 4;
-_returnDamage = _amountOfDamage;
-
-_bodyPartn = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
-
-
-// Check for vehicle crash
-if (vehicle _unit != _unit && {_bodyPartn < 0} && {isNull _sourceOfDamage} && {_typeOfProjectile == ""} && {_selectionName == ""}) then {
- if (CSE_ALLOW_VEH_CRASH_INJURIES_CMS) then {
- _bodyPartn = if (random(1)>=0.5) then { 0 } else { 1 };
- _typeOfProjectile = "VehicleCrash";
- };
-};
-
-// If it is not a valid bodyPart number, exit because we cannot do anything with it.
-if (_bodyPartn < 0) exitwith {0};
-
-// Most likely taking exessive fire damage. Lets exit.
-if (isNull _sourceOfDamage && (_selectionName == "head" || isBurning _unit) && _typeOfProjectile == "" && vehicle _unit == _unit) exitwith {
- 0
-}; // Prefent excessive fire damage
-
-if (local _unit && {([_unit] call cse_fnc_hasMedicalEnabled_CMS)}) then {
- if (_amountOfDamage < 0) then {
- _amountOfDamage = 0;
- };
-
- // Ensure damage is being handled correctly.
- [_unit, _bodyPartn, _amountOfDamage] call cse_fnc_damageBodyPart_CMS;
- _newDamage = [_unit, _amountOfDamage, _bodyPartn] call cse_fnc_getNewDamageBodyPart_CMS;
-
- // figure out the type of damage so we can use that to determine what injures should be given.
- _typeOfDamage = [_typeOfProjectile] call cse_fnc_getTypeOfDamage_CMS;
-
- if !([_unit, _newDamage, _typeOfDamage, _bodyPartn] call cse_fnc_assignOpenWounds_CMS) then {
- _returnDamage = 0;
- };
-
- //[_unit,_newDamage,_typeOfDamage,_bodyPartn] call cse_fnc_assignFractures_CMS;
- if (CSE_ALLOW_AIRWAY_INJURIES_CMS) then {
- [_unit, _amountOfDamage, _typeOfDamage, _bodyPartn] call cse_fnc_assignAirwayStatus_CMS;
- };
- [_unit,_newDamage,_bodyPartn] call cse_fnc_increasePain_CMS;
-
- if (([_unit, _bodyPartn] call cse_fnc_determineIfFatal_CMS) || !(alive (vehicle _unit))) then {
- [_unit] call cse_fnc_setDead_CMS;
- _returnDamage = 1;
- } else {
- [_unit] call cse_fnc_unitLoop_CMS;
- if ([_unit, _bodyPartn] call cse_fnc_determineIfUnconscious_CMS) then {
- [_unit] call cse_fnc_setUnconsciousState;
- } else {
- [_unit,_newDamage] call cse_fnc_reactionToHit_CMS;
- };
- if (_returnDamage > 0.95) then {
- _returnDamage = 0.95;
- };
- };
-
- if (!(alive (vehicle _unit))) then {
- _returnDamage = 1;
- [_unit] call cse_fnc_setDead_CMS;
- };
-};
-
-_returnDamage
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_increasePain_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_increasePain_CMS.sqf
deleted file mode 100644
index b41934f512..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_increasePain_CMS.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_increasePain_CMS.sqf
- * @Descr: Increase the pain level of a unit
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, amount NUMBER, sectionName NUMBER (Also supports string representation of bodyparts)]
- * @Return: nil
- * @PublicAPI: true
- */
-
-private ["_unit","_amountOfDamage","_selectionName","_sourceOfDamage","_painStatus"];
-_unit = _this select 0;
-_amountOfDamage = _this select 1;
-_selectionName = _this select 2;
-_amountOfDamage = _amountOfDamage * 10;
-if (!alive _unit || (_amountOfDamage <= 0)) exitwith{};
-_painStatus = [_unit,"cse_pain",0] call cse_fnc_getVariable;
-
-if (typeName _selectionName == "STRING") then {
- _selectionName = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
-};
-
-_painStatus = switch (_selectionName) do {
- case 0: {
- _painStatus + (_amountOfDamage*1.5);
- };
- case 1: {
- _painStatus + (_amountOfDamage*0.9);
- };
- case 2: {
- _painStatus + (_amountOfDamage*0.8);
- };
- case 3: {
- _painStatus + (_amountOfDamage*0.7);
- };
- default {_painStatus};
-};
-
-[_unit,"cse_pain",_painStatus] call cse_fnc_setVariable;
-nil;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_reactionToHit_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/handledamage/fn_reactionToHit_CMS.sqf
deleted file mode 100644
index b3d7959654..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/handledamage/fn_reactionToHit_CMS.sqf
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * fn_reactionToHit_CMS.sqf
- * @Descr: triggers a reaction to being hit for a unit and spawns on screen effects.
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_amountOfDamage"];
-_unit = _this select 0;
-_amountOfDamage = _this select 1;
-
-if (_amountOfDamage > 0.2) then {
- [_unit] spawn cse_fnc_playInjuredSound_CMS;
- if ((vehicle _unit) isKindOf "StaticWeapon") exitwith {
- if (_amountOfDamage > 1) then {
- _unit action ["eject", vehicle _unit];
- unassignVehicle _unit;
- };
- };
- if (animationState _unit in ["ladderriflestatic","laddercivilstatic"]) exitwith {
- _unit action ["ladderOff", (nearestBuilding _unit)];
- };
-
- if (vehicle _unit == _unit && [_unit] call cse_fnc_isAwake) then {
- if (random(1) > 0.5) then {
- _unit setDir ((getDir _unit) + 1 + random(30));
- } else {
- _unit setDir ((getDir _unit) - (1 + random(30)));
- };
- };
- if (_amountOfDamage > 0.6) then {
- if (random(1)>0.6) then {
- [_unit] call cse_fnc_setProne;
- };
- };
- if (isPlayer _unit) then {
- 76 cutRsc ["RscCSEScreenEffectsHit","PLAIN"];
- addCamShake [3, 5, _amountOfDamage + random 10];
- };
-} else {
- if (_amountOfDamage > 0) then {
- if (isPlayer _unit) then {
- 76 cutRsc ["RscCSEScreenEffectsHit","PLAIN"];
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_addInjury.sqf b/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_addInjury.sqf
deleted file mode 100644
index d72d5dd393..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_addInjury.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-_unit = _this select 0;
-_injury = _this select 1;
-// TODO implement injury vertifying check - is this a correct form of the injury?
-/* Injury map:
-
-*/
-_injuryVector = _unit getvariable ["cse_injuryVector",[]];
-_injuryVector pushback _injury;
-[_unit,"cse_injuryVector",_injuryVector] call cse_fnc_setVariable;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_createInjury.sqf b/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_createInjury.sqf
deleted file mode 100644
index c0a6bb1a4d..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_createInjury.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-
-private ["_injury","_injuryType","_bodyPart","_id"];
-
-_bodyPart = _this select 0;
-_injuryType = _this select 1;
-_souceType = _this select 2;
-
-/* Injury map:
-
-*/
-if (isnil "CSE_INJURY_ID_COUNTER_CMS") then {
- CSE_INJURY_ID_COUNTER_CMS = 0;
- CSE_INJURY_CREATION_MUTEX_CMS = false;
-};
-waituntil{!CSE_INJURY_CREATION_MUTEX_CMS};
-CSE_INJURY_CREATION_MUTEX_CMS = true;
- _id = CSE_INJURY_ID_COUNTER_CMS + round(random(100)); /* implement ID creation check */
- _injury = [_id, _bodyPart, _injuryType, _souceType , 1];
- CSE_INJURY_ID_COUNTER_CMS = _id;
-CSE_INJURY_CREATION_MUTEX_CMS = false;
-
-_injury
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findBlastDamageInjury.sqf b/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findBlastDamageInjury.sqf
deleted file mode 100644
index 3ef1ffc258..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findBlastDamageInjury.sqf
+++ /dev/null
@@ -1,169 +0,0 @@
-#include "cse\cse_sys_medical\injuryTypes.h"
-#include "cse\cse_sys_medical\bodyParts.h"
-
-private ["_bodyPart","_damage","_injuryTypeReturn"];
-_bodyPart = _this select 0;
-_damage = _this select 1;
-_distance = _this select 2;
-
-_injuryTypeReturn = [];
-if (_damage >0.2) then {
- switch (_bodyPart) do {
- case HEAD: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- };
- };
- };
- };
-
- case TORSO: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- };
- };
- };
- };
-
- case ARM_R: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- };
- };
- };
- };
-
- case ARM_L: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- };
- };
- };
- };
-
- case LEG_R: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- };
- };
- };
- };
-
- case LEG_L: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, HIGH_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- };
- };
- };
- };
-
- default {};
- };
-} else {
- if (_damage >0.01) then {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_BURN];
- };
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCHRAPNEL_WOUND];
- };
- };
-};
-
-_injuryTypeReturn
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findBulletInjury.sqf b/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findBulletInjury.sqf
deleted file mode 100644
index 0a4a65a23b..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findBulletInjury.sqf
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "cse\cse_sys_medical\injuryTypes.h"
-#include "cse\cse_sys_medical\bodyParts.h"
-
-private ["_bodyPart","_damage","_injuryTypeReturn"];
-_bodyPart = _this select 0;
-_damage = _this select 1;
-_distance = _this select 2;
-
-_injuryTypeReturn = [];
-if (_damage >0.2) then {
- switch (_bodyPart) do {
- case HEAD: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_GSW];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, GRAZE_WOUND];
- };
- };
- };
- };
- case TORSO: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_GSW];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, GRAZE_WOUND];
- };
- };
- };
- };
- case ARM_R: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_GSW];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, GRAZE_WOUND];
- };
- };
- };
- };
- case ARM_L: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_GSW];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, GRAZE_WOUND];
- };
- };
- };
- };
- case LEG_R: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_GSW];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, GRAZE_WOUND];
- };
- };
- };
- };
- case LEG_L: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, LARGE_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_GSW];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_GSW];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_BURN];
- _injuryTypeReturn set [count _injuryTypeReturn, GRAZE_WOUND];
- };
- };
- };
- };
- default {};
- };
-} else {
- if (_damage >0.01) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCRATCH];
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_BURN];
- };
- };
-};
-
-_injuryTypeReturn
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findInjuryType.sqf b/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findInjuryType.sqf
deleted file mode 100644
index fb67efde9f..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findInjuryType.sqf
+++ /dev/null
@@ -1,32 +0,0 @@
-
-private ["_bodyPart","_typeOfInjury","_distance","_damage","_return"];
-_bodyPart = _this select 0;
-_typeOfInjury = _this select 1;
-_damage = _this select 2;
-_distance = _this select 3;
-
-_return = [];
-switch (_typeOfInjury) do {
- case "Bullet": {
- _return = [_bodyPart, _damage,_distance] call cse_fnc_findBulletInjury;
- };
- case "Grenade": {
- _return = [_bodyPart, _damage,_distance] call cse_fnc_findBlastDamageInjury;
- };
- case "Explosive": {
- _return = [_bodyPart, _damage,_distance] call cse_fnc_findBlastDamageInjury;
- };
- case "Shell": {
- _return = [_bodyPart, _damage,_distance] call cse_fnc_findBlastDamageInjury;
- };
- case "Unknown": {
- _return = [_bodyPart, _damage,_distance] call cse_fnc_findUnknownTypeInjury;
- };
- case "Crash": {
- _return = [_bodyPart, _damage,_distance] call cse_fnc_findUnknownTypeInjury;
- };
- default {
- _return = [_bodyPart, _damage,_distance] call cse_fnc_findUnknownTypeInjury;
- };
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findUknownTypeInjury.sqf b/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findUknownTypeInjury.sqf
deleted file mode 100644
index 5430ea7da3..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_findUknownTypeInjury.sqf
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "cse\cse_sys_medical\injuryTypes.h"
-#include "cse\cse_sys_medical\bodyParts.h"
-
-private ["_bodyPart","_damage","_injuryTypeReturn"];
-_bodyPart = _this select 0;
-_damage = _this select 1;
-_distance = _this select 2;
-
-_injuryTypeReturn = [];
-if (_damage >0.2) then {
- switch (_bodyPart) do {
- case HEAD: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCRATCH];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_CUT];
- };
- };
- };
- };
- case TORSO: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCRATCH];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_CUT];
- };
- };
- };
- };
- case ARM_R: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCRATCH];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_CUT];
- };
- };
- };
- };
- case ARM_L: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCRATCH];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_CUT];
- };
- };
- };
- };
- case LEG_R: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCRATCH];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_CUT];
- };
- };
- };
- };
- case LEG_L: {
- if (_damage > 0.4) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MEDIUM_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_OPEN_WOUND];
- } else {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCRATCH];
- } else {
- _injuryTypeReturn set [count _injuryTypeReturn, MINOR_CUT];
- };
- };
- };
- };
- default {};
- };
-} else {
- if (_damage >0.01) then {
- if (random(1)>0.5) then {
- _injuryTypeReturn set [count _injuryTypeReturn, SCRATCH];
- };
- };
-};
-
-_injuryTypeReturn
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_getAllIInjuriesOnBodyPart.sqf b/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_getAllIInjuriesOnBodyPart.sqf
deleted file mode 100644
index c913b441d7..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_getAllIInjuriesOnBodyPart.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-_unit = _this select 0;
-_bodyPart = _this select 1;
-
-
-/* Injury map:
-
-*/
-_injuryVector = _unit getvariable ["cse_injuryVector",[]];
-_return = [];
-{
- if (_bodyPart == (_x select 1)) then {
- _return set [ count _return, _x];
- };
-}foreach _injuryVector;
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_removeInjury.sqf b/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_removeInjury.sqf
deleted file mode 100644
index ec5c561942..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/injuryVector/fn_removeInjury.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-
-private ["_unit","_injuryID","_toRemove"];
-_unit = _this select 0;
-_injuryID = _this select 1;
-/* Injury map:
-
-*/
-_injuryVector = _unit getvariable ["cse_injuryVector",[]];
-_toRemove = -1;
-{
- if (_injuryID == (_x select 0)) then {
- _toRemove = _forEachIndex;
- };
-}foreach _injuryVector;
-
-if (_toRemove > 0) then {
- _injuryVector set [_toRemove, objNull];
- _injuryVector = _injuryVector - [ObjNull];
- [_unit,"cse_injuryVector",_injuryVector] call cse_fnc_setVariable;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/loading/fn_loadLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/loading/fn_loadLocal_CMS.sqf
deleted file mode 100644
index a327bfec1a..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/loading/fn_loadLocal_CMS.sqf
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * fn_loadLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-// NO LONGER USED.
-
-private ["_unit","_vehicle","_caller"];
-_unit = _this select 0;
-_vehicle = _this select 1;
-_caller = _this select 2;
-
-[_unit,_vehicle,_caller] spawn {
- [_this] call cse_fnc_debug;
- private ["_unit","_vehicle","_caller"];
- _unit = _this select 0;
- _vehicle = _this select 1;
- _caller = _this select 2;
-
- //_dead = false;
- //if !(alive _unit) then {
- //_dead = true;
- //_unit = [_unit,_caller] call cms_fnc_switchDeadBody;
- //_unit setvariable ["cms_isDead", true,true];
- //};
-
- _unit moveInCargo _vehicle;
- _loaded = _vehicle getvariable ["cse_loaded_casualties_CMS",[]];
- _loaded pushback _unit;
- _vehicle setvariable ["cse_loaded_casualties_CMS",_loaded,true];
-
- if (!([_unit] call cse_fnc_isAwake)) then {
- waituntil {vehicle _unit == _vehicle};
- [_unit,([_unit] call cse_fnc_getDeathAnim)] call cse_fnc_broadcastAnim;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/loading/fn_load_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/loading/fn_load_CMS.sqf
deleted file mode 100644
index 9a21063660..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/loading/fn_load_CMS.sqf
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * fn_load_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_caller", "_unit","_vehicle", "_loaded"];
-_caller = _this select 0;
-_unit = _this select 1;
-
-if ([_unit] call cse_fnc_isAwake) exitwith {
- hintSilent "This person is awake and cannot be loaded";
-};
-
-[_caller,objNull] call cse_fnc_carryObj;
-[_unit,objNull] call cse_fnc_carryObj;
-waituntil {(isNull (_unit getvariable ["cse_beingCarried_CMS", objNull]))};
-
-_vehicle = [_caller, _unit] call cse_fnc_loadPerson_F;
-if (!isNull _vehicle) then {
- _loaded = _vehicle getvariable ["cse_loaded_casualties_CMS",[]];
- _loaded pushback _unit;
- _vehicle setvariable ["cse_loaded_casualties_CMS",_loaded,true];
-
- if (!isnil "CSE_DROP_ADDACTION_CMS") then {
- _caller removeAction CSE_DROP_ADDACTION_CMS;
- CSE_DROP_ADDACTION_CMS = nil;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/loading/fn_unload_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/loading/fn_unload_CMS.sqf
deleted file mode 100644
index 31317da65f..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/loading/fn_unload_CMS.sqf
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * fn_unload_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_caller", "_unit","_vehicle", "_drag", "_handle"];
-_caller = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param;
-_unit = [_this, 1, ObjNull,[ObjNull]] call BIS_fnc_Param;
-_drag = [_this, 2, false, [false]] call BIS_fnc_Param;
-
-// cannot unload a unit not in a vehicle.
-if (vehicle _unit == _unit) exitwith {};
-
-if (([_unit] call cse_fnc_isAwake)) exitwith {};
-
-_vehicle = vehicle _unit;
-if ([_caller, _unit] call cse_fnc_unloadPerson_F) then {
- _loaded = _vehicle getvariable ["cse_loaded_casualties_CMS",[]];
- _loaded = _loaded - [_unit];
- _vehicle setvariable ["cse_loaded_casualties_CMS",_loaded,true];
- if (_drag) then {
- if ((vehicle _caller) == _caller) then {
- _handle = [_caller, _unit] spawn {
- _caller = _this select 0;
- _unit = _this select 1;
- waituntil {(vehicle _unit == _unit)};
- [[_caller,_unit], "cse_fnc_drag_CMS", _caller, false] spawn BIS_fnc_MP;
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandageLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandageLocal_CMS.sqf
deleted file mode 100644
index de07ff3034..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandageLocal_CMS.sqf
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * fn_bandageLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_treatingPerson","_injuredPerson","_part","_selectionName","_openWounds","_woundsArray","_highest_amount","_highestSpot","_collectiveImpact", "_highestTotal","_totalNumber", "_selectedData"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-_selectedData = [_this, 4, "", [""]] call BIS_fnc_Param;
-
-if (!local _injuredPerson) exitwith{["fnc_bandageLocal called on non local machine",3] call cse_fnc_debug; };
-[_injuredPerson] spawn cse_fnc_unitLoop_CMS;
-if (_treatingPerson != _injuredPerson) then {
- [_injuredPerson,"STR_CSE_CMS_BANDAGING", "STR_CSE_CMS_IS_BANDAGING_YOU", 0, [[_treatingPerson] call cse_fnc_getName]] call cse_fnc_sendDisplayMessageTo;
-};
-[_this] call cse_fnc_debug;
-
-[_injuredPerson,_removeItem] call cse_fnc_addToTriageList_CMS;
-_collectiveImpact = switch (_removeItem) do {
- case "cse_packing_bandage": {[1.0, 1.5, 1.2]};
- case "cse_bandageElastic": {[1.3, 0.9, 0.9]};
- case "cse_bandage_basic": {[1.5, 1.0, 0.6]};
- case "cse_stitching": {[2.0, 2.0, 2.0]};
- case "cse_quikclot": {[0.9, 0.3, 0.3]};
- default {[0.9, 0.5, 0.5]};
- };
- _part = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
-
- _openWounds = [_injuredPerson,"cse_openWounds"] call cse_fnc_getvariable;
- _woundsArray = _openWounds select _part;
-
- _highestSpot = 0;
- _highest_amount = 0;
- {
- if (_x > _highest_amount) then {
- _highestSpot = _foreachIndex;
- _highest_amount = _x;
- };
- }foreach _woundsArray;
-
- if (_selectedData != "") then {
- [format["CUSTOM STUFF: %1", _selectedData]] call cse_fnc_debug;
- _highestSpot = switch (_selectedData) do {
- case "open_wound_0": {0};
- case "open_wound_1": {1};
- case "open_wound_2": {2};
- default {_highestSpot};
- };
- };
-
- if (_highest_amount == 0 && CSE_BANDAGING_AID_CMS) then {
- _highestTotal = 0;
- {
- _totalNumber = 0;
- {
- _totalNumber = _totalNumber + _x;
- }foreach _x;
- if (_totalNumber > _highestTotal) then {
- _part = _foreachIndex;
- _highestTotal = _totalNumber;
- };
- }foreach _openWounds;
- _woundsArray = _openWounds select _part;
- _highestSpot = 0;
- _highest_amount = 0;
- {
- if (_x > _highest_amount) then {
- _highestSpot = _foreachIndex;
- _highest_amount = _x;
- };
- }foreach _woundsArray;
- };
-
- _impactOfBandage = (_collectiveImpact select _highestSpot);
-
- _wounds = _woundsArray select _highestSpot;
- _amountOfInpact = 0;
- if (_wounds >0) then {
- [_injuredPerson,"treatment",format["%2 has bandaged a wound on %1",[_part] call cse_fnc_fromNumberToBodyPart_CMS,[_treatingPerson] call cse_fnc_getName]] call cse_fnc_addActivityToLog_CMS;
-
- _amountOfInpact = _impactOfBandage;
- if (_impactOfBandage > _wounds) then {
- _amountOfInpact = _wounds;
- };
- };
- _wounds = (_wounds - _impactOfBandage);
- if (_wounds < 0) then {
- _wounds = 0;
- };
- _woundsArray set[_highestSpot, _wounds];
- _openWounds set [_part, _woundsArray];
- [_injuredPerson,"cse_openWounds",_openWounds] call cse_fnc_setvariable;
- if (isnil "CSE_ADVANCED_WOUNDS_SETTING_CMS") then {
- CSE_ADVANCED_WOUNDS_SETTING_CMS = true;
- };
- if (_amountOfInpact > 0.0 && CSE_ADVANCED_WOUNDS_SETTING_CMS) then {
- _bandagedWounds = [_injuredPerson,"cse_bandagedWounds"] call cse_fnc_getvariable;
- _bandagedPart = _bandagedWounds select _part;
- if (_highestSpot > 0) then {
- _bandagedWound = _bandagedPart select _highestSpot;
- _bandagedWound = _bandagedWound + _amountOfInpact;
- _bandagedPart set [_highestSpot,_bandagedWound];
- _bandagedWounds set[_part,_bandagedPart];
- [_injuredPerson,"cse_bandagedWounds",_bandagedWounds] call cse_fnc_setvariable;
- [_injuredPerson, _amountOfInpact,_part,_highestSpot, _removeItem] spawn cse_fnc_bandageOpening_CMS;
- };
- };
-
- if (!([_injuredPerson] call cse_fnc_hasOpenWounds_CMS)) then {
- _injuredPerson setDamage 0;
- };
-
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandageOpening_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandageOpening_CMS.sqf
deleted file mode 100644
index b1af816d23..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandageOpening_CMS.sqf
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * fn_bandageOpening_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define CFG_DEFAULT_WAITING_TIME 900 + random(120)
-#define WAITINGTIME 1
-#define RATIO 2
-#define CHANCE 3
-
-private ["_person","_amount","_bodyPart","_woundClass","_item","_config","_found"];
-_person = _this select 0;
-_amount = _this select 1;
-_bodyPart = _this select 2;
-_woundClass = _this select 3;
-_item = _this select 4;
-
-// classname, waiting time until wound opens, ratio in which it start bleeding again, chance of the wound ever opening up //
-_config = [
- ["cse_bandage_basic", 900 + random (120), 0.75, 0.4],
- ["cse_packing_bandage", 1200 + random (120), 0.5, 0.6],
- ["cse_bandageElastic", 900 + random (900), 0.75, 0.2],
- ["cse_quikclot", 1, 0.1, 0]
-];
-_found = false;
-{
- if (_item == _x select 0) exitwith {
- if (random(1)> (1 - (_x select CHANCE))) then {
- _found = true;
- sleep (_x select WAITINGTIME);
- _bandagedWounds = [_person,"cse_bandagedWounds"] call cse_fnc_getVariable;
- _bandagedBodyPart = _bandagedWounds select _bodyPart;
- _bandagedWoundClass = _bandagedBodyPart select _woundClass;
- if (_bandagedWoundClass >= _amount) then {
- _openWounds =[_person,"cse_openWounds"] call cse_fnc_getVariable;
- _openWoundsBodyPart = _openWounds select _bodyPart;
- _openWoundClass = _openWoundsBodyPart select _woundClass;
-
- _bandagedBodyPart set [_woundClass,_bandagedWoundClass - (_amount * (_x select RATIO))];
- _openWoundsBodyPart set [_woundClass,_openWoundClass + (_amount * (_x select RATIO))];
-
- _bandagedWounds set[_bodyPart,_bandagedBodyPart];
- _openWounds set[_bodyPart,_openWoundsBodyPart];
- [_person,"cse_openWounds",_openWounds] call cse_fnc_setVariable;
- [_person,"cse_bandagedWounds",_bandagedWounds] call cse_fnc_setVariable;
- };
- };
- };
-}foreach _config;
-
-if (!_found && (random(1)>0.2)) then {
- sleep CFG_DEFAULT_WAITING_TIME;
- _bandagedWounds = [_person,"cse_bandagedWounds"] call cse_fnc_getVariable;
- _bandagedBodyPart = _bandagedWounds select _bodyPart;
- _bandagedWoundClass = _bandagedBodyPart select _woundClass;
-
- if (_bandagedWoundClass >= _amount) then {
- _openWounds =[_person,"cse_openWounds"] call cse_fnc_getVariable;
- _openWoundsBodyPart = _openWounds select _bodyPart;
- _openWoundClass = _openWoundsBodyPart select _woundClass;
-
- _bandagedBodyPart set [_woundClass,_bandagedWoundClass - _amount];
- _openWoundsBodyPart set [_woundClass,_openWoundClass + _amount];
-
- _bandagedWounds set[_bodyPart,_bandagedBodyPart];
- _openWounds set[_bodyPart,_openWoundsBodyPart];
- [_person,"cse_openWounds",_openWounds] call cse_fnc_setVariable;
- [_person,"cse_bandagedWounds",_bandagedWounds] call cse_fnc_setVariable;
- };
-};
-
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandage_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandage_CMS.sqf
deleted file mode 100644
index db34f55b89..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_bandage_CMS.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * fn_bandage_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_treatingPerson","_injuredPerson","_part","_selectionName","_openWounds","_woundsArray","_highest_amount","_highestSpot", "_selectedData", "_continue", "_prevAnim"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-_selectedData = [_this, 4, "", [""]] call BIS_fnc_Param;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_treatingPerson] call cse_fnc_treatmentMutex_CMS;
-
-if (!([_treatingPerson, _injuredPerson, _removeItem] call cse_fnc_hasEquipment_CMS)) exitwith { [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS; };
-
-_prevAnim = "";
-if (vehicle _treatingPerson == _treatingPerson && (vehicle _injuredPerson == _injuredPerson) && !(stance _treatingPerson == "PRONE")) then {
- if (primaryWeapon _treatingPerson == "") then {
- _prevAnim = animationState _treatingPerson;
- };
- [_treatingPerson,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
-};
-
-[_treatingPerson,"STR_CSE_CMS_BANDAGING","STR_CSE_CMS_APPLY_BANDAGE", 0, [[_injuredPerson] call cse_fnc_getName, _selectionName]] call cse_fnc_sendDisplayMessageTo;
-
-if (isnil "CSE_BANDAGE_WAITING_TIME_CMS") then {
- CSE_BANDAGE_WAITING_TIME_CMS = 5;
-};
-
-["cse_sys_medical_treatment", true, "cse\cse_sys_medical\data\icons\bandage_fracture_small.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _treatingPerson;
-if ([CSE_BANDAGE_WAITING_TIME_CMS,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar) then {
-
- [_treatingPerson, _injuredPerson, _removeItem] call cse_fnc_useEquipment_CMS;
-
- [_this, "cse_fnc_bandageLocal_CMS", _injuredPerson, false] spawn BIS_fnc_MP;
-};
-
-if (_prevAnim != "") then {
- _treatingPerson switchMove _prevAnim;
-};
-["cse_sys_medical_treatment", false, "cse\cse_sys_medical\data\icons\bandage_fracture_small.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-
-[_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS;
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_handleHeal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_handleHeal_CMS.sqf
deleted file mode 100644
index 7121c9e04b..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_handleHeal_CMS.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_handleHeal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit",'_healer'];
-_unit = _this select 0;
-_healer = _this select 1;
-
-if (!(isPlayer _healer) && CSE_ALLOW_AI_FULL_HEAL_CMS && !([_unit] call cse_Fnc_isUnconscious)) then {
- [_unit, "cse_openWounds",[[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0]]] call cse_fnc_setVariable;
- [_unit, "cse_bandagedWounds",[[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0]]] call cse_fnc_setVariable;
-
- if (_unit != _healer) then {
- [_unit,"STR_CSE_CMS_BANDAGED","STR_CSE_CMS_IS_BANDAGING_YOU", 0, [[_healer] call cse_fnc_getName]] call cse_fnc_sendDisplayMessageTo;
- };
- [_unit,"treatment",format["%1 has patched up the patient",[_healer] call cse_fnc_getName]] call cse_fnc_addActivityToLog_CMS;
-};
-
-true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_hasEquipment_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_hasEquipment_CMS.sqf
deleted file mode 100644
index f27f7521a8..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_hasEquipment_CMS.sqf
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * fn_hasEquipment_CMS.sqf
- * @Descr: Check if the medic or patient have the right equipment for treatment.
- * @Author: Glowbal
- *
- * @Arguments: [medic OBJECT, patient OBJECT, item STRING (Classname of the item. Expects magazine type.)]
- * @Return: BOOL
- * @PublicAPI: false
- */
-
-private ["_medic", "_patient", "_item", "_return"];
-_medic = _this select 0;
-_patient = _this select 1;
-_item = _this select 2;
-
-if (isnil "CSE_ALLOW_SHARED_EQUIPMENT_CMS") then {
- CSE_ALLOW_SHARED_EQUIPMENT_CMS = true;
-};
-if (CSE_ALLOW_SHARED_EQUIPMENT_CMS && {[_patient, _item] call cse_fnc_hasItem}) exitwith {
- true;
-};
-
-if ([_medic, _item] call cse_fnc_hasItem) exitwith {
- true;
-};
-
-_return = false;
-if ([vehicle _medic] call cse_fnc_isMedicalVehicle_CMS && {(vehicle _medic != _medic)}) then {
- _crew = crew vehicle _medic;
- {
- if ([_x, _medic] call cse_fnc_canAccessMedicalEquipment_CMS && {([_x, _item] call cse_fnc_hasItem)}) exitwith {
- _return = true;
- };
- }foreach _crew;
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_hasTourniquetAppliedTo_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_hasTourniquetAppliedTo_CMS.sqf
deleted file mode 100644
index 91d51f1441..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_hasTourniquetAppliedTo_CMS.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * fn_hasTourniquetAppliedTo_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_part","_selectionName","_tourniquets"];
-_unit = _this select 0;
-_selectionName = _this select 1;
-_part = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
-_tourniquets = [_unit,"cse_tourniquets"] call cse_fnc_getVariable;
-((_tourniquets select _part) > 0)
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_healLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_healLocal_CMS.sqf
deleted file mode 100644
index b732249af1..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_healLocal_CMS.sqf
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * fn_healLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_caller", "_wasUnconscious"];
-_unit = _this select 0;
-_caller = _this select 1;
-
-if (alive _unit) then {
- _wasUnconscious = [_unit] call cse_fnc_isUnconscious;
- [_unit,"treatment",format["%1 used a personal aid kit",[_caller] call cse_fnc_getName]] call cse_fnc_addActivityToLog_CMS;
-
- [_unit,"cse_openWounds",[[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0]]] call cse_fnc_setVariable;
- [_unit,"cse_bandagedWounds",[[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0]]] call cse_fnc_setVariable;
- [_unit,"cse_fractures",[[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0]]] call cse_fnc_setVariable;
- [_unit,"cse_airway",0] call cse_fnc_setVariable;
- [_unit,"cse_tourniquets",[0,0,0,0,0,0]] call cse_fnc_setVariable;
- [_unit,"cse_splints",0] call cse_fnc_setVariable;
-
- //["cse_activityLog_CMS",[]] call cse_fnc_setVariable;
- [_unit,"cse_triageLevel",0] call cse_fnc_setVariable;
- [_unit,"cse_triageCard",[]] call cse_fnc_setVariable;
-
- // private variables
- [_unit,"cse_bloodVolume",100] call cse_fnc_setVariable;
- [_unit,"cse_bloodIVVolume",0] call cse_fnc_setVariable;
- [_unit,"cse_plasmaIVVolume",0] call cse_fnc_setVariable;
- [_unit,"cse_salineIVVolume",0] call cse_fnc_setVariable;
-
- [_unit,"cse_pain",0] call cse_fnc_setVariable;
- [_unit,"cse_heartRate",80] call cse_fnc_setVariable;
- [_unit,"cse_andrenaline",0] call cse_fnc_setVariable;
- [_unit,"cse_bloodPressure",[80,120]] call cse_fnc_setVariable;
-
- [_unit,"cse_givenMorphine",0] call cse_fnc_setVariable;
- [_unit,"cse_givenAtropine",0] call cse_fnc_setVariable;
- [_unit,"cse_givenEpinephrine",0] call cse_fnc_setVariable;
-
- [_unit,"cse_bodyPartStatus",[0,0,0,0,0,0]] call cse_fnc_setVariable;
- [_unit,"CSE_ENABLE_REVIVE_SETDEAD_F", 0] call cse_fnc_setVariable;
- [_unit,"CSE_ENABLE_REVIVE_COUNTER", 0] call cse_fnc_setVariable;
-
- _unit setDamage 0;
- if (!CSE_ALLOW_INSTANT_DEAD_CMS) then {
- [_unit, "cse_noInstantDeath", false] call cse_fnc_setVariable;
- };
-
- if (isPlayer _unit) then {
- [false] call cse_fnc_effectBlackOut;
- [true] call cse_fnc_setVolume_f;
- ["unconscious", false] call cse_fnc_disableUserInput_f;
- };
- if (_wasUnconscious) then {
- ["waiting until no longer unconscious"] call cse_fnc_debug;
- waituntil {!([_unit] call cse_fnc_isUnconscious)};
- sleep 0.1;
-
- if (vehicle _unit == _unit) then {
- if (!([_unit] call cse_fnc_beingCarried)) then {
- ["Resetting animation"] call cse_fnc_debug;
- [_unit,"",false] call cse_fnc_broadcastAnim;
- [_unit,"amovppnemstpsnonwnondnon",false] call cse_fnc_broadcastAnim;
- };
- };
- };
- ["Completed healLocal"] call cse_fnc_debug;
-};
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_heal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_heal_CMS.sqf
deleted file mode 100644
index be403202a6..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_heal_CMS.sqf
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * fn_heal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit", "_caller", "_selectionName", "_removeItem", "_prevAnim"];
-_unit = _this select 0;
-_caller = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-
-if !((CSE_AID_KIT_RESTRICTIONS_CMS == 0 && ([_caller] call cse_fnc_inMedicalFacility_CMS)) || (CSE_AID_KIT_RESTRICTIONS_CMS == 1 && ([_caller] call cse_fnc_inMedicalFacility_CMS) && (!([_unit] call cse_fnc_hasOpenWounds_CMS))) || (CSE_AID_KIT_RESTRICTIONS_CMS == 2) || (CSE_AID_KIT_RESTRICTIONS_CMS == 3 && (!([_unit] call cse_fnc_hasOpenWounds_CMS)))) exitwith {};
-
-if (!([_caller, _unit, _removeItem] call cse_fnc_hasEquipment_CMS)) exitwith {};
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_caller] call cse_fnc_treatmentMutex_CMS;
-
-_prevAnim = "";
-if (vehicle _caller == _caller && (vehicle _unit == _unit) && !(stance _caller == "PRONE")) then {
- if (primaryWeapon _caller == "") then {
- _prevAnim = animationState _caller;
- };
- [_caller,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
-};
-
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _caller;
-if !([5,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{hint "Action aborted. You moved away";}] call cse_fnc_gui_loadingBar) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-CSE_ORIGINAL_POSITION_PLAYER_CMS = nil;
-
-if (CSE_AID_KIT_REMOVED_UPON_USAGE_CMS) then {
- [_caller, _unit,_removeItem] call cse_fnc_useEquipment_CMS;
-};
-
-if (_prevAnim != "") then {
- _caller switchMove _prevAnim;
-};
-
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-
-if (!(_unit getvariable ["cms_isDead",false]) && alive _unit) then {
- [[_unit,_caller], "cse_fnc_healLocal_CMS", _unit, false] spawn BIS_fnc_MP;
-};
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_isSetTreatmentMutex_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_isSetTreatmentMutex_CMS.sqf
deleted file mode 100644
index 6d34ae3abd..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_isSetTreatmentMutex_CMS.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_isSetTreatmentMutex_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-if (isnil "CSE_PERFORMING_TREATMENT_CMS_MUTEX") then {
- CSE_PERFORMING_TREATMENT_CMS_MUTEX = false;
-};
-
-CSE_PERFORMING_TREATMENT_CMS_MUTEX
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_ivLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_ivLocal_CMS.sqf
deleted file mode 100644
index 8988dfd51c..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_ivLocal_CMS.sqf
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * fn_ivLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_treatingPerson","_injuredPerson","_selectionName","_removeItem","_attributes","_patient", "_value"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-
-
-
-_attributes = switch (_removeItem) do {
- case "cse_blood_iv": {["cse_bloodIVVolume",1000,"Blood IV"]};
- case "cse_saline_iv": {["cse_salineIVVolume",1000,"Saline IV"]};
- case "cse_plasma_iv": {["cse_plasmaIVVolume",1000,"Plasma IV"]};
-
- case "cse_blood_iv_500": {["cse_bloodIVVolume",500,"Blood IV"]};
- case "cse_saline_iv_500": {["cse_salineIVVolume",500,"Saline IV"]};
- case "cse_plasma_iv_500": {["cse_plasmaIVVolume",500,"Plasma IV"]};
-
- case "cse_blood_iv_250": {["cse_bloodIVVolume",250,"Blood IV"]};
- case "cse_saline_iv_250": {["cse_salineIVVolume",250,"Saline IV"]};
- case "cse_plasma_iv_250": {["cse_plasmaIVVolume",250,"Plasma IV"]};
-
- default {[]};
-};
-if (count _attributes > 1) then {
-
- _value = [_injuredPerson,(_attributes select 0)] call cse_fnc_getVariable;
- _value = _value + (_attributes select 1);
- [format["Has given patient: %1",[_value, _attributes select 0, _attributes select 1]]] call cse_fnc_debug;
- [_injuredPerson,(_attributes select 0),_value] call cse_fnc_setVariable;
- [format["Confirm: %1",[_injuredPerson getvariable [_attributes select 0, 0], _injuredPerson]]] call cse_fnc_debug;
-
- _patient = "patient";
- if (_injuredPerson == _treatingPerson) then {
- _patient = "himself";
- };
- [_injuredPerson,"treatment",format["%1 has given %4 a %2(%3ml)",[_treatingPerson] call cse_fnc_getName,_attributes select 2,_attributes select 1,_patient]] call cse_fnc_addActivityToLog_CMS;
- [_injuredPerson,_removeItem] call cse_fnc_addToTriageList_CMS;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_iv_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_iv_CMS.sqf
deleted file mode 100644
index d365c6400d..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_iv_CMS.sqf
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * fn_iv_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_treatingPerson","_injuredPerson","_selectionName","_removeItem","_attributes","_patient", "_continue", "_prevAnim"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_treatingPerson,"set"] call cse_fnc_treatmentMutex_CMS;
-
-if (!([_treatingPerson, _injuredPerson, _removeItem] call cse_fnc_hasEquipment_CMS)) exitwith { [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS; };
-
-
-_prevAnim = "";
-if (vehicle _treatingPerson == _treatingPerson && (vehicle _injuredPerson == _injuredPerson) && !(stance _treatingPerson == "PRONE")) then {
- if (primaryWeapon _treatingPerson == "") then {
- _prevAnim = animationState _treatingPerson;
- };
- [_treatingPerson,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
-};
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _treatingPerson;
-if !([5,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{hint "Action aborted. You moved away";}] call cse_fnc_gui_loadingBar) exitwith {
- [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-
-[_treatingPerson, _injuredPerson,_removeItem] call cse_fnc_useEquipment_CMS;
-[_this, "cse_fnc_ivLocal_CMS", _injuredPerson, false] spawn BIS_fnc_MP;
-
-if (_prevAnim != "") then {
- _treatingPerson switchMove _prevAnim;
-};
-
-[_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_medicationLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_medicationLocal_CMS.sqf
deleted file mode 100644
index 51beb092ac..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_medicationLocal_CMS.sqf
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * fn_medicationLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_treatingPerson","_injuredPerson","_selectionName","_removeItem","_patient","_attributes","_value"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-
-_attributes = switch (_removeItem) do {
- case "cse_morphine": {
- ["cse_givenMorphine",1,"Morphine"]
- };
- case "cse_atropine": {
- ["cse_givenAtropine",1,"Atropine"]
- };
- case "cse_epinephrine": {
- ["cse_givenEpinephrine",1,"Epinephrine"]
- };
- case "cse_antiBiotics": {
- []
- };
- default {[]};
-};
-
-if (count _attributes > 1) then {
- [_injuredPerson] spawn cse_fnc_unitLoop_CMS;
- _value = [_injuredPerson,(_attributes select 0)] call cse_fnc_getVariable;
- _value = _value + (_attributes select 1);
- [_injuredPerson,(_attributes select 0),_value] call cse_fnc_setVariable;
-
- _patient = "patient";
- if (_injuredPerson == _treatingPerson) then {
- _patient = "himself";
- };
- [_injuredPerson,"treatment",format["%1 has given %3 %2",[_treatingPerson] call cse_fnc_getName, (_attributes select 2),_patient]] call cse_fnc_addActivityToLog_CMS;
-[_injuredPerson,_removeItem] call cse_fnc_addToTriageList_CMS;
-
- _usedMedication = {
- private ["_injuredPerson","_var","_usedMed","_morphineUsed","_epiUsed","_atroUsed","_totalUsed"];
- _injuredPerson = _this select 0;
- _var = _this select 1;
- _overDose = 5;
- _wearOff = 120;
-
- if (!alive _injuredPerson) exitwith{};
- if (count _this > 2) then {
- _overDose = _this select 2;
- if (count _this > 3) then {
- _wearOff = _this select 3;
- };
- };
- _usedMed = [_injuredPerson, _var, 0] call cse_fnc_getVariable;
- if (isnil "_usedMed") then {
- _usedMed = 0;
- };
- if (_usedMed > (_overDose + round(random(2)))) then {
- [_injuredPerson] spawn cse_fnc_setDead;
- };
-
- _morphineUsed = _injuredPerson getvariable ["cse_givenMorphine", 0];
- _epiUsed = _injuredPerson getvariable ["cse_givenEpinephrine", 0];
- _atroUsed = _injuredPerson getvariable ["cse_givenAtropine", 0];
- _totalUsed = _morphineUsed + _epiUsed + _atroUsed;
- if (_totalUsed > 10) then {
- [_injuredPerson] spawn cse_fnc_setDead;
- };
- [_injuredPerson,_wearOff,_var] spawn {
- sleep ((_this select 1) + (round(random(30))));
- _amountDecreased = 0;
- _usedMed = [_this select 0, _this select 2] call cse_fnc_getVariable;
- if (typeName _usedMed != typeName 0) then {
- _usedMed = 0;
- };
- while {(_usedMed > 0.000000 && _amountDecreased < 1.000000)} do {
- _usedMed = ([_this select 0, _this select 2] call cse_fnc_getVariable);
- if ( typeName _usedMed != typeName 0) then {
- _usedMed = 0;
- };
- [_this select 0, _this select 2,_usedMed - 0.001] call cse_fnc_setVariable;
- _amountDecreased = _amountDecreased + 0.001;
- sleep 1;
- };
- };
- };
-
-
- switch (_removeItem) do {
- case "cse_atropine": {
-
- _heartRate = [_injuredPerson, "cse_heartRate"] call cse_fnc_getVariable;
- //_heartRate = [_injuredPerson, "cse_heartRate"] call cse_fnc_getVariable;
- if (alive _injuredPerson) then {
- if (_heartRate > 0) then {
- if (_heartRate <= 40) then {
- [_injuredPerson, -(10 + random(20)), 30] call cse_fnc_addHeartRateAdjustment_CMS;
- };
-
- if (_heartRate > 40) then {
- if (_heartRate > 120) then {
- [_injuredPerson, -(10 + random(50)), 30] call cse_fnc_addHeartRateAdjustment_CMS;
- } else {
- [_injuredPerson, -(10 + random(40)), 30] call cse_fnc_addHeartRateAdjustment_CMS;
- };
- };
- };
- //[_injuredPerson, "cse_heartRate",_heartRate] call cse_fnc_setVariable;
- [_injuredPerson,(_attributes select 0),5] call _usedMedication;
- };
- };
- case "cse_epinephrine": {
- _heartRate = [_injuredPerson, "cse_heartRate"] call cse_fnc_getVariable;
- if (alive _injuredPerson) then {
- if (_heartRate > 0) then {
- if (_heartRate <= 40) then {
- [_injuredPerson, (10 + random(20)), 30] call cse_fnc_addHeartRateAdjustment_CMS;
- };
-
- if (_heartRate > 40) then {
- if (_heartRate > 120) then {
- [_injuredPerson, (10 + random(50)), 30] call cse_fnc_addHeartRateAdjustment_CMS;
- } else {
- [_injuredPerson, (10 + random(40)), 30, {}] call cse_fnc_addHeartRateAdjustment_CMS;
- };
- };
- };
- [_injuredPerson,(_attributes select 0),3] call _usedMedication;
- };
- };
- case "cse_morphine": {
- private ["_usedMorphine"];
- _pain = [_injuredPerson, "cse_pain"] call cse_fnc_getVariable;
- _pain = 0;
- //_pain = _pain - 35;
- if (_pain <= 0) then {
- _pain = 0;
- };
- _heartRate = [_injuredPerson, "cse_heartRate"] call cse_fnc_getVariable;
- [format["used morphine: %1",_heartRate]] call cse_fnc_debug;
- if (alive _injuredPerson) then {
- if (_heartRate > 0) then {
- if (_heartRate <= 40) then {
- [_injuredPerson, -(10 + random(20)), 40] call cse_fnc_addHeartRateAdjustment_CMS;
- };
- if (_heartRate > 40) then {
- if (_heartRate > 120) then {
- [_injuredPerson, -(10 + random(50)), 40] call cse_fnc_addHeartRateAdjustment_CMS;
- } else {
- [_injuredPerson, -(10 + random(40)), 40] call cse_fnc_addHeartRateAdjustment_CMS;
- };
- };
- };
- };
- [_injuredPerson, "cse_pain",_pain] call cse_fnc_setVariable;
- [_injuredPerson,(_attributes select 0),4,120] call _usedMedication;
- };
- default {
- [format["default got triggered for medication. %1",_this]] call cse_fnc_debug;
- };
- };
-};
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_medication_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_medication_CMS.sqf
deleted file mode 100644
index fe5030b527..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_medication_CMS.sqf
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * fn_medication_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_treatingPerson","_injuredPerson","_selectionName","_removeItem","_patient","_attributes","_value", "_prevAnim"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_treatingPerson,"set"] call cse_fnc_treatmentMutex_CMS;
-
-if (!([_treatingPerson, _injuredPerson, _removeItem] call cse_fnc_hasEquipment_CMS)) exitwith { [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS; };
-
-
-_attributes = switch (_removeItem) do {
- case "cse_morphine": {
- ["cse_givenMorphine",1,"Morphine"]
- };
- case "cse_atropine": {
- ["cse_givenAtropine",1,"Atropine"]
- };
- case "cse_epinephrine": {
- ["cse_givenEpinephrine",1,"Epinephrine"]
- };
- case "cse_antiBiotics": {
- []
- };
- default {[]};
-};
-
-if (count _attributes > 1) then {
- _prevAnim = "";
- if (vehicle _treatingPerson == _treatingPerson && (vehicle _injuredPerson == _injuredPerson) && !(stance _treatingPerson == "PRONE")) then {
- if (primaryWeapon _treatingPerson == "") then {
- _prevAnim = animationState _treatingPerson;
- };
- [_treatingPerson,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
- };
-
- ["cse_sys_medical_treatment", true, "cse\cse_sys_medical\data\icons\medication_small.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-
- CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _treatingPerson;
- if ([2,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{hint "Action aborted. You moved away";}] call cse_fnc_gui_loadingBar) then {
- [_treatingPerson, _injuredPerson,_removeItem] call cse_fnc_useEquipment_CMS;
- [_this, "cse_fnc_medicationLocal_CMS", _injuredPerson, false] spawn BIS_fnc_MP;
- };
-
- if (_prevAnim != "") then {
- _treatingPerson switchMove _prevAnim;
- };
- ["cse_sys_medical_treatment", false, "cse\cse_sys_medical\data\icons\medication_small.paa", [1,1,1,1]] call cse_fnc_gui_displayIcon;
-};
-[_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRLocal_CMS.sqf
deleted file mode 100644
index f62975b15d..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRLocal_CMS.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_performCPRLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_caller","_unit"];
-_unit = _this select 0;
-_caller = _this select 1;
-
-[_unit] call cse_fnc_unitLoop_CMS;
-/*if (([_unit, "cse_heartRate"] call cse_fnc_getVariable) > 0) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
- [_caller,"No need for CPR"] call cse_fnc_sendHintTo;
-};*/
-
-if (vehicle _unit == _unit) then {
- [_unit,"AinjPpneMstpSnonWrflDnon_rolltoback"] call cse_fnc_localAnim;
-};
-
-if (vehicle _caller == _caller) then {
- //[_caller,"AinvPknlMstpSnonWrflDr_medic0"] call cse_fnc_broadcastAnim;
- [_caller,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
-};
-
-[_this, "cse_fnc_performCPRProvider_CMS", _caller, false] spawn BIS_fnc_MP;
-_n = _unit getvariable ["CSE_ENABLE_REVIVE_COUNTER",0];
-if (_n > 0) then {
- _n = _n - random(20);
- if (_n < 0) then {
- _n = 0;
- };
- _unit setvariable ["CSE_ENABLE_REVIVE_COUNTER", _n];
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRProvider_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRProvider_CMS.sqf
deleted file mode 100644
index 437b3fc786..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRProvider_CMS.sqf
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * fn_performCPRProvider_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_caller","_unit","_timer","_succesValueCPR"];
-_unit = _this select 0;
-_caller = _this select 1;
-
-cse_playerIsProvidingCPR_CMS = true;
-_timer = 0;
-_succesValueCPR = 0;
-
-[_caller,"You start providing CPR"] call cse_fnc_sendHintTo;
-
-while {cse_playerIsProvidingCPR_CMS} do {
- // [_caller,"Acts_TreatingWounded01"] call cse_fnc_localAnim;
- if (vehicle _caller == _caller) then {
- _caller playMove "AinvPknlMstpSnonWrflDr_medic0";
- };
- sleep 0.1;
- if (alive _unit) then {
- if (random(10) > 6) then {
- _succesValueCPR = _succesValueCPR + random(2);
- } else {
- _succesValueCPR = _succesValueCPR - random(1);
- if (_succesValueCPR < 0) then {
- _succesValueCPR = 0;
- };
- };
- };
- _timer = _timer + 1;
- sleep 0.1;
- if (_succesValueCPR > 20 && ((_unit getvariable ["CSE_ENABLE_REVIVE_SETDEAD_F",0]) == 0)) exitwith {
- _succesValueCPR = 40;
- };
- if (_succesValueCPR > 35 && ((_unit getvariable ["CSE_ENABLE_REVIVE_SETDEAD_F",0]) > 0)) exitwith {
- _succesValueCPR = 40;
- };
-
- if (_timer > 160) exitwith{_succesValueCPR = 0;};
-};
-cse_playerIsProvidingCPR_CMS = nil;
-if (vehicle _caller == _caller) then {
- [_caller,"AinvPknlMstpSnonWrflDnon_medicEnd"] call cse_fnc_localAnim;
-};
-
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-if (_succesValueCPR > 20 && alive _unit) then {
- _unit setvariable ["cse_cardiacArrest_CMS", nil, true];
- [_caller,"CPR Success"] call cse_fnc_sendHintTo;
- [_this, "cse_fnc_performCPRSuccess_CMS", _unit, false] spawn BIS_fnc_MP;
-} else {
- [_caller,"You stopped giving CPR"] call cse_fnc_sendHintTo;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRSuccess_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRSuccess_CMS.sqf
deleted file mode 100644
index 9544d6b4e1..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPRSuccess_CMS.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * fn_performCPRSuccess_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_caller","_unit"];
-_unit = _this select 0;
-_caller = _this select 1;
-
-[_unit, "cse_heartRate",40] call cse_fnc_setVariable;
-[_unit, "cse_bloodPressure",[50,70]] call cse_fnc_setVariable;
-
-// setting this to waken up unconscious revivable units
-[_unit, "CSE_ENABLE_REVIVE_SETDEAD_F", 0] call cse_fnc_setVariable;
-[_unit, "CSE_ENABLE_REVIVE_COUNTER", 0] call cse_fnc_setVariable;
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPR_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPR_CMS.sqf
deleted file mode 100644
index 8d152dda83..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performCPR_CMS.sqf
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * fn_performCPR_CMS.sqf
- * @Descr: Start the CPR action from CMS. Caller unit will attempt to restart the targets heart using CPR.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT (The unit that cPR will be performed upon), caller OBJECT (The unit that does the CPR action)]
- * @Return: void
- * @PublicAPI: true
- */
-
-
-private ["_caller","_unit"];
-_unit = _this select 0;
-_caller = _this select 1;
-if (isnil "cse_playerIsProvidingCPR_CMS") then {
- cse_playerIsProvidingCPR_CMS = false;
-};
-
-[_this] call cse_Fnc_Debug;
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {cse_playerIsProvidingCPR_CMS = false;};
-[_caller] call cse_fnc_treatmentMutex_CMS;
-
-if (cse_playerIsProvidingCPR_CMS) exitwith {
- [_caller,"You are already providing CPR"] call cse_fnc_sendHintTo;
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
- cse_playerIsProvidingCPR_CMS = false; // stop giving CPR
-};
-
-if (_unit == _caller) exitwith{[_caller,"You cannot give yourself CPR"] call cse_fnc_sendHintTo; [_caller,"release"] call cse_fnc_treatmentMutex_CMS;};
-
- //_name = _unit getvariable ["cse_nameUnit",[_unit] call cse_fnc_getName];
-[_caller,"You start providing CPR"] call cse_fnc_sendHintTo;
-
-[_this, "cse_fnc_performCPRLocal_CMS", _unit, false] spawn BIS_fnc_MP;
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performStitching_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_performStitching_CMS.sqf
deleted file mode 100644
index 1389858e8c..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performStitching_CMS.sqf
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * fn_performStitching_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define WAITING_TIME_SMALL 2.5
-#define WAITING_TIME_MEDIUM 3.5
-#define WAITING_TIME_LARGE 4.5
-
-#define WAITING_TIMES_WOUNDS [WAITING_TIME_SMALL, WAITING_TIME_MEDIUM, WAITING_TIME_LARGE]
-
-private ["_injuredPerson", "_treatingPerson", "_selectionName", "_removeItem", "_prevAnim", "_bandagedWounds", "_bodyPartN", "_allWounds", "_totalWoundsCount", "_totalTime", "_startTimeOfStitching", "_indexStitch", "_woundstoStitchOf", "_afterStitchingWoundsCount", "_waitingTime", "_i", "_startTime", "_messageSend"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-
-if (!([_treatingPerson, _injuredPerson, _removeItem] call cse_fnc_hasEquipment_CMS)) exitwith {};
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_treatingPerson,"set"] call cse_fnc_treatmentMutex_CMS;
-
-[_treatingPerson,"STR_CSE_CMS_STITCHING","STR_CSE_CMS_START_STITCHING_INJURIES", 0, [[_injuredPerson] call cse_fnc_getName,_selectionName]] call cse_fnc_sendDisplayMessageTo;
-
-
-_prevAnim = "";
-if (vehicle _treatingPerson == _treatingPerson && (vehicle _injuredPerson == _injuredPerson)) then {
- if (primaryWeapon _treatingPerson == "") then {
- _prevAnim = animationState _treatingPerson;
- };
- [_treatingPerson,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
-};
-_bandagedWounds = [_injuredPerson,"cse_bandagedWounds"] call cse_fnc_getVariable;
-_bodyPartN = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
-
-_allWounds = _bandagedWounds select _bodyPartN;
-_totalWoundsCount = (_allWounds select 0) + (_allWounds select 1) + (_allWounds select 2);
-_totalTime = ((_allWounds select 0) * 2.5) + ((_allWounds select 1) * 3.5) + ((_allWounds select 2) * 4.5);
-
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _treatingPerson;
-CSE_CONDITION_STITCHING_CMS = {((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)};
-CSE_RUNNING_STITCHING_CMS = true;
-
-_startTimeOfStitching = diag_tickTime;
-_totalTime spawn {
- CSE_RUNNING_STITCHING_CMS = [_this, CSE_CONDITION_STITCHING_CMS, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar;
-};
-
-_indexStitch = 0;
-while {CSE_RUNNING_STITCHING_CMS && _indexStitch < 3} do {
- _woundstoStitchOf = _allWounds select _indexStitch;
- _afterStitchingWoundsCount = _woundstoStitchOf;
- _waitingTime = WAITING_TIMES_WOUNDS select _indexStitch;
-
- for [{_i=0}, {_i< (ceil _woundstoStitchOf)}, {_i=_i+1}] do {
- _startTime = diag_tickTime;
- waitUntil {(diag_tickTime - _startTime > _waitingTime) || !CSE_RUNNING_STITCHING_CMS};
- if (CSE_RUNNING_STITCHING_CMS) then {
- // TODO play sound
- _afterStitchingWoundsCount = _afterStitchingWoundsCount - 1;
- };
- };
-
- if (_afterStitchingWoundsCount < 0) then {
- _afterStitchingWoundsCount = 0;
- };
- _allWounds set [_indexStitch, _afterStitchingWoundsCount];
- _indexStitch = _indexStitch + 1;
-};
-_bandagedWounds set [_bodyPartN, _allWounds];
-[_injuredPerson, "cse_bandagedWounds", _bandagedWounds] call cse_fnc_setVariable;
-
-[_injuredPerson,"treatment",format["%1 has stitched up some bandages wounds",[_treatingPerson] call cse_fnc_getName]] call cse_fnc_addActivityToLog_CMS;
-
-if (_prevAnim != "") then {
- _treatingPerson switchMove _prevAnim;
-};
-
-[_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performTreatment_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_performTreatment_CMS.sqf
deleted file mode 100644
index 323fec5ee9..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_performTreatment_CMS.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * fn_performTreatment_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_unit","_caller","_treatment","_removeOnSuccess","_params"];
-_caller = _this select 0;
-_unit = _this select 1;
-_treatment = _this select 2;
-_removeOnSuccess = _this select 3;
-
-CMS_PERFORMING_TREATMENT = true;
-if (!isnil "_removeOnSuccess") then {
-
- if (([_caller,_removeOnSuccess] call cse_fnc_hasMagazine)) then {
- _params = [_unit,_caller, (call cse_fnc_getSelectedBodyPart_CMS),_removeOnSuccess];
- [_params, _treatment, _unit, false] spawn BIS_fnc_MP;
- };
- [//-1, cms_fnc_clutter, [_unit, _removeOnSuccess]] call CBA_fnc_globalExecute;
-};
-call cms_ui_hideSubMenus;
-// waituntil {(!CMS_PERFORMING_TREATMENT || time>5 seconds)};
-//sleep 5;
-CMS_PERFORMING_TREATMENT = false;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_removeTourniquet_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_removeTourniquet_CMS.sqf
deleted file mode 100644
index 90e23877cb..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_removeTourniquet_CMS.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * fn_removeTourniquet_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_caller","_unit","_part","_selectionName","_removeItem","_tourniquets"];
-_unit = _this select 0;
-_caller = _this select 1;
-_selectionName = _this select 2;
-
-[_caller,"You attempt to remove a tourniquet"] call cse_fnc_sendHintTo;
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {["MUTEX HAS BEEN SET - EXITING"] call cse_fnc_debug;};
- [_caller,"set"] call cse_fnc_treatmentMutex_CMS;
-
-
-if !([_unit, _selectionName] call cse_fnc_hasTourniquetAppliedTo_CMS) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
- [_caller,"There is no tourniquet on this body part!"] call cse_fnc_sendHintTo;
-};
-
-if (vehicle _caller == _caller && (vehicle _unit == _unit)) then {
- [_caller,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
-};
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _caller;
-if !([5,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{hint "Action aborted. You moved away";}] call cse_fnc_gui_loadingBar) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-_part = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
-_tourniquets = [_unit,"cse_tourniquets"] call cse_fnc_getVariable;
-_tourniquets set[_part,0];
-[_unit,"cse_tourniquets",_tourniquets] call cse_fnc_setVariable;
-
-_caller addMagazine "cse_tourniquet";
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-
-[_unit,"treatment",format["%1 removed a tourniquet on %2",[_caller] call cse_fnc_getName,_selectionName]] call cse_fnc_addActivityToLog_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_tourniquetLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_tourniquetLocal_CMS.sqf
deleted file mode 100644
index dce56d6175..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_tourniquetLocal_CMS.sqf
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * fn_tourniquetLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_treatingPerson","_injuredPerson","_selectionName","_removeItem"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-
- [_injuredPerson,"treatment",format["%1 applied a tourniquet on %2",[_treatingPerson] call cse_fnc_getName,_selectionName]] call cse_fnc_addActivityToLog_CMS;
- [_injuredPerson,_removeItem] call cse_fnc_addToTriageList_CMS;
- [_injuredPerson] spawn cse_fnc_unitLoop_CMS;
- _part = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
- _tourniquets = [_injuredPerson,"cse_tourniquets"] call cse_fnc_getVariable;
- _applyingTo = (_tourniquets select _part) +1 + round(random(100));
- _tourniquets set[_part,_applyingTo];
- [_injuredPerson,"cse_tourniquets",_tourniquets] call cse_fnc_setVariable;
-
- [_injuredPerson,_part,_applyingTo] spawn {
- private ["_injuredPerson","_part","_tourniquets","_appliedTo","_totalAmountOfPainAdded"];
- _injuredPerson = _this select 0;
- _part = _this select 1;
- _key = _this select 2;
- sleep 300 + (random(1800));
- _tourniquets = [_injuredPerson,"cse_tourniquets"] call cse_fnc_getVariable;
- _totalAmountOfPainAdded = 0;
- while {((_tourniquets select _part) == _key)} do {
- // increase pain level
- _pain = [_injuredPerson, "cse_pain"] call cse_fnc_getVariable;
- _pain = _pain + 0.005;
- _totalAmountOfPainAdded = _totalAmountOfPainAdded + 0.005;
- [_injuredPerson, "cse_pain",_pain] call cse_fnc_setVariable;
- sleep 5;
- };
-
- _pain = [_injuredPerson, "cse_pain"] call cse_fnc_getVariable;
- if (_pain < _totalAmountOfPainAdded) then {
- _pain = 0;
- } else {
- _pain = _pain - _totalAmountOfPainAdded;
- };
- [_injuredPerson, "cse_pain",_pain] call cse_fnc_setVariable;
- };
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_tourniquet_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_tourniquet_CMS.sqf
deleted file mode 100644
index f71b0a32ff..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_tourniquet_CMS.sqf
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * fn_tourniquet_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_caller","_unit","_part","_selectionName","_removeItem", "_tourniquets", "_continue"];
-_unit = _this select 0;
-_caller = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-[_caller,"You attempt to apply a tourniquet"] call cse_fnc_sendHintTo;
-
-if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
-[_caller,"set"] call cse_fnc_treatmentMutex_CMS;
-if (!([_caller, _unit, _removeItem] call cse_fnc_hasEquipment_CMS)) exitwith { [_caller,"release"] call cse_fnc_treatmentMutex_CMS; };
-
-_part = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
-if (_part == 0 || _part == 1) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
- [_caller,"You cannot apply a CAT on this body part!"] call cse_fnc_sendHintTo;
-};
-
-_tourniquets = [_unit,"cse_tourniquets"] call cse_fnc_getVariable;
-if ((_tourniquets select _part) >0) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
- [_caller,"There is already a tourniquet on this body part!"] call cse_fnc_sendHintTo;
-};
-
-if (vehicle _caller == _caller && (vehicle _unit == _unit) && !(stance _caller == "PRONE")) then {
- [_caller,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
-};
-CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _caller;
-if !([5,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{hint "Action aborted. You moved away";}] call cse_fnc_gui_loadingBar) exitwith {
- [_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-};
-["Now uses the magazine"] call cse_fnc_debug;
-[_caller, _unit,_removeItem] call cse_fnc_useEquipment_CMS;
-
-[_this, "cse_fnc_tourniquetLocal_CMS", _unit, false] spawn BIS_fnc_MP;
-[_caller,"release"] call cse_fnc_treatmentMutex_CMS;
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentAirwayLocal_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentAirwayLocal_CMS.sqf
deleted file mode 100644
index df79d5fa45..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentAirwayLocal_CMS.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_treatmentAirwayLocal_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_treatingPerson","_injuredPerson","_part","_selectionName","_openWounds","_woundsArray","_highest_amount","_highestSpot","_collectiveImpact", "_highestTotal","_totalNumber"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-if (!local _injuredPerson) exitwith{["cse_fnc_treatmentAirwayLocal_CMS called on non local machine",3] call cse_fnc_debug; };
-[_injuredPerson] spawn cse_fnc_unitLoop_CMS;
-if (_treatingPerson == _injuredPerson) exitwith {};
-
-
-[_injuredPerson,"STR_CSE_CMS_AIRWAY","STR_CSE_CMS_IS_TREATING_YOUR_AIRWAY",0, [([_treatingPerson] call cse_fnc_getName)]] call cse_fnc_sendDisplayMessageTo;
-[_injuredPerson,_removeItem] call cse_fnc_addToTriageList_CMS;
-
-_airwayStatus = [_injuredPerson,"cse_airway"] call cse_fnc_getVariable;
-if (_airwayStatus > 0) then {
- if (!([_treatingPerson] call cse_fnc_medicClass_CMS)) then {
- _injuredPerson setvariable ["cse_airwayTreated", true, true];
- // [_injuredPerson,"cse_airway", _airwayStatus - 1] call cse_fnc_getVariable;
-
- } else {
- if (random (1) > 0.35) then {
- _injuredPerson setvariable ["cse_airwayTreated", true, true];
- // [_injuredPerson,"cse_airway", _airwayStatus - 1] call cse_fnc_getVariable;
- } else {
- [_injuredPerson] call cse_fnc_setDead_CMS;
- };
- };
-};
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentAirway_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentAirway_CMS.sqf
deleted file mode 100644
index 8dd5730b8b..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentAirway_CMS.sqf
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * fn_treatmentAirway_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_treatingPerson","_injuredPerson","_part","_selectionName","_openWounds","_woundsArray","_highest_amount","_highestSpot"];
-_injuredPerson = _this select 0;
-_treatingPerson = _this select 1;
-_selectionName = _this select 2;
-_removeItem = _this select 3;
-
-[format["Treatment Airway: %1",_this]] call cse_fnc_debug;
-
-_part = [_selectionName] call cse_fnc_getBodyPartNumber_CMS;
-if (_part == 0 || _part == 1) then {
- if (call cse_fnc_isSetTreatmentMutex_CMS) exitwith {};
- [_treatingPerson] call cse_fnc_treatmentMutex_CMS;
- if (!([_treatingPerson, _injuredPerson, _removeItem] call cse_fnc_hasEquipment_CMS)) exitwith { [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS; };
-
- [_treatingPerson, _injuredPerson,_removeItem] call cse_fnc_useEquipment_CMS;
-
- if (vehicle _treatingPerson == _treatingPerson && (vehicle _injuredPerson == _injuredPerson)) then {
- [_treatingPerson,"AinvPknlMstpSlayWrflDnon_medic"] call cse_fnc_localAnim;
- };
- _name = [_injuredPerson] call cse_fnc_getName;
-
- [_treatingPerson,"STR_CSE_CMS_AIRWAY","STR_CSE_CMS_YOU_TREAT_AIRWAY", 0, [_name]] call cse_fnc_sendDisplayMessageTo;
-
- CSE_ORIGINAL_POSITION_PLAYER_CMS = getPos _treatingPerson;
- if !([5,{((vehicle player != player) ||((getPos player) distance CSE_ORIGINAL_POSITION_PLAYER_CMS) < 1)}, {},{[player, "STR_CSE_CMS_CANCELED", ["STR_CSE_CMS_ACTION_CANCELED","STR_CSE_CMS_YOU_MOVED_AWAY"]] call cse_fnc_sendDisplayInformationTo;}] call cse_fnc_gui_loadingBar) exitwith {
- [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS;
- };
-
- [_this, "cse_fnc_treatmentAirwayLocal_CMS", _injuredPerson, false] spawn BIS_fnc_MP;
- [_treatingPerson,"release"] call cse_fnc_treatmentMutex_CMS;
-} else {
- hintSilent "Cannot apply item on this body part";
-};
-true
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentMutex_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentMutex_CMS.sqf
deleted file mode 100644
index 82c0cd4d10..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_treatmentMutex_CMS.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * fn_treatmentMutex_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: [client OBJECT, action STRING ("release" releases the mutex if it has been set. "set" for setting the mutex)]
- * @Return: void
- * @PublicAPI: false
- */
-
-private ["_client","_action"];
-_client = _this select 0;
-
-if (!local _client) exitwith {
- [_this, "cse_fnc_treatmentMutex_CMS", _client, false] spawn BIS_fnc_MP;
-};
-if (isnil "CSE_PERFORMING_TREATMENT_CMS_MUTEX") then {
- CSE_PERFORMING_TREATMENT_CMS_MUTEX = false;
-};
-if (count _this > 1) exitwith {
- _action = _this select 1;
- if (_action == "release" || _action == "RELEASE") then {
- ["RELEASING TREATMENT MUTEX"] call cse_fnc_debug;
- CSE_PERFORMING_TREATMENT_CMS_MUTEX = false;
- } else {
- waituntil {!CSE_PERFORMING_TREATMENT_CMS_MUTEX};
- CSE_PERFORMING_TREATMENT_CMS_MUTEX = true;
- ["SETTING TREATMENT MUTEX 2"] call cse_fnc_debug;
- };
-};
-waituntil {!CSE_PERFORMING_TREATMENT_CMS_MUTEX};
-CSE_PERFORMING_TREATMENT_CMS_MUTEX = true;
-["SETTING TREATMENT MUTEX 1"] call cse_fnc_debug;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/treatment/fn_useEquipment_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/treatment/fn_useEquipment_CMS.sqf
deleted file mode 100644
index 65c6e99625..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/treatment/fn_useEquipment_CMS.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * fn_useEquipment_CMS.sqf
- * @Descr: Use Equipment if any is available. Priority: 1) Medic, 2) Patient. If in vehicle: 3) Crew
- * @Author: Glowbal
- *
- * @Arguments: [medic OBJECT, patient OBJECT, item STRING (ClassName of magazine item)]
- * @Return: BOOL
- * @PublicAPI: true
- */
-
-private ["_medic", "_patient", "_item", "_return","_crew"];
-_medic = _this select 0;
-_patient = _this select 1;
-_item = _this select 2;
-
-if (isnil "CSE_ALLOW_SHARED_EQUIPMENT_CMS") then {
- CSE_ALLOW_SHARED_EQUIPMENT_CMS = true;
-};
-
-if (CSE_ALLOW_SHARED_EQUIPMENT_CMS && {[_patient, _item] call cse_fnc_hasItem}) exitwith {
- [[_patient, _item], "cse_fnc_useItem", _patient] call BIS_fnc_MP;
- true;
-};
-
-if ([_medic, _item] call cse_fnc_hasItem) exitwith {
- [[_medic, _item], "cse_fnc_useItem", _medic] call BIS_fnc_MP;
- true;
-};
-
-_return = false;
-if ([vehicle _medic] call cse_fnc_isMedicalVehicle_CMS && {vehicle _medic != _medic}) then {
- _crew = crew vehicle _medic;
- {
- if ([_x, _medic] call cse_fnc_canAccessMedicalEquipment_CMS && {([_x, _item] call cse_fnc_hasItem)}) exitwith {
- _return = true;
- [[_x, _item], "cse_fnc_useItem", _x] call BIS_fnc_MP;
- };
- }foreach _crew;
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/triage/fn_addToTriageList_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/triage/fn_addToTriageList_CMS.sqf
deleted file mode 100644
index 0d3afb17bb..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/triage/fn_addToTriageList_CMS.sqf
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * fn_addToTriageList_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_caller","_type","_activity","_log"];
-_unit = _this select 0;
-_newItem = _this select 1;
-
-if (!local _unit) exitwith {
- [_this, "cse_fnc_addToTriageList_CMS", _unit, false] spawn BIS_fnc_MP;
-};
-
-_log = [_unit,"cse_triageCard"] call cse_fnc_getVariable;
-_inList = false;
-_counter = 0;
-{
- if ((_x select 0) == _newItem) exitwith {
- _info = _log select _counter;
- _info set [1,(_info select 1) + 1];
- _log set [ _counter, _info];
- _inList = true;
- };
- _counter = _counter + 1;
-}foreach _log;
-if (!_inList) then {
- _log pushback [_newItem,1];
-};
-[_unit,"cse_triageCard",_log] call cse_fnc_setVariable;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/triage/fn_getTriageList_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/triage/fn_getTriageList_CMS.sqf
deleted file mode 100644
index e0bca66e81..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/triage/fn_getTriageList_CMS.sqf
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * fn_getTriageList_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private["_unit"];
-_unit = _this select 0;
-_log = [_unit,"cse_triageCard"] call cse_fnc_getVariable;
-if (isnil "_log") then {
- _log = [];
-};
-if (typeName _log != typeName []) then {
- _log = [];
-};
-_log
diff --git a/TO_MERGE/cse/sys_medical/functions/triage/fn_getTriageStatus_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/triage/fn_getTriageStatus_CMS.sqf
deleted file mode 100644
index d1c3c63029..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/triage/fn_getTriageStatus_CMS.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_getTriageStatus_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_return","_status"];
-_unit = _this select 0;
-//_status = [_unit,"cse_triageLevel"] call cse_fnc_getVariable;
- _status = _unit getvariable ["cse_triageLevel", -1];
-
-_return = switch (_status) do {
- case 0: {["None",0,[0,0,0,0.7]]}; // none
- case 1: {["Minor",1,[0,0.5,0,0.7]]};
- case 2: {["Delayed",2,[0.77,0.51,0.08,0.7]]};
- case 3: {["Immediate",3,[1,0.2,0.2,0.7]]};
- case 4: {["Deceased",4,[0,0,0,0.7]]};
- default {["None",0,[0,0,0,0.7]]};
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/triage/fn_setTriageStatus_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/triage/fn_setTriageStatus_CMS.sqf
deleted file mode 100644
index 1ed3564e89..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/triage/fn_setTriageStatus_CMS.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_setTriageStatus_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_caller","_type","_activity","_status"];
-
-_unit = _this select 0;
-_status = _this select 1;
-
-if (!local _unit) exitwith {
- [_this, "cse_fnc_setTriageStatus_CMS", _unit, false] spawn BIS_fnc_MP;
-};
-[_unit,"cse_triageLevel",_status] call cse_fnc_setVariable;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_displayOptions_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_displayOptions_CMS.sqf
deleted file mode 100644
index a5df521c7d..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_displayOptions_CMS.sqf
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * fn_displayOptions_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_IDC 20
-#define END_IDC 27
-#define AMOUNT_OF_ENTRIES (count _entries)
-
-private ["_name","_entries","_display","_newTarget","_counter","_card","_ctrl","_code"];
-_name = _this select 0;
-if (isDedicated) exitwith{};
-_entries = switch (_name) do {
- case "advanced": {[_name] call cse_fnc_getAdvancedOptions_CMS};
- case "examine": {[_name] call cse_fnc_getExamineOptions_CMS};
- case "bandage": {[_name] call cse_fnc_getBandageOptions_CMS};
- case "medication": {[_name] call cse_fnc_getMedicationOptions_CMS};
- case "airway": {[_name] call cse_fnc_getAirwayOptions_CMS};
- case "triage": {[_name] call cse_fnc_getTriageCardOptions_CMS};
- case "drag": {[_name] call cse_fnc_getDragOptions_CMS};
- case "toggle": {[_name] call cse_fnc_getToggleOptions_CMS};
- default {[]};
-};
-
-disableSerialization;
-_display = uiNamespace getVariable 'cse_sys_medicalMenu';
-if ((_name == "toggle")) exitwith {
-
- if (CSE_SYS_MEDICAL_INTERACTION_TARGET != player) then {
- _newTarget = player;
- } else {
- _newTarget = CSE_SYS_MEDICAL_INTERACTION_TARGET_PREVIOUS;
- };
-
- CSE_SYS_MEDICAL_INTERACTION_TARGET_PREVIOUS = CSE_SYS_MEDICAL_INTERACTION_TARGET;
- [_newTarget] spawn {
- closeDialog 0;
- sleep 0.1;
- [_this select 0] call cse_fnc_openMenu_CMS;
- };
-};
-
-CSE_LATEST_DISPLAY_OPTION_MENU_CMS = _name;
-lbClear 212;
-if (_name == "triage") then {
- ctrlEnable[212,true];
- _card = ([CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_getTriageList_CMS);
- {
- lbadd[212,format["%1 x%2",getText(configFile >> "CfgMagazines" >> (_x select 0) >> "displayName"),_x select 1]];
- }foreach _card;
- if (count _card == 0) then {
- lbadd[212,"No Entries"];
- };
-} else {
- ctrlEnable[212,false];
-};
-
-
-for [{_x=START_IDC},{_x <= END_IDC},{_x=_x+1}] do {
- _ctrl = (_display displayCtrl (_x));
- _ctrl ctrlSetText "";
- //_ctrl ctrlSetPosition[-100,-100];
- _ctrl ctrlShow false;
- _ctrl ctrlSetEventHandler ["ButtonClick",""];
- _ctrl ctrlSetTooltip "";
- _ctrl ctrlCommit 0;
-
-};
-
-{
- //player sidechat format["TRIGGERED: %1",_x];
- if (_foreachIndex > END_IDC) exitwith {};
- _ctrl = (_display displayCtrl (START_IDC + _foreachIndex));
- if (!(_foreachIndex > AMOUNT_OF_ENTRIES)) then {
- _ctrl ctrlSetText (_x select 0);
- _code = format["[CSE_SYS_MEDICAL_INTERACTION_TARGET,PLAYER] spawn { %1 };",(_x select 1),CSE_SYS_MEDICAL_INTERACTION_TARGET,player];
- _ctrl ctrlSetEventHandler ["ButtonClick", _code];
- _ctrl ctrlSetTooltip (_x select 2);
- _ctrl ctrlShow true;
- } else {
- _ctrl ctrlSetText "";
- _ctrl ctrlSetEventHandler ["ButtonClick",""];
- };
- _ctrl ctrlCommit 0;
-}foreach _entries;
-
-[] call cse_fnc_updateIcons_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_dropDownTriageCard_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_dropDownTriageCard_CMS.sqf
deleted file mode 100644
index 7392e0d818..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_dropDownTriageCard_CMS.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * fn_dropDownTriageCard_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_display","_pos","_ctrl","_curPos","_idc"];
-disableSerialization;
-_display = uiNamespace getVariable 'cse_sys_medicalMenu';
-_pos = [ 0,0,0,0];
-_curPos = ctrlPosition (_display displayCtrl 2002);
-if ((_curPos select 0) == 0 && (_curPos select 1) == 0) then {
- _pos = ctrlPosition (_display displayCtrl 2001);
-};
-
-for "_idc" from 2002 to 2006 step 1 do
-{
- _pos set [1, (_pos select 1) + (_pos select 3)];
- _ctrl = (_display displayCtrl _idc);
- _ctrl ctrlSetPosition _pos;
- _ctrl ctrlCommit 0;
-};
-
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_getCurrentSelectedInjuryData_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_getCurrentSelectedInjuryData_CMS.sqf
deleted file mode 100644
index bc2f6e74f3..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_getCurrentSelectedInjuryData_CMS.sqf
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * fn_getCurrentSelectedInjuryData_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return", "_current"];
-
-_return = "";
-if (dialog) then {
- _current = lbCurSel 213;
- _return = lbData [213,_current];
-};
-_return;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_onMenuOpen_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_onMenuOpen_CMS.sqf
deleted file mode 100644
index 74aaef6d10..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_onMenuOpen_CMS.sqf
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * fn_onMenuOpen_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-if (isnil "CSE_LATEST_DISPLAY_OPTION_MENU_CMS") then {
- CSE_LATEST_DISPLAY_OPTION_MENU_CMS = "triage";
-} else {
- if (CSE_LATEST_DISPLAY_OPTION_MENU_CMS == "toggle") then {
- CSE_LATEST_DISPLAY_OPTION_MENU_CMS = "triage";
- CSE_SYS_MEDICAL_INTERACTION_TARGET = CSE_SYS_MEDICAL_INTERACTION_TARGET_PREVIOUS;
- };
-};
-
-private ["_display","_target"];
-_target = CSE_SYS_MEDICAL_INTERACTION_TARGET;
-CSE_SYS_MEDICAL_INTERACTION_TARGET = _target;
-if (isnil "CSE_SYS_MEDICAL_INTERACTION_TARGET_PREVIOUS") then {
- CSE_SYS_MEDICAL_INTERACTION_TARGET_PREVIOUS = _target;
-};
-[CSE_LATEST_DISPLAY_OPTION_MENU_CMS] call cse_fnc_displayOptions_CMS;
-
-[] call cse_fnc_updateActivityLog_CMS;
-[_target] call cse_fnc_updateUIInfo_CMS;
-
-// 11 till 18
-disableSerialization;
-_display = uiNamespace getVariable 'cse_sys_medicalMenu';
-(_display displayCtrl 11) ctrlSetTooltip localize "STR_CSE_UI_VIEW_TRIAGE_CARD";
-(_display displayCtrl 12) ctrlSetTooltip localize "STR_CSE_UI_EXAMINE_PATIENT";
-(_display displayCtrl 13) ctrlSetTooltip localize "STR_CSE_UI_BANDAGE_FRACTURES";
-(_display displayCtrl 14) ctrlSetTooltip localize "STR_CSE_UI_MEDICATION";
-(_display displayCtrl 15) ctrlSetTooltip localize "STR_CSE_UI_AIRWAY_MANAGEMENT";
-(_display displayCtrl 16) ctrlSetTooltip localize "STR_CSE_UI_ADVANCED_TREATMENT";
-(_display displayCtrl 17) ctrlSetTooltip localize "STR_CSE_UI_DRAG_CARRY";
-(_display displayCtrl 18) ctrlSetTooltip localize "STR_CSE_UI_TOGGLE_SELF";
-
-(_display displayCtrl 301) ctrlSetTooltip localize "STR_CSE_UI_SELECT_HEAD";
-(_display displayCtrl 302) ctrlSetTooltip localize "STR_CSE_UI_SELECT_TORSO";
-(_display displayCtrl 303) ctrlSetTooltip localize "STR_CSE_UI_SELECT_ARM_R";
-(_display displayCtrl 304) ctrlSetTooltip localize "STR_CSE_UI_SELECT_ARM_L";
-(_display displayCtrl 305) ctrlSetTooltip localize "STR_CSE_UI_SELECT_LEG_R";
-(_display displayCtrl 306) ctrlSetTooltip localize "STR_CSE_UI_SELECT_LEG_L";
-//if (_target != player) then {
- (_display displayCtrl 2001) ctrlSetTooltip localize "STR_CSE_UI_SELECT_TRIAGE_STATUS";
-//};
-(_display displayCtrl 1) ctrlSetText format["%1",[_target] call cse_fnc_getName];
-setMousePosition [ 0.4, 0.4];
-
-["cse_onMenuOpen_CMS", "onEachFrame", {
- _display = _this select 0;
- if (isNull CSE_SYS_MEDICAL_INTERACTION_TARGET) then {
- CSE_SYS_MEDICAL_INTERACTION_TARGET = player;
- };
- [CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_updateUIInfo_CMS;
- [] call cse_fnc_updateActivityLog_CMS;
- [CSE_LATEST_DISPLAY_OPTION_MENU_CMS] call cse_fnc_displayOptions_CMS;
- _status = [CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_getTriageStatus_CMS;
- (_display displayCtrl 2000) ctrlSetText (_status select 0);
- (_display displayCtrl 2000) ctrlSetBackgroundColor (_status select 2);
-
- }, [_display]] call BIS_fnc_addStackedEventHandler;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_openMenu_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_openMenu_CMS.sqf
deleted file mode 100644
index 14808565ed..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_openMenu_CMS.sqf
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * fn_openMenu_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_interactionTarget"];
-_interactionTarget = objNull;
-if (count _this > 0) then {
- _interactionTarget = _this select 0;
-
-} else {
- _interactionTarget = cursortarget;
- if (isNull _interactionTarget) then {
- _interactionTarget = player;
- };
- if (_interactionTarget distance player > 5 || !(_interactionTarget isKindOf "CaManBase")) then {
- _interactionTarget = player;
- };
-};
-
-if (isNull _interactionTarget) then { // _interactionTarget undefined here. WTF?
- _interactionTarget = player;
-};
-
-[format["INTERACTION WITH: %1",_interactionTarget]] call cse_fnc_Debug;
-[player,_interactionTarget] call cse_fnc_registerInteractingWith;
-CSE_SYS_MEDICAL_INTERACTION_TARGET = _interactionTarget;
-createDialog "cse_sys_medicalMenu";
-//[player,"release"] call cse_fnc_treatmentMutex_CMS; // Do we want to force release the treatment event, to prefent deadlock within the CMS Module?
-
-[_interactionTarget] spawn {
- waituntil {sleep 0.1; !dialog};
- [player,_this select 0] call cse_fnc_unregisterInteractingWith;
-};
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_updateActivityLog_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_updateActivityLog_CMS.sqf
deleted file mode 100644
index 2b65b5e630..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_updateActivityLog_CMS.sqf
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * fn_updateActivityLog_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-[] spawn {
- _log = [CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_getActivityLog_CMS;
- _counter = 0;
- lbclear 214;
- {
-
- //[_caller,_moment,_activity,_type]
- lbadd[214, _x select 1]; // moment
- lbadd[214, _x select 0]; // name, caller
- //lbadd[214, _x select 2]; // activity
- lbSetData [214,_counter,_x select 2];
-
- _counter = _counter + 1;
- }foreach _log;
- if (count _log < 1) then {
- lbadd[214, "No Activity recorded.."];
- lbadd[214, ""];
- };
-
- _log = [CSE_SYS_MEDICAL_INTERACTION_TARGET] call cse_fnc_getQuickViewLog_CMS;
- _counter = 0;
- lbclear 215;
- {
-
- //[_caller,_moment,_activity,_type]
- lbadd[215, _x select 1]; // moment
- lbadd[215, _x select 0]; // name, caller
- lbSetData [215,_counter,_x select 2];
- _counter = _counter + 1;
- }foreach _log;
- if (count _log < 1) then {
- lbadd[215, "No Data recorded.."];
- lbadd[215, ""];
- };
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_updateBodyImg_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_updateBodyImg_CMS.sqf
deleted file mode 100644
index 4b61cfacc3..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_updateBodyImg_CMS.sqf
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * fn_updateBodyImg_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit", "_interactionDialog", "_openWounds", "_part", "_total", "_amountOfWoundsSmall", "_amountOfWoundsMedium", "_amountOfWoundsLarge", "_bandagedWounds","_alphaLevel"];
-_openWounds = _this select 0;
-_bandagedWounds = _this select 1;
-
-disableSerialization;
-_interactionDialog = uiNamespace getvariable "cse_sys_medicalMenu";
-_colorCalculationsOpenWounds = {
- if (_total >0) then {
- _green = 0.9;
- _blue = 0.9;
- for [{_i = 0},{ _i < round(_total)},{ _i = _i +1;}] do {
- _green = _green - 0.75;
- _blue = _blue - 0.75;
- };
- if (_green < 0.0) then {
- _green = 0.0;
- _blue = 0.0;
- };
- _damaged set[_part,true];
- };
-};
-_alphaLevel = 1.0;
-_damaged = [false,false,false,false,false,false];
-_availableSelections = [50,51,52,53,54,55];
-_part = 0;
- {
- private ["_red", "_green", "_blue"];
- _amountOfWoundsSmall = (_x select 0);
- _amountOfWoundsMedium = (_x select 1);
- _amountOfWoundsLarge = (_x select 2);
- _total = (_amountOfWoundsSmall) + _amountOfWoundsMedium + (_amountOfWoundsLarge);
-
- _red = 1;
- _green = 1;
- _blue = 1;
- call _colorCalculationsOpenWounds;
- (_interactionDialog displayCtrl (_availableSelections select _part)) ctrlSetTextColor [_red,_green,_blue,_alphaLevel];
- _part = _part + 1;
- }foreach _openWounds;
-
- {
- if (!(_damaged select _foreachIndex)) then {
- _amountOfWoundsSmall = (_x select 0);
- _amountOfWoundsMedium = (_x select 1);
- _amountOfWoundsLarge = (_x select 2);
-
- _total = (_amountOfWoundsSmall) + _amountOfWoundsMedium + (_amountOfWoundsLarge);
- if (_total>0) then {
- private ["_red", "_green", "_blue"];
- _red = 1.0;
- _green = 0.7;
- _blue = 0.7;
- (_interactionDialog displayCtrl (_availableSelections select _foreachIndex)) ctrlSetTextColor [_red,_green,_blue,_alphaLevel];
- };
- };
- }foreach _bandagedWounds;
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_updateIcons_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_updateIcons_CMS.sqf
deleted file mode 100644
index 66d5ba34a7..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_updateIcons_CMS.sqf
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * fn_updateIcons_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_display","_startIDC","_idc","_options","_name","_amount"];
-disableSerialization;
-_display = uiNamespace getVariable 'cse_sys_medicalMenu';
-_startIDC = 111;
-
-_options = ["triage" , "examine", "bandage", "medication", "airway", "advanced", "drag", "toggle"];
-for "_idc" from _startIDC to 118 step 1 do
-{
- _name = _options select (_idc - 111);
- _amount = switch (_name) do {
- case "advanced": {[_name] call cse_fnc_getAdvancedOptions_CMS};
- case "examine": {[_name] call cse_fnc_getExamineOptions_CMS};
- case "bandage": {[_name] call cse_fnc_getBandageOptions_CMS};
- case "medication": {[_name] call cse_fnc_getMedicationOptions_CMS};
- case "airway": {[_name] call cse_fnc_getAirwayOptions_CMS};
- case "triage": {[_name] call cse_fnc_getTriageCardOptions_CMS};
- case "drag": {[_name] call cse_fnc_getDragOptions_CMS};
- case "toggle": {[_name] call cse_fnc_getToggleOptions_CMS};
- default {[]};
- };
- if ((count _amount) > 0 || _idc == 111 || _idc == 118) then {
- (_display displayCtrl _idc) ctrlSettextColor [1,1,1,1];
- } else {
- (_display displayCtrl _idc) ctrlSettextColor [0.4,0.4,0.4,1];
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/ui/fn_updateUIInfo_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/ui/fn_updateUIInfo_CMS.sqf
deleted file mode 100644
index fa5967549c..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/ui/fn_updateUIInfo_CMS.sqf
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * fn_updateUIInfo_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-
-private ["_targetObj","_bodyPartText","_bodyPartN","_openWounds","_bandagedWounds","_fractures","_listOfWounds","_listOfBandagedWounds","_listOfFractures","_counter","_nameEntry","_untreatedWounds" ,"_remainder", "_numberOf", "_airwayStatus", "_airwayTreated"];
-_targetObj = _this select 0;
-
-_bodyPartText = (call cse_fnc_getSelectedBodyPart_CMS);
-_bodyPartN = [_bodyPartText] call cse_fnc_getBodyPartNumber_CMS;
-
-if (_bodyPartN < 0 || _bodyPartN > 5) exitwith {};
-_openWounds = [_targetObj,"cse_openWounds"] call cse_fnc_getVariable;
-_bandagedWounds = [_targetObj,"cse_bandagedWounds"] call cse_fnc_getVariable;
-_fractures = [_targetObj,"cse_fractures"] call cse_fnc_getVariable;
-_airwayStatus = [_targetObj,"cse_airway"] call cse_fnc_getVariable;
-/*_openWounds = [_targetObj,"cse_openWounds"] call cse_fnc_getMonitoredVariableValue;
-_bandagedWounds = [_targetObj,"cse_bandagedWounds"] call cse_fnc_getMonitoredVariableValue;
-_fractures = [_targetObj,"cse_fractures"] call cse_fnc_getMonitoredVariableValue;*/
-
-if (count _this > 1) then {
- switch (_this select 1) do {
- case "cse_openWounds": { _openWounds = _this select 2; };
- case "cse_bandagedWounds": { _bandagedWounds = _this select 2; };
- case "cse_fractures": { _fractures = _this select 2; };
- };
-};
-
-[_openWounds,_bandagedWounds] spawn cse_fnc_updateBodyImg_CMS;
-_listOfWounds = _openWounds select _bodyPartN;
-_listOfBandagedWounds = _bandagedWounds select _bodyPartN;
-_listOfFractures = _fractures select _bodyPartN;
-
-// TODO collect all information first, then clear the lb and fill in with details. Also; use ctrl instead of IDC.
-_numberOf = 0;
-lbClear 213;
-
-_displayBodyPartText = switch (_bodyPartText) do {
- case "head": {
- localize "STR_CSE_UI_HEAD";
- };
- case "body": {
- localize "STR_CSE_UI_TORSO";
- };
- case "hand_r": {
- localize "STR_CSE_UI_ARM_R";
- };
- case "hand_l": {
- localize "STR_CSE_UI_ARM_L";
- };
- case "leg_r": {
- localize "STR_CSE_UI_LEG_R";
- };
- case "leg_l": {
- localize "STR_CSE_UI_LEG_L";
- };
- default {"-"};
-};
-
-
-lbadd[213,format[localize "STR_CSE_UI_SELECTED_BODY_PART",_displayBodyPartText]];
-lbSetData [213, _numberOf, ""];
-lbSetColor [213, _numberOf, [0.27, 0.40, 0.26, 1]];
-//[] spawn cse_fnc_updateActivityLog_CMS;
-_numberOf = _numberOf + 1;
-
-if (CSE_ALLOW_AIRWAY_INJURIES_CMS) then {
- _airwayTreated = _targetObj getvariable ["cse_airwayTreated", false];
-
- if (_airwayStatus > 0) then {
- _nameEntry = switch (_airwayStatus) do {
- case 0: {localize "STR_CSE_UI_NORMAL_BREATHING"};
- case 1: {localize "STR_CSE_UI_DIFFICULT_BREATHING"};
- case 2: {localize "STR_CSE_UI_ALMOST_NO_BREATHING"};
- default {localize "STR_CSE_UI_NO_BREATHING"};
- };
-
- if (!(alive _targetObj) || (_targetObj getvariable ["cse_isDead", false])) then {
- lbadd[213,format["%1",localize "STR_CSE_UI_NO_BREATHING"]];
- } else {
- lbadd[213,format["%1",_nameEntry]];
- };
- lbSetData [213, _numberOf, ""];
- _numberOf = _numberOf + 1;
- } else {
- if (!(alive _targetObj) || (_targetObj getvariable ["cse_isDead", false])) then {
- lbadd[213,format["%1",localize "STR_CSE_UI_NO_BREATHING"]];
- lbSetData [213, _numberOf, ""];
- _numberOf = _numberOf + 1;
- };
- };
-
- if (_airwayTreated) then {
- lbadd[213,localize "STR_CSE_UI_STATUS_NPA_APPLIED"];
- lbSetData [213, _numberOf, ""];
- lbSetColor [213, _numberOf, [0.5, 0.5, 0, 1]];
- _numberOf = _numberOf + 1;
- };
-};
-
-if (([_targetObj,"cse_isBleeding_CMS"] call cse_fnc_getVariable)) then {
- lbadd[213,localize "STR_CSE_UI_STATUS_BLEEDING"];
- lbSetData [213, _numberOf, ""];
- _numberOf = _numberOf + 1;
-};
-if (([_targetObj,"cse_hasLostBlood_CMS"] call cse_fnc_getVariable)) then {
- lbadd[213,localize "STR_CSE_UI_STATUS_LOST_BLOOD"];
- lbSetData [213, _numberOf, ""];
- _numberOf = _numberOf + 1;
-};
-
-if (([_targetObj,"cse_hasPain_CMS"] call cse_fnc_getVariable)) then {
- lbadd[213,localize "STR_CSE_UI_STATUS_PAIN"];
- lbSetData [213, _numberOf, ""];
- _numberOf = _numberOf + 1;
-};
-if (([_targetObj, _bodyPartText] call cse_fnc_hasTourniquetAppliedTo_CMS)) then {
- lbadd[213,localize "STR_CSE_UI_STATUS_TOURNIQUET_APPLIED"];
- lbSetColor [213, _numberOf, [0.5, 0.5, 0, 1]];
- lbSetData [213, _numberOf, ""];
- _numberOf = _numberOf + 1;
-};
-
-_counter = 0;
-{
- if (_x > 0) then {
-
- _untreatedWounds = floor _x;
- _remainder = _x - (floor _x);
-
- _nameEntry = switch (_counter) do {
- case 0: {localize "STR_CSE_UI_SMALL"};
- case 1: {localize "STR_CSE_UI_MEDIUM"};
- case 2: {localize "STR_CSE_UI_LARGE"};
- default {localize "STR_CSE_UI_SMALL"};
- };
-
- if (_untreatedWounds > 1) then {
- lbadd[213,format[localize "STR_CSE_UI_MULTIPLE_OPEN_WOUNDS",_nameEntry,_untreatedWounds]];
- lbSetData [213, _numberOf, format["open_wound_%1",_counter]];
- lbSetColor [213, _numberOf, [0.6, 0, 0, 1]];
- _numberOf = _numberOf + 1;
- } else {
- if (_untreatedWounds == 1) then {
- lbadd[213,format[localize "STR_CSE_UI_SINGLE_OPEN_WOUND",_nameEntry]];
- lbSetData [213, _numberOf, format["open_wound_%1",_counter]];
- lbSetColor [213, _numberOf, [0.6, 0, 0, 1]];
- _numberOf = _numberOf + 1;
- };
- };
-
- if (_remainder > 0) then {
- lbadd[213,format[localize "STR_CSE_UI_PARTIAL_OPEN_WOUND",_nameEntry]];
- lbSetData [213, _numberOf, format["open_wound_%1",_counter]];
- lbSetColor [213, _numberOf, [0.6, 0, 0, 1]];
- _numberOf = _numberOf + 1;
- };
- };
- _counter = _counter + 1;
-}foreach _listOfWounds;
-
-_counter = 0;
-{
- if (_x > 0) then {
-
- _untreatedWounds = floor _x;
- _remainder = _x - (floor _x);
-
- _nameEntry = switch (_counter) do {
- case 0: {localize "STR_CSE_UI_SMALL"};
- case 1: {localize "STR_CSE_UI_MEDIUM"};
- case 2: {localize "STR_CSE_UI_LARGE"};
- default {localize "STR_CSE_UI_SMALL"};
- };
-
- if (_untreatedWounds > 1) then {
- lbadd[213,format[localize "STR_CSE_UI_MULTIPLE_BANDAGED_WOUNDS",_nameEntry,_untreatedWounds]];
- lbSetData [213, _numberOf, format["bandaged_wound_%1",_counter]];
- _numberOf = _numberOf + 1;
- } else {
- if (_untreatedWounds == 1) then {
- lbadd[213,format[localize "STR_CSE_UI_SINGLE_BANDAGED_WOUND",_nameEntry]];
- lbSetData [213, _numberOf, format["bandaged_wound_%1",_counter]];
- _numberOf = _numberOf + 1;
- };
- };
-
- if (_remainder > 0) then {
- lbadd[213,format[localize "STR_CSE_UI_PARTIAL_BANDAGED_WOUND",_nameEntry]];
- lbSetData [213, _numberOf, format["bandaged_wound_%1",_counter]];
- _numberOf = _numberOf + 1;
- };
- };
- _counter = _counter + 1;
-}foreach _listOfBandagedWounds;
-
-_counter = 0;
-{
- if (_x > 0) then {
- _nameEntry = switch (_counter) do {
- case 0: {localize "STR_CSE_UI_SMALL"};
- case 1: {localize "STR_CSE_UI_MEDIUM"};
- case 2: {localize "STR_CSE_UI_LARGE"};
- default {localize "STR_CSE_UI_SMALL"};
- };
- lbadd[213,format["%1 Fracture x%2",_nameEntry,_x]];
- lbSetData [213, _numberOf, ""];
- _numberOf = _numberOf + 1;
- };
- _counter = _counter + 1;
-}foreach _listOfFractures;
-
diff --git a/TO_MERGE/cse/sys_medical/functions/vitals/fn_addHeartRateAdjustment_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/vitals/fn_addHeartRateAdjustment_CMS.sqf
deleted file mode 100644
index 15bc298b87..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/vitals/fn_addHeartRateAdjustment_CMS.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_addHeartRateAdjustment_CMS.sqf
- * @Descr: Increase the Heart Rate of a local unit by given number within given amount of seconds.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT, value NUMBER, time NUMBER (Amount of seconds), callBack CODE (Called when adjustment is completed)]
- * @Return: void
- * @PublicAPI: true
- */
-
-private ["_unit", "_value", "_time", "_adjustment", "_callBack"];
-_unit = [_this, 0, objNull, [objNull]] call BIS_fnc_Param;
-_value = [_this, 1, 0, [0]] call BIS_fnc_Param;
-_time = [_this, 2, 1, [0]] call BIS_fnc_Param;
-_callBack = [_this, 3, {}, [{}]] call BIS_fnc_Param;
-
-_adjustment = [_unit, "cse_heartRateAdjustments"] call cse_fnc_getVariable;
-_adjustment pushback [_value, _time, _callBack];
-_unit setvariable ["cse_heartRateAdjustments", _adjustment ];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/vitals/fn_getBloodPressure_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/vitals/fn_getBloodPressure_CMS.sqf
deleted file mode 100644
index cae57c32a5..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/vitals/fn_getBloodPressure_CMS.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * fn_getBloodPressure_CMS.sqf
- * @Descr: Calculate the current blood pressure of a unit.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT (The unit to get the blood pressure from.)]
- * @Return: ARRAY Blood Pressure. Format [low NUMBER, high NUMBER]
- * @PublicAPI: true
- */
-
-/*
- Value is taken because with cardic output and resistance at default values, it will put blood pressure High at 120.
-*/
-#define MODIFIER_BP_HIGH 0.229
-
-/*
- Value is taken because with cardic output and resistance at default values, it will put blood pressure Low at 80.
-*/
-#define MODIFIER_BP_LOW 0.1524
-
-private ["_unit", "_bloodPressureLow", "_bloodPressureHigh", "_cardiacOutput", "_resistance"];
-_unit = _this select 0;
-_cardiacOutput = [_unit] call cse_fnc_getCardiacOutput_CMS;
-_resistance = [_unit, "cse_peripheralResistance"] call cse_fnc_getVariable;
-
-_bloodPressureHigh = (_cardiacOutput * MODIFIER_BP_HIGH) * _resistance;
-_bloodPressureLow = (_cardiacOutput * MODIFIER_BP_LOW) * _resistance;
-
-[_bloodPressureLow, _bloodPressureHigh];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/vitals/fn_getBloodVolumeChange_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/vitals/fn_getBloodVolumeChange_CMS.sqf
deleted file mode 100644
index 241da785b9..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/vitals/fn_getBloodVolumeChange_CMS.sqf
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * fn_getBloodVolumeChange_CMS.sqf
- * @Descr: Calculates the blood volume change and decreases the IVs given to the unit.
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return: NUMBER Bloodvolume change
- * @PublicAPI: false
- */
-
-/*
- IV Change per second calculation:
- 250ml should take 60 seconds to fill. 250/60 = 4.166.
-*/
-#define IV_CHANGE_PER_SECOND -4.166
-
-/*
- Blood Change per second calculation for IVs:
- 250ml should take 60 seconds to fill in. Total blood volume is 7000ml = 100%.
- 7000/100 = 70 = 1%
- 250 / 70 = 3.571428571%
- 3.571428571 / 60 = 0.0595% per second.
-*/
-#define BLOOD_CHANGE_PER_SECOND 0.0595
-
-
-
-private ["_unit","_bloodVolume","_bloodVolumeChange", "_ivVolume"];
-_unit = _this select 0;
-
-_bloodVolume = _unit getvariable ["cse_bloodVolume", 100];
-_bloodVolumeChange = -(_unit call cse_fnc_getBloodLoss_CMS);
-
-if (_bloodVolume < 100.0) then {
- if ((_unit getvariable ["cse_salineIVVolume", 0]) > 0) then {
- _bloodVolumeChange = _bloodVolumeChange + BLOOD_CHANGE_PER_SECOND;
- _ivVolume = (_unit getvariable ["cse_salineIVVolume", 0]) + IV_CHANGE_PER_SECOND;
- _unit setvariable ["cse_salineIVVolume",_ivVolume];
- if (["cse_sys_field_rations"] call cse_fnc_isModuleEnabled_F) then {
- if ([_unit] call cse_fnc_canDrink_FR) then {
- _unit setvariable ["cse_drink_status_fr", (_unit getvariable ["cse_drink_status_fr", 100]) + 0.2];
- };
- };
- };
- if ((_unit getvariable ["cse_plasmaIVVolume", 0]) > 0) then {
- _bloodVolumeChange = _bloodVolumeChange + BLOOD_CHANGE_PER_SECOND;
- _ivVolume = (_unit getvariable ["cse_plasmaIVVolume", 0]) + IV_CHANGE_PER_SECOND;
- _unit setvariable ["cse_plasmaIVVolume",_ivVolume];
- };
- if ((_unit getvariable ["cse_bloodIVVolume", 0]) > 0) then {
- _bloodVolumeChange = _bloodVolumeChange + BLOOD_CHANGE_PER_SECOND;
- _ivVolume = (_unit getvariable ["cse_bloodIVVolume", 0]) + IV_CHANGE_PER_SECOND;
- _unit setvariable ["cse_bloodIVVolume",_ivVolume];
- };
-};
-
-_bloodVolumeChange
diff --git a/TO_MERGE/cse/sys_medical/functions/vitals/fn_getCardiacOutput_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/vitals/fn_getCardiacOutput_CMS.sqf
deleted file mode 100644
index 31abf63b5a..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/vitals/fn_getCardiacOutput_CMS.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * fn_getCardiacOutput_CMS.sqf
- * @Descr: Get the cardiac output from the Heart, based on current Heart Rate and Blood Volume.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: NUMBER Current cardiac output.
- * @PublicAPI: true
- */
-
-
-/*
- Cardiac output (Q or or CO ) is the volume of blood being pumped by the heart, in particular by a left or right ventricle in the time interval of one minute. CO may be measured in many ways, for example dm3/min (1 dm3 equals 1 litre).
-
- Source: http://en.wikipedia.org/wiki/Cardiac_output
-*/
-
-// to limit the amount of complex calculations necessary, we take a set modifier to calculate Stroke Volume.
-#define MODIFIER_CARDIAC_OUTPUT 19.04761
-
-private "_unit";
-_unit = _this select 0;
-
-((_unit getvariable ["cse_bloodVolume", 100])/MODIFIER_CARDIAC_OUTPUT) + ((_unit getvariable ["cse_heartRate", 80])/80-1);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/vitals/fn_getHeartRateChange_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/vitals/fn_getHeartRateChange_CMS.sqf
deleted file mode 100644
index 042a8de778..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/vitals/fn_getHeartRateChange_CMS.sqf
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * fn_getHeartRateChange_CMS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return: void
- * @PublicAPI: false
- */
-
-
-#define HEART_RATE_MODIFIER 0.02
-
-private ["_unit", "_heartRate", "_hrIncrease", "_bloodLoss", "_time", "_values", "_adjustment", "_adjustments", "_additionalIncrease", "_change", "_callBack", "_bloodVolume"];
-_unit = _this select 0;
-_hrIncrease = 0;
-if (!(_unit getvariable ["cse_cardiacArrest_CMS",false])) then {
- _heartRate = _unit getvariable ["cse_heartRate", 80];
- _bloodLoss = _unit call cse_fnc_getBloodLoss_CMS;
-
- _adjustment = _unit getvariable ["cse_heartRateAdjustments", []];
- {
- _values = (_x select 0);
- if (abs _values > 0) then {
- _time = (_x select 1);
- _callBack = _x select 2;
- if (_time <= 0) then {
- _time = 1;
- };
- _change = (_values / _time);
- _hrIncrease = _hrIncrease + _change;
-
- if ( (_time - 1) < 0) then {
- _time = 0;
- _adjustment set [_foreachIndex, ObjNull];
- [_unit] call _callBack;
- } else {
- _time = _time - 1;
- _adjustment set [_foreachIndex, [_values - _change, _time]];
- };
- } else {
- _adjustment set [_foreachIndex, ObjNull];
- };
-
- }foreach _adjustment;
- _adjustment = _adjustment - [ObjNull];
- _unit setvariable ["cse_heartRateAdjustments", _adjustment];
-
- _bloodVolume = _unit getvariable ["cse_bloodVolume", 100];
- if (_bloodVolume > 75) then {
- if (_bloodLoss >0.0) then {
- if (_bloodLoss <0.5) then {
- if (_heartRate < 126) then {
- _hrIncrease = _hrIncrease + 0.05;
- };
- } else {
- if (_bloodLoss < 1) then {
- if (_heartRate < 161) then {
- _hrIncrease = _hrIncrease + 0.1;
- };
- } else {
- if (_heartRate < 220) then {
- _hrIncrease = _hrIncrease + 0.15;
- };
- };
- };
- } else {
- // Stabalize it
- if (_heartRate < (60 + round(random(10)))) then {
- _hrIncrease = _hrIncrease + HEART_RATE_MODIFIER;
- } else {
- if (_heartRate > (77 + round(random(10)))) then {
- _hrIncrease = _hrIncrease - HEART_RATE_MODIFIER;
- };
- };
- };
- } else {
- _hrIncrease = _hrIncrease - HEART_RATE_MODIFIER;
- };
-};
-_hrIncrease
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/functions/vitals/fn_updateVitals_CMS.sqf b/TO_MERGE/cse/sys_medical/functions/vitals/fn_updateVitals_CMS.sqf
deleted file mode 100644
index 20762f44bc..0000000000
--- a/TO_MERGE/cse/sys_medical/functions/vitals/fn_updateVitals_CMS.sqf
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * fn_updateVitals_CMS.sqf
- * @Descr: Updates the vitals. Is expected to be called every second.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: void
- * @PublicAPI: false
- */
-
-private ["_unit", "_heartRate","_bloodPressure","_bloodVolume","_painStatus"];
-_unit = _this select 0;
-
-_heartRate = [_unit, "cse_heartRate"] call cse_fnc_getVariable;
-_bloodVolume = ([_unit, "cse_bloodVolume"] call cse_fnc_getVariable) + ([_unit] call cse_fnc_getBloodVolumeChange_CMS);
-_heartRate = _heartRate + ([_unit] call cse_fnc_getHeartRateChange_CMS);
-_bloodPressure = [_unit] call cse_fnc_getBloodPressure_CMS;
-_painStatus = [_unit,"cse_pain",0] call cse_fnc_getVariable;
-
-if (_bloodVolume <= 0) then {
- _bloodVolume = 0;
-};
-
-_unit setvariable ["cse_bloodVolume", _bloodVolume];
-_unit setvariable ["cse_bloodPressure", _bloodPressure];
-_unit setvariable ["cse_heartRate", _heartRate];
-
-if (_bloodVolume < 90) then {
- if !(_unit getvariable ["cse_hasLostBlood_CMS",false]) then {
- _unit setvariable ["cse_hasLostBlood_CMS", true, true];
- };
-} else {
- if (_unit getvariable ["cse_hasLostBlood_CMS",false]) then {
- _unit setvariable ["cse_hasLostBlood_CMS", false, true];
- };
-};
-
-if ((_unit call cse_fnc_getBloodLoss_CMS) > 0) then {
- if !(_unit getvariable ["cse_isBleeding_CMS",false]) then {
- _unit setvariable ["cse_isBleeding_CMS", true, true];
- };
-} else {
- if (_unit getvariable ["cse_isBleeding_CMS",false]) then {
- _unit setvariable ["cse_isBleeding_CMS", false, true];
- };
-};
-
-if (_painStatus > 0) then {
- if !(_unit getvariable ["cse_hasPain_CMS",false]) then {
- _unit setvariable ["cse_hasPain_CMS", true, true];
- };
-} else {
- if (_unit getvariable ["cse_hasPain_CMS",false]) then {
- _unit setvariable ["cse_hasPain_CMS", false, true];
- };
-};
-
-
-if (CSE_ALLOW_AIRWAY_INJURIES_CMS) then {
- _airwayStatus = _unit getvariable ["cse_airwayStatus", 100];
- if (((_unit getvariable ["cse_airwayOccluded", false]) || (_unit getvariable ["cse_airwayCollapsed", false])) && !((_unit getvariable ["cse_airwaySecured", false]))) then {
- if (_airwayStatus >= 0.5) then {
- _unit setvariable ["cse_airwayStatus", _airwayStatus - 0.5];
- };
- } else {
- if !((_unit getvariable ["cse_airwayOccluded", false]) || (_unit getvariable ["cse_airwayCollapsed", false])) then {
- if (_airwayStatus <= 98.5) then {
- _unit setvariable ["cse_airwayStatus", _airwayStatus + 1.5];
- };
- };
- };
-};
-
-[_unit,_bloodVolume,_bloodPressure,_heartRate] call cse_fnc_bloodConditions_CMS;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/init_UI_options.sqf b/TO_MERGE/cse/sys_medical/init_UI_options.sqf
deleted file mode 100644
index 6edeedfe97..0000000000
--- a/TO_MERGE/cse/sys_medical/init_UI_options.sqf
+++ /dev/null
@@ -1,150 +0,0 @@
- cse_get_basic_bandage_menus_CMS = {
- _subMenus = [];
- if (([player,'cse_bandage_basic'] call cse_fnc_hasMagazine)) then {
- _subMenus set [ count _subMenus,
- ["Bandage (Basic)",{([player,'cse_bandage_basic'] call cse_fnc_hasMagazine)},
- {
- [(_this select 1),player,"cse_bandage_basic"] spawn cse_fnc_basicBandage_CMS;
- }]
- ];
- };
- if (([player,'cse_quikclot'] call cse_fnc_hasMagazine)) then {
- _subMenus set [ count _subMenus,
- ["QuikClot",{([player,'cse_quikclot'] call cse_fnc_hasMagazine)},
- {
- [(_this select 1),player,"cse_quikclot"] spawn cse_fnc_basicBandage_CMS;
- }]
- ];
- };
- if (([player,'cse_bandageElastic'] call cse_fnc_hasMagazine)) then {
- _subMenus set [ count _subMenus,
- ["Bandage (Elastic)",{([player,'cse_bandageElastic'] call cse_fnc_hasMagazine)},
- {
- [(_this select 1),player,"cse_bandageElastic"] spawn cse_fnc_basicBandage_CMS;
- }]
- ];
- };
- if (([player,'cse_packing_bandage'] call cse_fnc_hasMagazine)) then {
- _subMenus set [ count _subMenus,
- ["Packing Bandage",{([player,'cse_packing_bandage'] call cse_fnc_hasMagazine)},
- {
- [(_this select 1),player,"cse_packing_bandage"] spawn cse_fnc_basicBandage_CMS;
- }]
- ];
- };
- if (([player,'cse_tourniquet'] call cse_fnc_hasMagazine)) then {
-
- };
-
- _subMenus
- };
- cse_display_basic_bandage_menus_CMS = {
- ["Bandage",_this select 2,call cse_get_basic_bandage_menus_CMS] call cse_fnc_gui_displaySubMenuButtons;
- };
- cse_display_basic_medication_menus_CMS = {
- _subMenus = [];
- if (([player,'cse_morphine'] call cse_fnc_hasMagazine)) then {
- _subMenus set [ count _subMenus,
- ["Morphine",{([player,'cse_morphine'] call cse_fnc_hasMagazine)},
- {
- [(_this select 1),player,"","cse_morphine"] spawn cse_fnc_medication_CMS;
- }]
- ];
- };
- if (([player,'cse_atropine'] call cse_fnc_hasMagazine)) then {
- _subMenus set [ count _subMenus,
- ["Atropine",{([player,'cse_atropine'] call cse_fnc_hasMagazine)},
- {
- [(_this select 1),player,"","cse_atropine"] spawn cse_fnc_medication_CMS;
- }]
- ];
- };
- if (([player,'cse_epinephrine'] call cse_fnc_hasMagazine)) then {
- _subMenus set [ count _subMenus,
- ["Epinephrine",{([player,'cse_epinephrine'] call cse_fnc_hasMagazine)},
- {
- [(_this select 1),player,"","cse_epinephrine"] spawn cse_fnc_medication_CMS;
- }]
- ];
- };
- ["Medication",_this select 2,_subMenus] call cse_fnc_gui_displaySubMenuButtons;
- };
-
-
-
-
- /*["InteractionMenu","Treatment > ",{((cursortarget iskindof "Man") && !(surfaceIsWater position player))},{
- _subMenus = [];
- if ((_this select 1) call cse_fnc_getBloodLoss_CMS > 0) then {
- hintSilent format["%1 is bleeding", [_this select 1] call cse_fnc_getName];
- };
- _subMenus set [ count _subMenus,
- ["Bandage >",{(isNull([player] call cse_fnc_getCarriedObj) && (count (call cse_get_basic_bandage_menus_CMS)) > 0)},
- {
- _this call cse_display_basic_bandage_menus_CMS;
- }]
- ];
- _subMenus set [ count _subMenus,
- ["Medication >",{(isNull([player] call cse_fnc_getCarriedObj))},
- {
- _this call cse_display_basic_medication_menus_CMS;
- }]
- ];
- ["Treatment",_this select 2,_subMenus] call cse_fnc_gui_displaySubMenuButtons;
- },1] call cse_fnc_gui_addMenuEntry;
-
-
- ["SelfInteraction","Treatment > ",{!(surfaceIsWater position player)},{
- _subMenus = [];
-
- if ((_this select 1) call cse_fnc_getBloodLoss_CMS > 0) then {
- hintSilent format["%1 is bleeding", [_this select 1] call cse_fnc_getName];
- };
-
- _subMenus set [ count _subMenus,
- ["Bandage >",{(isNull([player] call cse_fnc_getCarriedObj) && (count (call cse_get_basic_bandage_menus_CMS)) > 0)},
- {
- _this call cse_display_basic_bandage_menus_CMS;
- }]
- ];
- _subMenus set [ count _subMenus,
- ["Medication >",{(isNull([player] call cse_fnc_getCarriedObj))},
- {
- _this call cse_display_basic_medication_menus_CMS;
- }]
- ];
- ["Treatment",_this select 2,_subMenus] call cse_fnc_gui_displaySubMenuButtons;
- },1] call cse_fnc_gui_addMenuEntry;
-
- */
-
- ["InteractionMenu","Unload Casualties",{((_this call cse_fnc_interactWithVehicle_Crew_Condition) && (count ((_this select 1) getvariable ["cse_loaded_casualties_CMS",[]]) > 0))},
-{
- closeDialog 0;
- _loaded = ((_this select 1) getvariable ["cse_loaded_casualties_CMS",[]]);
- {
- [player,_x,false] call cse_fnc_unload_CMS;
- }foreach _loaded
-},1] call cse_fnc_gui_addMenuEntry;
-
-
-/*
-["InteractionMenu","Drag",{(isNull ([player] call cse_fnc_getCarriedObj))},
-{
- closeDialog 0;
- [_this select 1,_this select 0] call CSE_fnc_drag_CMS;
-},1] call cse_fnc_gui_addMenuEntry;
-
-
-["InteractionMenu","Carry",{(isNull ([player] call cse_fnc_getCarriedObj))},
-{
- closeDialog 0;
- [_this select 1,_this select 0] call cse_fnc_carry_CMS;
-},1] call cse_fnc_gui_addMenuEntry;
-
-
-["InteractionMenu","Drop",{!(isNull ([player] call cse_fnc_getCarriedObj))},
-{
- closeDialog 0;
- [_this select 1,_this select 0] call cse_fnc_drop_CMS;
-},1] call cse_fnc_gui_addMenuEntry;*/
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/init_basic_medical_system.sqf b/TO_MERGE/cse/sys_medical/init_basic_medical_system.sqf
deleted file mode 100644
index 8b4ee432d2..0000000000
--- a/TO_MERGE/cse/sys_medical/init_basic_medical_system.sqf
+++ /dev/null
@@ -1,7 +0,0 @@
-
- waituntil {!isnil "cse_fnc_registerUnconsciousCondition"};
-
- [
- {(([_this select 0,"cse_bloodVolume"] call cse_fnc_getVariable) < 60)},
- {(([_this select 0,"cse_pain"] call cse_fnc_getVariable) > 48)}
- ] call cse_fnc_registerUnconsciousCondition;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/init_sys_medical.sqf b/TO_MERGE/cse/sys_medical/init_sys_medical.sqf
deleted file mode 100644
index 703ba363af..0000000000
--- a/TO_MERGE/cse/sys_medical/init_sys_medical.sqf
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-init.sqf
-Usage:
-Author: Glowbal
-
-Arguments:
-Returns:
-
-Affects: Local
-Executes: call
-*/
-
-private ["_args"];
-_args = _this;
-
-CSE_ADVANCED_LEVEL_CMS = 2;
-CSE_ALLOW_INSTANT_DEAD_CMS = true;
-CSE_ADVANCED_WOUNDS_SETTING_CMS = true;
-CSE_ADVANCED_MEDICAL_ROLES_CMS = false;
-CSE_BANDAGING_AID_CMS = false;
-CSE_ALLOW_AI_FULL_HEAL_CMS = false;
-CSE_ALLOW_AIRWAY_INJURIES_CMS = false;
-CSE_AID_KIT_REMOVED_UPON_USAGE_CMS = false;
-CSE_ENABLE_SETTING_FORUNITS_CMS = 1;
-CSE_AID_KIT_RESTRICTIONS_CMS = 0;
-CSE_AIDKITMEDICSONLY_CMS = false;
-CSE_ALLOW_VEH_CRASH_INJURIES_CMS = true;
-CSE_STITCHING_ALLOW_CMS = 0;
-
-// damage thresholds only in case the damge threshold module hasn't been placed down.
-if (isnil "CSE_DAMAGE_THRESHOLD_AI_DMG") then {
- CSE_DAMAGE_THRESHOLD_AI_DMG = 1;
-};
-
-if (isnil "CSE_DAMAGE_THRESHOLD_PLAYERS_DMG") then {
- CSE_DAMAGE_THRESHOLD_PLAYERS_DMG = 1;
-};
-
-
-// TODO implement this into a switch structure.
-{
- _value = _x select 1;
- if (!isnil "_value") then {
- if (_x select 0 == "advancedLevel") exitwith {
- CSE_ADVANCED_LEVEL_CMS = _x select 1;
- };
- if (_x select 0 == "openingOfWounds") exitwith {
- CSE_ADVANCED_WOUNDS_SETTING_CMS = _x select 1;
- };
- if (_x select 0 == "medicSetting") exitwith {
- CSE_ADVANCED_MEDICAL_ROLES_CMS = _x select 1;
- };
- if (_x select 0 == "difficultySetting") exitwith {
- CSE_MEDICAL_DIFFICULTY = _x select 1;
- };
- if (_x select 0 == "bandagingAid") exitwith {
- CSE_BANDAGING_AID_CMS = _x select 1;
- };
- if (_x select 0 == "allowAIFullHeal") exitwith {
- CSE_ALLOW_AI_FULL_HEAL_CMS = _x select 1;
- };
- if (_x select 0 == "enableFor") exitwith {
- CSE_ENABLE_SETTING_FORUNITS_CMS = _x select 1;
- };
- if (_x select 0 == "enableAirway") exitwith {
- CSE_ALLOW_AIRWAY_INJURIES_CMS = (_x select 1) == 1;
- };
- if (_x select 0 == "aidKitRestrictions") exitwith {
- CSE_AID_KIT_RESTRICTIONS_CMS = _x select 1;
- };
- if (_x select 0 == "aidKitUponUsage") exitwith {
- CSE_AID_KIT_REMOVED_UPON_USAGE_CMS = _x select 1;
- };
- if (_x select 0 == "aidKitMedicsOnly") exitwith {
- CSE_AIDKITMEDICSONLY_CMS = _x select 1;
- };
- if (_x select 0 == "bandageTime") exitwith {
- CSE_BANDAGE_WAITING_TIME_CMS = _x select 1;
- };
- if (_x select 0 == "vehCrashes") exitwith {
- CSE_ALLOW_VEH_CRASH_INJURIES_CMS = _value;
- };
- if (_x select 0 == "stitchingMedicsOnly") exitwith {
- CSE_STITCHING_ALLOW_CMS = _value;
- };
- };
-}foreach _args;
-
-if (CSE_ADVANCED_LEVEL_CMS == -1) exitwith{};
-call compile preprocessFile "cse\cse_sys_medical\functions.sqf";
-CSE_SYS_MEDICAL_SYSTEM_ENABLED_TAGS = true;
-waituntil {!isnil "cse_main"};
-#include "variable_defines.sqf"
-
-
-[
- {(([_this select 0,"cse_heartRate"] call cse_fnc_getVariable) < 20)},
- {(([_this select 0,"cse_bloodVolume"] call cse_fnc_getVariable) < 65)},
- {(([_this select 0,"cse_pain"] call cse_fnc_getVariable) > 48)}
-] call cse_fnc_registerUnconsciousCondition;
-
-if (CSE_ALLOW_AIRWAY_INJURIES_CMS) then {
- [
- {(([_this select 0,"cse_airway"] call cse_fnc_getVariable) > 2)}
- ] call cse_fnc_registerUnconsciousCondition;
-};
-
-/*
-[
- {([_this select 0,"cse_cardiacArrest_CMS"] call cse_fnc_getVariable)}
-] call cse_fnc_registerUnconsciousCondition;
-*/
-
-cse_sys_medical = true;
-
-waituntil{!isnil "cse_gui"};
-#include "init_UI_options.sqf";
-#include "init_UI_actions.sqf";
-
-if (isnil "CSE_MEDICAL_COMBINED_LOOP_CMS") then {
- CSE_MEDICAL_COMBINED_LOOP_CMS = [];
-};
-
-waituntil{!isnil "cse_gui" && !isnil "cse_main"};
-cse_sys_medical_task_pool_CMS_lastTime = time;
-_cms_taskLoop = '
- if ((time - cse_sys_medical_task_pool_CMS_lastTime) >= 1 || true) then {
- cse_sys_medical_task_pool_CMS_lastTime = time;
- {
- if (!alive _x || !local _x) then {
- CSE_MEDICAL_COMBINED_LOOP_CMS set [ _forEachIndex, ObjNull];
- } else {
- [_x] call cse_fnc_updateVitals_CMS;
- _pain = _X getvariable ["cse_pain", 0];
- if (_pain > 5 && (random(1) > 0.5)) then {
- _x setvariable ["cse_pain", _pain + 0.002];
- };
- if (_pain > 45) then {
- if (random(1) > 0.6) then {
- [_X] call cse_fnc_setUnconsciousState;
- };
- [_X] spawn cse_fnc_playInjuredSound_CMS;
- };
- };
- }foreach CSE_MEDICAL_COMBINED_LOOP_CMS;
- CSE_MEDICAL_COMBINED_LOOP_CMS = CSE_MEDICAL_COMBINED_LOOP_CMS - [ObjNull];
- };
- false; ';
-
-cse_sys_medical_cms_taskLoop_trigger = createTrigger["EmptyDetector", [0,0,0]];
-cse_sys_medical_cms_taskLoop_trigger setTriggerActivation ["NONE", "PRESENT", true];
-cse_sys_medical_cms_taskLoop_trigger setTriggerStatements[_cms_taskLoop, "", ""];
-
-if (!hasInterface) exitwith{};
-[player] spawn {
- disableSerialization;
- _CMSFadingBlackUI = uiNamespace getVariable "CMSFadingBlackUI";
- if (!isnil "_CMSFadingBlackUI") then {
- _ctrlFadingBlackUI = _CMSFadingBlackUI displayCtrl 11112;
- 2 fadeSound 1;
- _ctrlFadingBlackUI ctrlSetTextColor [0.0,0.0,0.0,0.0];
- };
- {
- if(_x == "FirstAidKit" || {_x == "Medikit"}) then {
- player removeItem _x;
- };
- }foreach (items player);
- [_this select 0] spawn cse_fnc_effectsLoop_CMS;
-
-
- // This is here for backwards compatability. This code will be removed in the near future.
- _showError = false;
- {
- _configEntry = (configFile >> "CfgMagazines" >> _x);
- if([_configEntry, "cse_backwardsCompatMagazineBase_CMS"] call cse_fnc_inheritsFrom) then {
- player removeMagazine _x;
- player addItem _x;
- diag_log format["WARNING: Outdated CMS magazine classname %1 found. Please replace magazine by item variant. Future versions will not support this anymore.", _x];
- _showError = true;
- };
- }foreach (magazines player);
- if (_showError) then {
- ["Outdated CMS Classnames have been found. Please replace magazine classname by item variant. Future versions will not support magazine variant"] call BIS_fnc_error;
- };
-};
-CSE_DISPLAY_ADDITIONAL_HINTS_CMS = false;
-
-
-["cse_sys_medical_allowSharedEquipment", ["Disable", "Anyone", "Side Only", "Group Only"], (["cse_sys_medical_allowSharedEquipment", 0] call cse_fnc_getClientSideOptionFromProfile_F), {
- [_this] call cse_fnc_debug;
- switch (_this select 1) do {
- case (1): {player setvariable ["cse_allowSharedEquipmentAccess_CMS", 0, true]};
- case (2): {player setvariable ["cse_allowSharedEquipmentAccess_CMS", 1, true]};
- case (3): {player setvariable ["cse_allowSharedEquipmentAccess_CMS", 2, true]};
- default {player setvariable ["cse_allowSharedEquipmentAccess_CMS", -1, true]};
- };
-}] call cse_fnc_addClientSideOptions_f;
-
-["cse_sys_medical_allowSharedEquipment","option","Shared Medical Equipment","Set your access level for sharing medical equipment with other players."] call cse_fnc_settingsDefineDetails_F;
diff --git a/TO_MERGE/cse/sys_medical/init_ui_actions.sqf b/TO_MERGE/cse/sys_medical/init_ui_actions.sqf
deleted file mode 100644
index 4d14d356ac..0000000000
--- a/TO_MERGE/cse/sys_medical/init_ui_actions.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-CSE_ICON_PATH = "cse\cse_gui\radialmenu\data\icons\";
-
-_entries = [
- ["Medical (SELF)", {!([player] call cse_fnc_inWater_f)}, CSE_ICON_PATH + "icon_open_dialog.paa", {closeDialog 0; [player] call cse_fnc_openMenu_CMS; }, "Open Medical Menu (SELF)"],
- ["Medical", {((_this select 1) != (_this select 0)) && {(((_this select 0) distance (_this select 1) < 10) && {(_this select 1) isKindOf "CaManBase"} && {!([player] call cse_fnc_inWater_f)})}}, CSE_ICON_PATH + "icon_open_dialog.paa", {closeDialog 0; [_this select 1] call cse_fnc_openMenu_CMS; }, "Open Medical Menu"]
-];
-["ActionMenu","medical_menu", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
-_entries = [
- ["Unload (Cas)", {((_this call cse_fnc_interactWithVehicle_Crew_Condition) && (count ((_this select 1) getvariable ["cse_loaded_casualties_CMS",[]]) > 0))}, CSE_ICON_PATH + "icon_open_dialog.paa",
- {
- closeDialog 0;
- _loaded = ((_this select 1) getvariable ["cse_loaded_casualties_CMS",[]]);
- {
- [player,_x,false] call cse_fnc_unload_CMS;
- }foreach _loaded
- }, "Unload Casualties"]
-];
-["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
-_conditionDrag = {
- private ["_caller", "_unit", "_return"];
- _caller = _this select 0;
- _unit = _this select 1;
- _return = false;
- if (([_caller] call cse_fnc_canInteract) && {_caller != _unit} && {!([_unit] call cse_fnc_isAwake)}) then {
- if !([player] call cse_fnc_inWater_f) then {
- if (!isNull _unit) then {
- if (_unit != player && (_unit isKindOf "CaManBase")) then {
- if (vehicle _unit == _unit) then {
- if (vehicle _caller == _caller) then {
- if (isNull ([player] call cse_fnc_getCarriedObj)) then {
- _return = true;
- };
- };
- };
- };
- };
- };
- };
- _return
-};
-
-_entries = [
- ["Drag", _conditionDrag, CSE_ICON_PATH + "icon_hand.paa", {closeDialog 0; CSE_SYS_MEDICAL_INTERACTION_TARGET = _this select 1;[_this select 0, _this select 1] spawn CSE_fnc_drag_CMS; }, "Drag"],
- ["Carry", _conditionDrag, CSE_ICON_PATH + "icon_hand.paa", {closeDialog 0; CSE_SYS_MEDICAL_INTERACTION_TARGET = _this select 1; [_this select 0, _this select 1] spawn cse_fnc_carry_CMS; }, "Carry"],
- ["Drop", {(([player] call cse_fnc_getCarriedObj) == (_this select 1))}, CSE_ICON_PATH + "icon_hand.paa", {closeDialog 0; CSE_SYS_MEDICAL_INTERACTION_TARGET = _this select 1; [_this select 0, _this select 1] spawn cse_fnc_drop_CMS; }, "Drop"]
-];
-["ActionMenu","medical_menu", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/injuryTypes.h b/TO_MERGE/cse/sys_medical/injuryTypes.h
deleted file mode 100644
index 3ab27e2c74..0000000000
--- a/TO_MERGE/cse/sys_medical/injuryTypes.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#define NO_INJURY -1
-
-
-/* FLESH WOUNDS/BLEEDING INJURIES */
-#define SCRATCH 0
-#define MINOR_OPEN_WOUND 1
-#define MEDIUM_OPEN_WOUND 2
-#define LARGE_OPEN_WOUND 3
-#define MINOR_GSW 4
-#define MEDIUM_GSW 5
-#define LARGE_GSW 6
-#define STOMACH_WOUND 7
-#define SCHRAPNEL_WOUND 8
-#define GRAZE_WOUND 9
-#define MINOR_CUT 10
-#define MEDIUM_CUT 11
-#define LARGE_CUT 12
-#define MISSING_FLESH 13
-#define EXPLOSION_WOUND 14
-
-/* BURN INJURIES */
-#define MINOR_BURN 40
-#define MEDIUM_BURN 41
-#define HIGH_BURN 42
-
-/* INTERNAL BLEEDING */
-#define MINOR_INTERNAL_BLEEDING 50
-#define MEDIUM_INTERNAL_BLEEDING 51
-#define HEAVY_INTERNAL_BLEEDING 52
-
-/* BROKEN BONES */
-#define BROKEN_BONE_FEMUR 80
-#define BROKEN_BONE_TIBIA 81
-#define BROKEN_BONE_HUMERUS 82
-#define BROKEN_BONE_RADIAL 83
-#define BROKEN_BONE_SKULL 84
-#define BROKEN_RIB 85
-#define SHATTERED_NECK_BONE 86
-#define BROKEN_C_SPINE 87
-
-/* AIRWAY INJURIES */
-#define TENSION_PNEUMOTHORA 200
-#define SIMPLE_PNEUMOTHORA 201
-#define HEMOTHORAX 202
-#define AIRWAY_OBSTRUCTION_PARTIAL 205
-#define AIRWAY_OBSTRUCTION_FULL 204
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_1.wav b/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_1.wav
deleted file mode 100644
index 4ac1fe6c7d..0000000000
Binary files a/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_1.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_2.wav b/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_2.wav
deleted file mode 100644
index 38bae9cb2a..0000000000
Binary files a/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_2.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_3.wav b/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_3.wav
deleted file mode 100644
index f600d30567..0000000000
Binary files a/TO_MERGE/cse/sys_medical/sounds/heart_beats/fast_3.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/sounds/heart_beats/norm_1.wav b/TO_MERGE/cse/sys_medical/sounds/heart_beats/norm_1.wav
deleted file mode 100644
index 73ebe128d6..0000000000
Binary files a/TO_MERGE/cse/sys_medical/sounds/heart_beats/norm_1.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/sounds/heart_beats/norm_2.wav b/TO_MERGE/cse/sys_medical/sounds/heart_beats/norm_2.wav
deleted file mode 100644
index c46da91489..0000000000
Binary files a/TO_MERGE/cse/sys_medical/sounds/heart_beats/norm_2.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/sounds/heart_beats/slow_1.wav b/TO_MERGE/cse/sys_medical/sounds/heart_beats/slow_1.wav
deleted file mode 100644
index 3cf199ba51..0000000000
Binary files a/TO_MERGE/cse/sys_medical/sounds/heart_beats/slow_1.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/sounds/heart_beats/slow_2.wav b/TO_MERGE/cse/sys_medical/sounds/heart_beats/slow_2.wav
deleted file mode 100644
index ba50746326..0000000000
Binary files a/TO_MERGE/cse/sys_medical/sounds/heart_beats/slow_2.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/stringtable.xml b/TO_MERGE/cse/sys_medical/stringtable.xml
deleted file mode 100644
index ce6928d06f..0000000000
--- a/TO_MERGE/cse/sys_medical/stringtable.xml
+++ /dev/null
@@ -1,1422 +0,0 @@
-
-
-
-
-
- Open Combat Medical System Menu
- Открыть меню медицинской системы CMS
- Otwórz menu Combat Medical System
- Abrir Menú CMS
-
-
- Opens the CMS menu
- Открывает меню CMS
- Otwiera menu CMS
- Abre el Menú CMS
-
-
-
-
- Nasopharyngeal Tube
- Назотрахеальная трубка
- Cánula Nasofaríngea
- Canule Nasopharyngée
- Rurka nosowo-gardłowa
-
-
- Used to keep the airway patent
- Для обеспечения проходимости дыхательных путей
- Mantiene libre las vías aéreas
- Maintien les voix respiratoires libres
- Używana w celu udrożnienia dróg oddechowych
-
-
- Remove Nasopharyngeal
- Извлечь назотрахеальную трубку
- Retirar Cánula Nasofaríngea
- Retirer la Canule Nasopharyngée
- Wyjmij rurkę nosowo-gardłową
-
-
- Remove the Nasopharyngeal Tube
- Извлечь назотрахеальную трубку
- Retirar Cánula Nasofaríngea
- Retirer la Canule Nasopharyngée
- Wyjmuje rurkę nosowo-gardłową
-
-
-
-
- Give Blood IV (1000ml)
- Перелить кровь (1000 мл)
- Give Blood IV (1000ml)
- Intravenöse Blutspende (1000ml)
- Sangre Intravenosa (1000ml)
- Cullot Sanguin IV (1000ml)
- Podaj krew IV (1000ml)
-
-
- Give Blood IV (500ml)
- Перелить кровь (500 мл)
- Give Blood IV (500ml)
- Intravenöse Blutspende (500ml)
- Sangre Intravenosa (500ml)
- Cullot Sanguin IV (500ml)
- Podaj krew IV (500ml)
-
-
- Give Blood IV (250ml)
- Перелить кровь (250 мл)
- Give Blood IV (250ml)
- Intravenöse Blutspende (250ml)
- Sangre Intravenosa (250ml)
- Cullot Sanguin IV (250ml)
- Podaj krew IV (250ml)
-
-
- Give Plasma IV (1000ml)
- Влить плазму (1000 мл)
- Give Plasma IV (1000ml)
- Intravenöse Plasmaspende (1000ml)
- Plasma Intravenoso (1000ml)
- Plasma Sanguin IV (1000ml)
- Podaj osocze IV (1000ml)
-
-
- Give Plasma IV (500ml)
- Влить плазму (500 мл)
- Give Plasma IV (500ml)
- Intravenöse Plasmaspende (500ml)
- Plasma Intravenoso (500ml)
- Plasma Sanguin IV (500ml)
- Podaj osocze IV (500ml)
-
-
- Give Plasma IV (250ml)
- Влить плазму (250 мл)
- Give Plasma IV (250ml)
- Intravenöse Plasmaspende (250ml)
- Plasma Intravenoso (250ml)
- Plasma Sanguin IV (250ml)
- Podaj osocze IV (250ml)
-
-
- Give Saline IV (1000ml)
- Влить физраствор (1000 мл)
- Give Saline IV (1000ml)
- Intravenöse Kochsalzlösung (1000ml)
- Solución Salina Intravenosa (1000ml)
- Solution Saline 0.9% IV (1000ml)
- Podaj solankę 0,9% IV (1000ml)
-
-
- Give Saline IV (500ml)
- Влить физраствор (500 мл)
- Give Saline IV (500ml)
- Intravenöse Kochsalzlösung (500ml)
- Solución Salina Intravenosa (500ml)
- Solution Saline 0.9% IV (500ml)
- Podaj solankę 0,9% IV (500ml)
-
-
- Give Saline IV (250ml)
- Влить физраствор (250 мл)
- Give Saline IV (250ml)
- Intravenöse Kochsalzlösung (250ml)
- Solución Salina Intravenosa (250ml)
- Solution Saline 0.9% IV (250ml)
- Podaj solankę 0,9% IV (250ml)
-
-
- Full Heal (Personal Aid Kit)
- Полное лечение (аптечка)
- Full Heal (Personal Aid Kit)
- Ambulante Versorgung (Erste-Hilfe-Tasche)
- Tratamiento Avanzado (Kit de Soporte Vital Avanzado)
- Soin Complet (Équipement de support vitale
- Pełne leczenie (Apteczka)
-
-
- Perform CPR
- Провести СЛР
- Perform CPR
- Herz-Lungen-Wiederbelebung
- Realizar CPR
- Effectuer RCR
- Wykonaj RKO
-
-
- Stop CPR
- Прекратить СЛР
- Stop CPR
- Przerwij RKO
- Abortar CPR
-
-
- Give the patient a Blood IV of 1000ml. Read the label for further information.
- Перелить пациенту 1000 мл крови. См. информацию на этикетке.
- Give the patient a Blood IV of 1000ml. Read the label for further information.
- Verabreicht dem Patienten 1000ml Spenderblut. Weitere Informationen auf der Verpackung.
- Administrar Sangre de 1000ml. Lea la etiqueta para más información.
- Administrer Cullot Sanguin de 1000ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 1000ml krwi dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Give the patient a Blood IV of 500ml. Read the label for further information.
- Перелить пациенту 500 мл крови. См. информацию на этикетке.
- Give the patient a Blood IV of 500ml. Read the label for further information.
- Verabreicht dem Patienten 500ml Spenderblut. Weitere Informationen auf der Verpackung.
- Administrar Sangre de 500ml. Lea la etiqueta para más información.
- Administrer Cullot Sanguin de 500ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 500ml krwi dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Give the patient a Blood IV of 250ml. Read the label for further information.
- Перелить раненому 500 мл крови. См. информацию на этикетке.
- Give the patient a Blood IV of 250ml. Read the label for further information.
- Verabreicht dem Patienten 250ml Spenderblut. Weitere Informationen auf der Verpackung.
- Administrar Sangre de 250ml. Lea la etiqueta para más información.
- Administrer Cullot Sanguin de 250ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 250ml krwi dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Give the patient a Plasma IV of 1000ml. Read the label for further information.
- Влить раненому 1000 мл плазмы. См. информацию на этикетке.
- Give the patient a Plasma IV of 1000ml. Read the label for further information.
- Verabreicht dem Patienten 1000ml Blutplasma. Weitere Informationen auf der Verpackung.
- Administrar Plasma de 1000ml. Lea la etiqueta para más información.
- Administrer Plasma Sanguin de 1000ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 1000ml osocza dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Give the patient a Plasma IV of 500ml. Read the label for further information.
- Влить раненому 500 мл плазмы. См. информацию на этикетке.
- Give the patient a Plasma IV of 500ml. Read the label for further information.
- Verabreicht dem Patienten 500ml Blutplasma. Weitere Informationen auf der Verpackung.
- Administrar Plasma de 500ml. Lea la etiqueta para más información.
- Administrer Plasma Sanguin de 500ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 500ml osocza dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Give the patient a Plasma IV of 250ml. Read the label for further information.
- Влить раненому 250 мл плазмы. См. информацию на этикетке.
- Give the patient a Plasma IV of 250ml. Read the label for further information.
- Verabreicht dem Patienten 250ml Blutplasma. Weitere Informationen auf der Verpackung.
- Administrar Plasma de 250ml. Lea la etiqueta para más información.
- Administrer Plasma Sanguin de 250ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 250ml osocza dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Give the patient a Saline IV of 1000ml. Read the label for further information.
- Влить раненому 1000 мл физраствора. См. информацию на этикетке.
- Give the patient a Saline IV of 1000ml. Read the label for further information.
- Verabreicht dem Patienten 1000ml Kochsalzlösung. Weitere Informationen auf der Verpackung.
- Administrar Solución Salina de 1000ml. Lea la etiqueta para más información.
- Administrer Solution Saline 0.9% de 1000ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 1000ml 0,9% roztworu soli fizjologicznej dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Give the patient a Saline IV of 500ml. Read the label for further information.
- Влить раненому 500 мл физраствора. См. информацию на этикетке.
- Give the patient a Saline IV of 500ml. Read the label for further information.
- Verabreicht dem Patienten 500ml Kochsalzlösung. Weitere Informationen auf der Verpackung.
- Administrar Solución Salina de 500ml. Lea la etiqueta para más información.
- Administrer Solution Saline 0.9% de 500ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 500ml 0,9% roztworu soli fizjologicznej dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Give the patient a Saline IV of 250ml. Read the label for further information.
- Влить раненому 250 мл физраствора. См. информацию на этикетке.
- Give the patient a Saline IV of 250ml. Read the label for further information.
- Verabreicht dem Patienten 250ml Kochsalzlösung. Weitere Informationen auf der Verpackung.
- Administrar Solución Salina de 250ml. Lea la etiqueta para más información.
- Administrer Solution Saline 0.9% de 250ml. Lire l'étiquette pour plus d'information.
- Przetacza pacjentowi 250ml 0,9% roztworu soli fizjologicznej dożylnie (IV). Przeczytaj etykietę, aby dowiedzieć się więcej.
-
-
- Fully heal a soldier.
- Полностью вылечить раненого.
- Fully heal a soldier.
- Heilt einen Soldaten vollständig.
- Curar completamente al herido.
- Soigner Complêtement le Soldat.
- Pozwala w pełni wyleczyć pacjenta.
-
-
- Perform CPR. Success can stabilize heart rate and blood pressure.
- Провести сердечно-легочную реанимацию. В случае успеха стабилизируются пульс и давление.
- Perform CPR. Success can stabilize heart rate and blood pressure.
- Herz-Lungen-Wiederbelebung, bei Erfolg können sich Puls und Blutdruck stabilisieren.
- Realizar CPR. Puede estabilizar la frecuencia cardiaca y la presión arterial.
- Effectuer RCR. Le succes de la maneuvre peut retablir un pouls et une tention artériel.
- Wykonaj RKO. Sukces może ustabilizować puls oraz ciśnienie krwi.
-
-
- Stop providing CPR.
- Прекратить сердечно-легочную реанимацию.
- Stop providing CPR.
- Przerwij wykonywanie RKO.
- Dejar de aplicar CPR
-
-
- Stitch Wounds.
- Зашить раны.
- Suturar Heridas
-
-
- Stitch bandaged wounds.
- Зашить перевязанные раны.
- Suturar Heridas Vendadas
-
-
-
-
- Field Dressing (Basic)
- Повязка (обычная)
- Vendaje de Campaña (Básico)
-
-
-
- Apply when wounds have been bandaged
- Накладывается после остановки кровотечения
- Aplicar cuando las heridas han sido vendadas
-
-
- Field Dressing (QuikClot)
- Первичный перевязочный пакет (QuikClot)
- Vendaje de Campaña (QuikClot)
-
-
- Apply to cloth the wound and stop bleeding
- Применяется для остановки кровотечения
- Aplicar para detener el sangrado
-
-
- Field Dressing (Elastic)
- Повязка (давящая)
- Vendaje de Campaña (Elástico)
-
-
- For extra pressure, apply when wounds have been bandaged
- Обеспечивает прижатие раны после остановки кровотечения
- Aplicar a las heridas vendadas para más presión
-
-
- Packing Bandage
- Тампонирующая повязка
- Vendaje Compresivo
-
-
- Apply on medium to large wounds
- Применяется при ранениях среднего и большого размера
- Aplicar en heridas medianas o grandes
-
-
- Remove Tourniquet
- Снять жгут
- Quitar Torniquete
-
-
- Remove applied Tourniquet
- Снять ранее наложенный жгут
- Quitar Torniquetes
-
-
- Tourniquet
- Жгут
- Torniquete
-
-
- Apply on limbs only. Limits blood loss on limb.
- Накладывается только на конечности. Ограничивает кровопотерю из конечности.
- Aplicar sólo en las extremidades. Limita la pérdida de sangre en las extremidades.
-
-
-
-
- Drag
- Тащить
- Arrastrar
-
-
- Drag %1
- Тащить раненого %1
- Arrastrar a %1r
-
-
- Carry
- Нести
- Cargar
-
-
- Carry %1
- Нести раненого %1
- Cargar a %1
-
-
- Bodybag
- Мешок для трупов
- Bolsa para cadáveres
-
-
- Put body in bodybag
- Поместить труп в мешок
- Meter cuerpo en la bolsa para cadáveres
-
-
- Drop
- Положить
- Soltar
-
-
- Drop %1
- Положить %1
- Soltar a %1
-
-
- Load in Vehicle
- Погрузить в транспорт
- Meter en vehículo
-
-
- Load %1
- Погрузить раненого %1
- Cargar a %1
-
-
- Unload
- Выгрузить
- Descargar
-
-
- Unload %1
- Выгрузить раненого %1
- Descargar a %1
-
-
-
-
- Check Pulse
- Проверить пульс
- Comprobar Pulso
-
-
- Find the Heart Rate
- Нащупать пульс
- Encontrar el ritmo cardiaco
-
-
- Check Blood Pressure
- Проверить давление
- Comprobar Presión Arterial
-
-
- Find out what Blood Pressure patient has
- Узнать артериальное давление раненого
- Comprobar Presión Arterial
-
-
- Check Response
- Проверить реакцию
- Comprobar Respuesta
-
-
-
- Check if patient is responsive
- Проверить, реагирует ли раненый на раздражители
- Comprobar si el paciente reacciona
-
-
-
-
- Morphine
- Морфин
- Morfina
-
-
- Good to counter pain
- Эффективное обезболивающее средство
- Alivia el dolor
-
-
- Atropine
- Атропин
- Atropina
-
-
- Relaxes mussles
- Расслабляет мышцы
- Antiarrítmico
-
-
- Epinephrine
- Адреналин
- Epinefrina
-
-
- Adrenaline to get the heart going
- Для возобновления сердечной деятельности
- Incrementa la frecuencia cardiaca
-
-
-
-
- EXAMINE & TREATMENT
- ОСМОТР И ЛЕЧЕНИЕ
- EXAMINE & TREATMENT
- EXAMINAR & TRATAMIENTO
- EXAMINER & TRAITEMENTS
- BADANIE & LECZENIE
-
-
- STATUS
- СОСТОЯНИЕ
- STATUS
- ESTADO
- ÉTATS
- STATUS
-
-
- OVERVIEW
- ОБЩАЯ ИНФОРМАЦИЯ
- OVERVIEW
- DESCRIPCIÓN
- DESCRIPTION
- OPIS
-
-
- ACTIVITY LOG
- ПРОВЕДЕННЫЕ МАНИПУЛЯЦИИ
- ACTIVITY LOG
- REGISTRO DE ACTIVIDAD
- REGISTRE DES SOINS
- LOGI AKTYWNOŚCI
-
-
- QUICK VIEW
- БЫСТРЫЙ ОСМОТР
- QUICK VIEW
- VISTA RÁPIDA
- VUE RAPIDE
- SZYBKI PODGLĄD
-
-
- None
- Не ранен
- Ninguno
- Aucun
- Brak
-
-
- Minor
- Несрочная помощь
- Menor
- Mineur
- Normalny
-
-
- Delayed
- Срочная помощь
- Diferido
- Urgent
- Opóźniony
-
-
- Immediate
- Неотложная помощь
- Inmediato
- Immédiat
- Natychmiastowy
-
-
- Deceased
- Морг
- Fallecido
- Décédé
- Nie żyje
-
-
- View triage Card
- Смотреть первичную карточку
- Ver Triage
- Voir Carte de Triage
- Pokaż kartę segregacyjną
-
-
- Examine Patient
- Осмотреть пациента
- Examinar Paciente
- Examiner Patient
- Zbadaj pacjenta
-
-
- Bandage / Fractures
- Раны / переломы
- Vendajes/Fracturas
- Bandages / Fractures
- Bandaże / Złamania
-
-
- Medication
- Медикаменты
- Medicación
- Médications
- Leki
-
-
- Airway Management
- Дыхательные пути
- Vías Aéreas
- Gestion Des Voie REspiratoire
- Drogi oddechowe
-
-
- Advanced Treatments
- Специальная медпомощь
- Tratamientos Avanzados
- Traitement Avancé
- Zaawansowane zabiegi
-
-
- Drag/Carry
- Тащить/нести
- Arrastrar/Cargar
- Glisser/Porter
- Ciągnij/Nieś
-
-
- Toggle (Self)
- Лечить себя/другого раненого
- Activer (sois)
- Przełącz (na siebie)
- Alternar
-
-
- Select triage status
- Сортировка
- Seleccionar estado de Triage
- Selectioner l'état de Triage
- Wybierz priorytet
-
-
- Select Head
- Выбрать голову
- Seleccionar Cabeza
- Selectioner Tête
- Wybierz głowę
-
-
- Select Torso
- Выбрать торс
- Seleccionar Torso
- Selectioner Torse
- Wybierz tors
-
-
- Select Left Arm
- Выбрать левую руку
- Seleccionar Brazo Izquierdo
- Selectioner Bras Gauche
- Wybierz lewą rękę
-
-
- Select Right Arm
- Выбрать правую руку
- Seleccionar Brazo Derecho
- Selectioner Bras Droit
- Wybierz prawą rękę
-
-
- Select Left Leg
- Выбрать левую ногу
- Seleccionar Pierna Izquierda
- Selectioner Jambe Gauche
- Wybierz lewą nogę
-
-
- Select Right Leg
- Выбрать правую ногу
- Seleccionar Pierna Derecha
- Selectioner Jambe Droite
- Wybierz prawą nogę
-
-
- Head
- Голова
- Cabeza
- Tête
- Głowa
-
-
- Torso
- Торс
- Torse
- Tors
-
-
- Left Arm
- Левая рука
- Brazo Izquierdo
- Bras Gauche
- Lewa ręka
-
-
- Right Arm
- Правая рука
- Brazo Derecho
- Bras Droit
- Prawa ręka
-
-
- Left Leg
- Левая нога
- Pierna Izquierda
- Jambe Gauche
- Lewa noga
-
-
- Right Leg
- Правая нога
- Pierna Derecha
- Jambe Droite
- Prawa noga
-
-
- Body Part: %1
- Часть тела: %1
- Parte del cuerpo: %1
- Partie du corps: %1
- Część ciała: %1
-
-
- Small
- малого размера
- Pequeña
- Petite
- małym
-
-
- Medium
- среднего размера
- Mediana
- moyenne
- średnim
-
-
- Large
- большого размера
- Grande
- Grande
- dużym
-
-
- There are %2 %1 Open Wounds
- %2 открытые раны %1
- Hay %2 Heridas Abiertas %1
- Il y a %2 %1 Blessure Ouverte
- Widzisz otwarte rany w ilości %2 o %1 rozmiarze
-
-
- There is 1 %1 Open Wound
- Открытая рана %1
- Hay 1 Herida Abierta %1
- Il y a 1 blessure ouverte %1
- Widzisz 1 otwartą ranę o %1 rozmiarze
-
-
- There is a partial %1 Open wound
- Частично открытая рана %1
- Hay una herida parcial abierta %1
- Il y a une Blessure Patiellement Ouverte %1
- Widzisz częściowo otwartą ranę o %1 rozmiarze
-
-
- There are %2 %1 Bandaged Wounds
- %2 перевязанные раны %1
- Hay %2 Heridas %1 Vendadas
- Il y a %2 %1 Blessure Bandée
- Widzisz %2 zabandażowanych ran o %1 rozmiarze
-
-
- There is 1 %1 Bandaged Wound
- 1 перевязанная рана %1
- Hay 1 Herida Vendada %1
- Il y a 1 %1 Blessure Bandée
- Widzisz 1 zabandażowaną ranę o %1 rozmiarze
-
-
- There is a partial %1 Bandaged wound
- Частично перевязанная рана %1
- Hay una Herida parcial %1 Vendada
- Il y a %1 Blessure Partielment Bandée
- Widzisz 1 częściowo zabandażowaną ranę o %1 rozmiarze
-
-
- Normal breathing
- Дыхание в норме
- Respiración normal
- Respiration Normale
- Normalny oddech
-
-
- No breathing
- Дыхания нет
- No respira
- Apnée
- Brak oddechu
-
-
- Difficult breathing
- Дыхание затруднено
- Dificultad para respirar
- Difficultée Respiratoire
- Trudności z oddychaniem
-
-
- Almost no breathing
- Дыхания почти нет
- Casi sin respirar
- Respiration Faible
- Prawie brak oddechu
-
-
- Bleeding
- Кровотечение
- Sangrando
- Seignement
- Krwawienie zewnętrzne
-
-
- in Pain
- Испытывает боль
- Con Dolor
- A De La Douleur
- W bólu
-
-
- Lost a lot of Blood
- Большая кровопотеря
- Mucha Sangre perdida
- A Perdu Bcp de Sang
- Stracił dużo krwi
-
-
- Tourniquet [CAT]
- Жгут
- Torniquete [CAT]
- Garot [CAT]
- Opaska uciskowa [CAT]
-
-
- Nasopharyngeal Tube [NPA]
- Назотрахеальная трубка
- Torniquete [CAT]
- Canule Naseaupharyngée [NPA]
- Rurka nosowo-gardłowa [NPA]
-
-
-
-
- Bandage (Basic)
- Повязка (обычная)
- Vendaje (Básico)
- Bandage (Standard)
- Bandaż (jałowy)
-
-
- Used to cover a wound
- Для перевязки ран
- Utilizado para cubrir una herida
- Utilisé Pour Couvrir Une Blessure
- Używany w celu przykrycia i ochrony miejsca zranienia
-
-
- A dressing, that is a particular material used to cover a wound, which is applied over the wound once bleeding has been stemmed.
- Повязка, накладываемая поверх раны после остановки кровотечения.
- Un apósito, material específico utilizado para cubrir una herida, se aplica sobre la herida una vez ha dejado de sangrar.
- C'est un bandage, qui est fait d'un matériel spécial utiliser pour couvrir une blessure, qui peut etre appliquer des que le seignement as ete stopper.
- Opatrunek materiałowy, używany do przykrywania ran, zakładany na ranę po zatamowaniu krwawienia.
-
-
- Packing Bandage
- Тампонирующая повязка
- Vendaje Compresivo
- Bandage Mèche
- Bandaż (uciskowy)
-
-
- Used to pack medium to large wounds and stem the bleeding
- Для тампонирования ран среднего и большого размера и остановки кровотечения.
- Se utiliza para vendar heridas medianas y grandes y detener el sangrado
- Utiliser pour remplire la cavité créé dans une blessure moyenne et grande.
- Używany w celu opatrywania średnich i dużych ran oraz tamowania krwawienia.
-
-
- A bandage used to pack the wound to stem bleeding and facilitate wound healing. Packing a wound is an option in large polytrauma injuries.
- Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжелых сочетанных ранениях возможно тампонирование раны.
- Se utiliza para detener la hemorragia de una herida y favorecer su cicatrización. Se usa en grandes lesiones o politraumatismos.
- Un bandage servent a etre inseré dans les blessure pour éponger le seignement et faciliter la guerrison. Ce bandage est une option pour soigner les lession de politrauma.
- Opatrunek stosowany w celu zatrzymania krwawienia i osłony większych ran.
-
-
- Bandage (Elastic)
- Повязка (давящая)
- Vendaje (Elástico)
- Bandage (Élastique)
- Bandaż (elastyczny)
-
-
- Bandage kit, Elastic
- Давящая повязка
- Vendaje (Elástico)
- Bandage Compressif Élastique
- Zestaw bandaży elastycznych.
-
-
-
-
- Ce bandage peut etre utiliser pour compresser la plaie afin de ralentire le seignement et assurer la tenue du bandage lors de mouvment.
- Elastyczna opaska podtrzymująca opatrunek oraz usztywniająca okolice stawów.
- Brinda una compresión uniforme y ofrece soporte extra a una zona lesionada
-
-
- Tourniquet (CAT)
- Жгут
- Torniquete (CAT)
- Garot (CAT)
- Staza (typ. CAT)
-
-
- Slows down blood loss when bleeding
- Уменьшает кровопотерю при кровотечении.
- Reduce la velocidad de pérdida de sangre
- Ralentit le seignement
- Zmniejsza ubytek krwi z kończyn w przypadku krwawienia.
-
-
- A constricting device used to compress venous and arterial circulation in effect inhibiting or slowing blood flow and therefore decreasing loss of blood.
- Жгут используется для прижатия сосудов, приводящего к остановке или значительному уменьшению кровотечения и сокращению кровопотери.
- Dispositivo utilizado para eliminar el pulso distal y de ese modo controlar la pérdida de sangre
- Un appareil servent a compresser les artères et veines afin de reduire la perte de sang.
- Opaska zaciskowa CAT służy do tamowanie krwotoków w sytuacji zranienia kończyn z masywnym krwawieniem tętniczym lub żylnym.
-
-
- Splint
- Шина
- Férula
- Attelle
- Szyna
-
-
- An immobilization device used to support, immobilize and to a degree compress the associated wound. Usually used on the limbs but can be used on the hip.
- Приспособление для поддержки и иммобилизации конечности, а также частичного прижатия ее раны. Обычно накладывается на конечности, но может накладываться и на бедро.
- Un dispositivo de inmovilización utilizado para apoyar, inmovilizar y comprimir la herida asociada. Normalmente se usa en las extremidades, pero puede ser utilizado en la cadera.
- Un dispositif d'immobilisation servant a supporter, immobiliser, et meme comprimer les blessure relier a une fracture. Normalement utiliser sur les extrémités
- Szyna jest urządzeniem służącym do wsparcia lub unieruchomienia kończyny lub kręgosłupa.
-
-
- A Splint, for broken bones
- Шина для переломов
- Férula, para huesos rotos
- Une attelle, pour les os brisé
- Szyna, na złamane kości.
-
-
- Morphine auto-injector
- Морфин в автоматическом шприце
- Morfina auto-inyectable
- Auto-injecteur de Morphine
- Autostrzykawka z morfiną
-
-
- Used to combat moderate to severe pain experiences
- Для снятия средних и сильных болевых ощущений.
- Usado para combatir los estados dolorosos moderados a severos
- Utiliser pour contrer les douleurs modéré à severes.
- Morfina. Ma silne działanie przeciwbólowe.
-
-
- An analgesic used to combat moderate to severe pain experiences.
- Анальгетик для снятия средних и сильных болевых ощущений.
- Analgésico usado para combatir los estados dolorosos de moderado a severo.
- Un Analgésique puissant servant a contrer les douleur modéré a severe.
- Organiczny związek chemiczny z grupy alkaloidów. Ma silne działanie przeciwbólowe.
-
-
- Atropin auto-injector
- Атропин в автоматическом шприце
- Atropina auto-inyectable
- Auto-injecteur d'Atropine
- Autostrzykawka AtroPen
-
-
- Used in NBC scenarios
- Применяется для защиты от ОМП
- Usado en escenarios NBQ
- Utiliser en cas d'attaque CBRN
- Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice.
-
-
- A drug used by the Military in NBC scenarios.
- Препарат, используемый в войсках для защиты от оружия массового поражения.
- Medicamento usado por Militares en escenarios NBQ
- Médicament utilisé par l'armée en cas d'attaque CBRN
- Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice. Środek stosowany w przypadku zagrożeń NBC.
-
-
- Epinephrine auto-injector
- Адреналин в автоматическом шприце
- Epinefrina auto-inyectable
- Auto-injecteur d'épinéphrine
- Autostrzykawka EpiPen
-
-
- Increase heart rate and counter effects given by allergic reactions
- Стимулирует работу сердца и купирует аллергические реакции.
- Aumenta la frecuencia cardiaca y contraresta los efectos de las reacciones alérgicas
- Augmente la Fréquance cadiaque et contré les effet d'une reaction Anaphylactique
- Adrenalina. Zwiększa puls i przeciwdziała efektom wywołanym przez reakcje alergiczne
-
-
- A drug that works on a sympathetic response to dilate the bronchi, increase heart rate and counter such effects given by allergic reactions (anaphylaxis). Used in sudden cardiac arrest scenarios with decreasing positive outcomes.
- Препарат, вызывающий симпатическую реакцию, приводящую к расширению бронхов, увеличению частоты сердечных сокращений и купированию аллергических реакций (анафилактического шока). Применяется при остановке сердца с уменьшением вероятности благоприятного исхода.
- Medicamento que dilata los bronquios, aumenta la frecuencia cardiaca y contrarresta los efectos de las reacciones alérgicas (anafilaxis). Se utiliza en caso de paros cardiacos repentinos.
- Un medicament qui fonctione sur le systeme sympatique créan une dilatation des bronches, augmente la fréquance cardiaque et contre les effet d'une reaction alergique (anaphylaxie). Utiliser lors d'arret cardio-respiratoire pour augmenté les chances retrouver un ryhtme.
- EpiPen z adrenaliną ma działanie sympatykomimetyczne, tj. pobudza receptory alfa- i beta-adrenergiczne. Pobudzenie układu współczulnego prowadzi do zwiększenia częstotliwości pracy serca, zwiększenia pojemności wyrzutowej serca i przyśpieszenia krążenia wieńcowego. Pobudzenie oskrzelowych receptorów beta-adrenergicznych wywołuje rozkurcz mięśni gładkich oskrzeli, co w efekcie zmniejsza towarzyszące oddychaniu świsty i duszności.
-
-
- Plasma IV (1000ml)
- Плазма для в/в вливания (1000 мл)
- Plasma Intravenoso (1000ml)
- Plasma Sanguin IV (1000ml)
- Osocze IV (1000ml)
-
-
- A volume-expanding blood supplement.
- Дополнительный препарат, применяемый при возмещении объема крови.
- Suplemento para expandir el volumen sanguíneo.
- Supplement visant a remplacer les volume sanguin
- Składnik krwi, używany do zwiększenia jej objętości.
-
-
- A volume-expanding blood supplement.
- Дополнительный препарат, применяемый при возмещении объема крови.
- Suplemento para expandir el volumen sanguíneo.
- Supplement visant a remplacer le volume sanguin et remplace les plaquettes.
- Składnik krwi, używany do zwiększenia jej objętości.
-
-
- Plasma IV (500ml)
- Плазма для в/в вливания (500 мл)
- Plasma Intravenoso (500ml)
- Plasma Sanguin IV (500ml)
- Osocze IV (500ml)
-
-
- Plasma IV (250ml)
- Плазма для в/в вливания (250 мл)
- Plasma Intravenoso (250ml)
- Plasma Sanguin (250ml)
- Osocze IV (250ml)
-
-
- Blood IV (1000ml)
- Кровь для переливания (1000 мл)
- Sangre Intravenosa (1000ml)
- Cullot Sanguin IV (1000ml)
- Krew IV (1000ml)
-
-
- Blood IV, for restoring a patients blood (keep cold)
- Пакет крови для возмещения объема потерянной крови (хранить в холодильнике)
- Sangre Intravenosa, para restarurar el volumen sanguíneo (mantener frío)
- Cullot Sanguin IV, pour remplacer le volume sanguin (garder Réfrigeré)
- Krew IV, używana do uzupełnienia krwi u pacjenta, trzymać w warunkach chłodniczych
-
-
- O Negative infusion blood used in strict and rare events to replenish blood supply usually conducted in the transport phase of medical care.
- Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема потерянной крови на догоспитальном этапе оказания медицинской помощи.
- Cullot Sanguin O- ,utiliser seulement lors de perte sanguine majeur afin de remplacer le volume sanguin perdu. Habituelment utiliser lors du transport ou dans un etablisement de soin.
- Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj w trakcie fazie transportu rannej osoby do szpitala.
- Utilice sólo durante gran pérdida de sangre para reemplazar el volumen de sangre perdido. Uso habitual durante el transporte de heridos.
-
-
- Blood IV (500ml)
- Кровь для переливания (500 мл)
- Sangre Intravenosa (500ml)
- Cullot Sanguin IV (500ml)
- Krew IV (500ml)
-
-
- Blood IV (250ml)
- Кровь для переливания (250 мл)
- Sangre Intravenosa (250ml)
- Cullot Sanguin IV (250ml)
- Krew IV (250ml)
-
-
- Saline IV (1000ml)
- Физраствор для в/в вливания (1000 мл)
- Solución Salina Intravenosa (1000ml)
- solution Saline 0.9% IV (1000ml)
- Solanka 0,9% IV (1000ml)
-
-
- Saline IV, for restoring a patients blood
- Пакет физраствора для возмещения объема потерянной крови
- Solución Salina Intravenosa, para restaurar el volumen sanguíneo
- Solution Saline 0.9% IV, pour retablir temporairement la tention arteriel
- Solanka 0,9%, podawana dożylnie (IV), używana w celu uzupełnienia krwi u pacjenta
-
-
- A medical volume-replenishing agent introduced into the blood system through an IV infusion.
- Пакет физиологического раствора для возмещения объема потерянной крови путем внутривенного вливания.
- Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa.
- Un remplacment temporaire pour rétablir la tention artériel lors de perte sanguine, étant ajouter par intraveineuse
- Używany w medycynie w formie płynu infuzyjnego jako środek nawadniający i uzupełniający niedobór elektrolitów, podawany dożylnie (IV).
-
-
- Saline IV (500ml)
- Физраствор для в/в вливания (500 мл)
- Solución Salina Intravenosa (500ml)
- Solution Saline 0.9% IV (500ml)
- Solanka 0,9% IV (500ml)
-
-
- Saline IV (250ml)
- Физраствор для в/в вливания (250 мл)
- Solución Salina Intravenosa (250ml)
- Solution Saline 0.9% IV (250ml)
- Solanka 0,9% IV (250ml)
-
-
- Basic Field Dressing (QuikClot)
- Первичный перевязочный пакет (QuikClot)
- Vendaje Básico (Coagulante)
- Bandage Regulier (Coagulant)
- Opatrunek QuikClot
-
-
- QuikClot bandage
- Гемостатический пакет QuikClot
- Venda Coagulante
- Bandage coagulant
- Podstawowy opatrunek stosowany na rany
-
-
-
-
- Un bandage servant a coaguler les seignements mineur à moyen.
- Proszkowy opatrunek adsorbcyjny przeznaczony do tamowania zagrażających życiu krwawień średniej i dużej intensywności.
- Vendaje Hemostático con coagulante que detiene el sangrado.
-
-
- Nasopharyngeal tube
- Назотрахеальная трубка
- Cánula Nasofaríngea
- Canule Nasopharyngée
- Rurka nosowo-gardłowa
-
-
- Nasopharyngeal tube, for mataining the airway
- Назотрахеальная трубка для поддержания проходимости дыхательных путей
- Cánula Nasofaríngea, mantiene despejadas las vías aéreas
- Canule Naso, sert a mintenir ouverte les voix respiratoire.
- Rurka nosowo-gardłowa, używana w celu udrożnienia dróg oddechowych
-
-
- Nasopharyngeal airway. An airway adjunct inserted nasally which is then used to keep the airway patent which allows the field medic to ventilate the patient as appropriate.
- Назотрахеальная трубка. Интубационная трубка, вводимая через нос для поддержания проходимости дыхательных путей, позволяющая санитару при необходимости осуществлять вентиляцию легких раненого.
- Cánula Nasofaríngea. Dispositivo de vía aérea insertado por vía nasal que se utiliza para mantener libre la vía aérea permitiendo ventilar al paciente según sea apropiado.
- Canule Naso. Dispositif, incere par le nez, servant a maintenir les voie respiratoire du patient ouverte, permetant sa ventilation par le personel medical.
- Rurki nosowo-gardłowe stosuje się do ratunkowego udrożnienia dróg oddechowych u osób nieprzytomnych. Rurka nosowo-gardłowa jest znacznie lepiej tolerowana np. przez osobę przytomną, niż rurka ustno-gardłowa.
-
-
- Oropharyngeal tube
- Оротрахеальная трубка
- Cánula Orofaríngea
- Canule Oropharyngée
- Rurka ustno-gardłowa
-
-
- Oropharyngeal Airway, for maintaining the airway
- Оротрахеальная трубка для поддержания проходимости дыхательных путей
- Cánula Orofaríngea, para mantener despejada las vía aéreas
- Canule Oropharyngée, sert a maintenir les voie respiratoires ouverte.
- Rurka ustno-gardłowa, używana w celu udrożnienia dróg oddechowych
-
-
- Oropharyngeal airway. An airway adjunct inserted via the oral airway (i.e. mouth) which is then used to keep the airway patent which allows the field medic to ventilate the patient as appropriate.
- Оротрахеальная трубка. Интубационная трубка, вводимая через рот для поддержания проходимости дыхательных путей, позволяющая санитару при необходимости осуществлять вентиляцию легких раненого.
- Cánula Orofaríngea. Dispositivo de vía aérea insertado a través de la vía respiratoria oral (es decir, la boca) que se utiliza para mantener despejada las vías aéreas permitiendo ventilar al paciente según sea apropiado.
- Canule Oropharyngée. Un dispositif, inseré par la bouche, qui est utiliser pour garder les voie respiratoire overte et permetre la ventilation par le personel de soin.
- Rurkę ustno - gardłową stosuje się podczas zabiegów sztucznej wentylacji płuc. Zadaniem rurki ustno - gardłowej jest zapewnienie drożności górnych dróg oddechowych, a użycie jej zapewnia ratownikowi komfort prowadzenia zabiegów i podnosi skuteczność prowadzonej akcji.
-
-
- Liquid skin
- «Жидкая кожа»
- Pomada tópica
- Pomade Topique
- Bandaż (w płynie)
-
-
- Liquid Skin, for use on burns
- Препарат «жидкая кожа» для лечения ожогов
- Pomada tópica, para quemaduras
- Pomade Topique, appliquer sur les brulures.
- Bandaż w płynie, używany na poparzenia i lekkie urazy
-
-
- Liquid bandage is a topical skin treatment for minor cuts and sores that is sold by several companies. The products are mixtures of chemicals which create a polymeric layer which binds to the skin. This protects the wound by keeping dirt and germs out, and keeping moisture in.
- Медицинский клей («жидкая повязка») – наружное средство для лечения небольших порезов и ссадин. Продукт представляет собой смесь химических веществ, создающих полимерный слой, который приклеивается к коже. Таким образом предотвращается попадание в рану грязи и микробов, а также высыхание раны.
- Bandage liquide est un traitement de la peau topique pour les coupures et les plaies mineures qui est vendu par plusieurs compagnies. Les produits sont des mélanges de produits chimiques qui créent une couche polymère qui se lie à la peau. Cela protège la plaie en gardant la saleté et les germes, et de garder l'humidité.
- Opatrunek nakładany na skórę atomizerem tworzący na powierzchni skóry warstwę przyśpieszającą gojenie - stosowany przy drobnych ranach i poparzeniach.
- Líquido tópico para pequeños cortes, heridas y quemaduras. Compuesto de sustancias químicas que crean una capa polimérica que se une a la piel. Esto protege la herida manteniéndola libre de suciedad y gérmenes.
-
-
- Chest seal
- Окклюзионная повязка
- Parche Oclusivo
- Bandage Occlusif
- Opatrunek Chest Seal
-
-
- A Chest seal
- Окклюзионная повязка на грудную клетку
- Parche Torácico
- Bandage toracique pour les pneumothorax
- Opatrunek uszczelniający na rany penetracyjne klatki piersiowej
-
-
- Chest Seal is a high performance occlusive dressing designed to treat penetrating chest wounds along with securing other wound dressings. The patented hydro-gel provides superior adhesion to the wound area even when moisture, pleural fluids or blood is present. It will work on patients with heavy perspiration or very wet environments. The highly aggressive tack adhesive of the hydro-gel will enable the dressing to conform and hold to the patient's body.
- Окклюзионная повязка предназначена для лечения проникающих ранений в грудную клетку с одновременной фиксацией других повязок. Патентованный гидрогель обеспечивает отличное крепление к области ранения даже при наличии влаги, плевральной жидкости или крови. Может применяться даже при обильном потоотделении или в очень влажной среде. Благодаря высокоадгезивному пластырю повязка плотно прилегает к телу раненого и не отклеивается.
- Le pensement occlusif est un pansement occlusif de haute performance conçu pour traiter les plaies pénétrantes de la poitrine ainsi que la sécurisation d'autres pansements. L'hydro-gel brevetée offre une adhérence supérieure à la surface de la plaie, même lorsque l'humidité, liquide pleural ou le sang est présent, elle le laisse couller. Il fonctionne sur les patients atteints d'une transpiration abondante ou dans des environnements très humides.
- Chest Seal to opatrunek przeznaczony do opatrywania penetracyjnych (otwartych) ran klatki piersiowej, staniowiących sytuację zagrażającą życiu wskutek możliwości powstawania odmy prężnej. Jest to druga co do częstotliwości występowania przyczyna śmierci na polu walki, której można zapobiec stosując odpowiednie procedury medyczne. Chest Seal charakteryzuje się trwałym i szczelnym przyleganiem do skóry pokrytej krwią, piaskiem, włosami, potem lub wodą. Materiałem klejącym opatrunku uszczelniającego jest środek hydrożelowy umożliwiający wielokrotne odklejanie i przyklejanie opatrunku, co pozwala na wentylowanie rany.
- Vendaje oclusivo utilizado para el tratamiento de las lesiones penetrantes en el tórax
-
-
- Personal Aid Kit
- Аптечка
- Kit de Soporte Vital Avanzado
- Équipement de support Vitale
- Apteczka osobista
-
-
- Includes various treatment kit needed for stitching or advanced treatment
- Содержит различные материалы и инструменты для зашивания ран и оказания специальной медпомощи.
- Incluye material médico para tratamientos avanzados
- Inclue du matériel medical pour les traitement avancé, tel les point de suture.
- Zestaw środków medycznych do opatrywania ran i dodatkowego leczenia po-urazowego
-
-
-
-
-
-
-
-
- Surgical Kit
- Хирургический набор
- Kit Quirúrgico
-
-
- Surgical Kit for in field advanced medical treatment
- Набор для хирургической помощи в полевых условиях
- Kit Quirúrgico para el tratamiento avanzado en el campo de batalla
-
-
- Surgical Kit for in field advanced medical treatment
- Набор для хирургической помощи в полевых условиях
- Kit Quirúrgico para el tratamiento avanzado en el campo de batalla
-
-
- Bodybag
- Мешок для трупов
- Bolsa para cadáveres
-
-
- A bodybag for dead bodies
- Мешок для упаковки трупов
- Bolsa para cadáveres
-
-
- A bodybag for dead bodies
- Мешок для упаковки трупов
- Bolsa para cadáveres
-
-
-
-
- Canceled
- Отменено
- Cancelado
-
-
- Action has been canceled
- Действие отменено
- Acción cancelada
-
-
- You moved away
- Вы отошли от раненого
- Te estás alejando
-
-
- Blood Pressure
- Артериальное давление
- Presión Arterial
-
-
- Checking Blood Pressure..
- Проверка артериального давления...
- Comprobando Presión Arterial...
-
-
- You checked %1
- Вы осмотрели раненого %1
- Examinando a %1
-
-
- You find a blood pressure of %2/%3
- Артериальное давление %2/%3
- La Presión Arterial es %2/%3
-
-
- You find a low blood pressure
- Давление низкое
- La Presión Arterial es baja
-
-
- You find a normal blood pressure
- Давление нормальное
- La Presión Arterial es normal
-
-
- You find a high blood pressure
- Давление высокое
- La Presión Arterial es alta
-
-
- You find no blood pressure
- Давления нет
- No hay Presión Arterial
-
-
- You fail to find a blood pressure
- Артериальное давление не определяется
- No puedes encontrar Presión Arterial
-
-
- Pulse
- Пульс
- Pulso
-
-
- Checking Heart Rate..
- Проверка пульса...
- Comprobando Pulso...
-
-
- You checked %1
- Вы осмотрели раненого %1
- Examinando a %1
-
-
- You find a Heart Rate of %2
- Пульс %2 уд./мин.
- El Pulso es %2
-
-
- You find a weak Heart Rate
- Пульс слабый
- El Pulso es débil
-
-
- You find a strong Heart Rate
- Пульс учащенный
- El Pulso está acelerado
-
-
- You find a normal Heart Rate
- Пульс в норме
- El Pulso es bueno
-
-
- You find no Heart Rate
- Пульс не прощупывается
- No tiene Pulso
-
-
- Response
- Реакция
- Reacciona
-
-
- You check response of patient
- Вы проверяете реакцию раненого
- Compruebas si el paciente reacciona
-
-
- %1 is responsive
- %1 реагирует на раздражители
- %1 ha reaccionado
-
-
-
- %1 is not responsive
- %1 не реагирует
- %1 no reacciona
-
-
- You checked %1
- Вы осмотрели раненого %1
- Examinas a %1
-
-
- Bandaging
- Перевязка...
- Vendando
-
-
- Bandaged
- Повязка наложена
- Vendado
-
-
- You apply a bandage on %1 - %2
- Вы перевязали раненого %1 (%2)
- Aplicas vendaje a %1 en %2
-
-
- %1 is bandaging you
- %1 перевязывает вас
- %1 te está vendando
-
-
- You start stitching injures from %1 - %2
- Вы зашиваете ранения от %1 (%2)
- Estás suturando heridas de %1 en %2
-
-
- Stitching
- Наложение швов
- Suturando
-
-
- You treat the airway of %1
- Вы интубируете раненого %1
- Estás intubando a %1
-
-
- Airway
- Дыхательные пути
- Vías Aéreas
-
-
- %1 is treating your aiway
- %1 проводит вам интубацию
- %1 te está intubando
-
-
-
-
diff --git a/TO_MERGE/cse/sys_medical/ui/define.hpp b/TO_MERGE/cse/sys_medical/ui/define.hpp
deleted file mode 100644
index c521de470f..0000000000
--- a/TO_MERGE/cse/sys_medical/ui/define.hpp
+++ /dev/null
@@ -1,797 +0,0 @@
-
-#ifndef CSE_DEFINE_H
-#define CSE_DEFINE_H
-// define.hpp
-
-#define true 1
-#define false 0
-
-#define CT_STATIC 0
-#define CT_BUTTON 1
-#define CT_EDIT 2
-#define CT_SLIDER 3
-#define CT_COMBO 4
-#define CT_LISTBOX 5
-#define CT_TOOLBOX 6
-#define CT_CHECKBOXES 7
-#define CT_PROGRESS 8
-#define CT_HTML 9
-#define CT_STATIC_SKEW 10
-#define CT_ACTIVETEXT 11
-#define CT_TREE 12
-#define CT_STRUCTURED_TEXT 13
-#define CT_CONTEXT_MENU 14
-#define CT_CONTROLS_GROUP 15
-#define CT_SHORTCUTBUTTON 16
-#define CT_XKEYDESC 40
-#define CT_XBUTTON 41
-#define CT_XLISTBOX 42
-#define CT_XSLIDER 43
-#define CT_XCOMBO 44
-#define CT_ANIMATED_TEXTURE 45
-#define CT_OBJECT 80
-#define CT_OBJECT_ZOOM 81
-#define CT_OBJECT_CONTAINER 82
-#define CT_OBJECT_CONT_ANIM 83
-#define CT_LINEBREAK 98
-#define CT_ANIMATED_USER 99
-#define CT_MAP 100
-#define CT_MAP_MAIN 101
-#define CT_LISTNBOX 102
-
-// Static styles
-#define ST_POS 0x0F
-#define ST_HPOS 0x03
-#define ST_VPOS 0x0C
-#define ST_LEFT 0x00
-#define ST_RIGHT 0x01
-#define ST_CENTER 0x02
-#define ST_DOWN 0x04
-#define ST_UP 0x08
-#define ST_VCENTER 0x0c
-
-#define ST_TYPE 0xF0
-#define ST_SINGLE 0
-#define ST_MULTI 16
-#define ST_TITLE_BAR 32
-#define ST_PICTURE 48
-#define ST_FRAME 64
-#define ST_BACKGROUND 80
-#define ST_GROUP_BOX 96
-#define ST_GROUP_BOX2 112
-#define ST_HUD_BACKGROUND 128
-#define ST_TILE_PICTURE 144
-#define ST_WITH_RECT 160
-#define ST_LINE 176
-
-#define ST_SHADOW 0x100
-#define ST_NO_RECT 0x200 // this style works for CT_STATIC in conjunction with ST_MULTI
-#define ST_KEEP_ASPECT_RATIO 0x800
-
-#define ST_TITLE ST_TITLE_BAR + ST_CENTER
-
-// Slider styles
-#define SL_DIR 0x400
-#define SL_VERT 0
-#define SL_HORZ 0x400
-
-#define SL_TEXTURES 0x10
-
-// Listbox styles
-#define LB_TEXTURES 0x10
-#define LB_MULTI 0x20
-#define FontCSE "PuristaMedium"
-
-class cse_gui_backgroundBase {
- type = CT_STATIC;
- idc = -1;
- style = ST_PICTURE;
- colorBackground[] = {0,0,0,0};
- colorText[] = {1, 1, 1, 1};
- font = FontCSE;
- text = "";
- sizeEx = 0.032;
-};
-class cse_gui_editBase
-{
- access = 0;
- type = 2;
- x = 0;
- y = 0;
- h = 0.04;
- w = 0.2;
- colorBackground[] =
- {
- 0,
- 0,
- 0,
- 1
- };
- colorText[] =
- {
- 0.95,
- 0.95,
- 0.95,
- 1
- };
- colorSelection[] =
- {
- "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])",
- 1
- };
- autocomplete = "";
- text = "";
- size = 0.2;
- style = "0x00 + 0x40";
- font = "PuristaMedium";
- shadow = 2;
- sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorDisabled[] =
- {
- 1,
- 1,
- 1,
- 0.25
- };
-};
-
-
-
-class cse_gui_buttonBase {
- idc = -1;
- type = 16;
- style = ST_LEFT;
- text = "";
- action = "";
- x = 0.0;
- y = 0.0;
- w = 0.25;
- h = 0.04;
- size = 0.03921;
- sizeEx = 0.03921;
- color[] = {1.0, 1.0, 1.0, 1};
- color2[] = {1.0, 1.0, 1.0, 1};
- /*colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.5])"};
- colorbackground2[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.4};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- colorFocused[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])", 0.8};
- colorBackgroundFocused[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.8};
- */
-
- colorBackground[] = {1,1,1,0.95};
- colorbackground2[] = {1,1,1,0.95};
- colorDisabled[] = {1,1,1,0.6};
- colorFocused[] = {1,1,1,1};
- colorBackgroundFocused[] = {1,1,1,1};
- periodFocus = 1.2;
- periodOver = 0.8;
- default = false;
- class HitZone {
- left = 0.00;
- top = 0.00;
- right = 0.00;
- bottom = 0.00;
- };
-
- class ShortcutPos {
- left = 0.00;
- top = 0.00;
- w = 0.00;
- h = 0.00;
- };
-
- class TextPos {
- left = 0.002;
- top = 0.0004;
- right = 0.0;
- bottom = 0.00;
- };
- textureNoShortcut = "";
- animTextureNormal = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDisabled = "cse\cse_gui\data\buttonDisabled_gradient.paa";
- animTextureOver = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureFocused = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTexturePressed = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDefault = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- period = 0.5;
- font = FontCSE;
- soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
- soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0};
- soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1};
- soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
- class Attributes {
- font = FontCSE;
- color = "#E5E5E5";
- align = "center";
- shadow = "true";
- };
- class AttributesImage {
- font = FontCSE;
- color = "#E5E5E5";
- align = "left";
- shadow = "true";
- };
-};
-
-class cse_gui_RscProgress {
- type = 8;
- style = 0;
- colorFrame[] = {1,1,1,0.7};
- colorBar[] = {1,1,1,0.7};
- texture = "#(argb,8,8,3)color(1,1,1,0.7)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-};
-
-
-class cse_gui_staticBase {
- idc = -1;
- type = CT_STATIC;
- x = 0.0;
- y = 0.0;
- w = 0.183825;
- h = 0.104575;
- style = ST_LEFT;
- font = FontCSE;
- sizeEx = 0.03921;
- colorText[] = {0.95, 0.95, 0.95, 1.0};
- colorBackground[] = {0, 0, 0, 0};
- text = "";
-};
-
-class RscListBox;
-class cse_gui_listBoxBase : RscListBox{
- type = CT_LISTBOX;
- style = ST_MULTI;
- font = FontCSE;
- sizeEx = 0.03921;
- color[] = {1, 1, 1, 1};
- colorText[] = {0.543, 0.5742, 0.4102, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 1};
- colorSelectBackground2[] = {0.543, 0.5742, 0.4102, 1.0};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- period = 1.2;
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 1};
- maxHistoryDelay = 1.0;
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- soundSelect[] = {"",0.1,1};
- soundExpand[] = {"",0.1,1};
- soundCollapse[] = {"",0.1,1};
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
- class ScrollBar {
- color[] = {1, 1, 1, 0.6};
- colorActive[] = {1, 1, 1, 1};
- colorDisabled[] = {1, 1, 1, 0.3};
- thumb = "";
- arrowFull = "";
- arrowEmpty = "";
- border = "";
- };
-};
-
-
-class cse_gui_listNBox {
- access = 0;
- type = CT_LISTNBOX;// 102;
- style =ST_MULTI;
- w = 0.4;
- h = 0.4;
- font = FontCSE;
- sizeEx = 0.031;
-
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- columns[] = {0.0};
- color[] = {1, 1, 1, 1};
-
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.5};
- colorActive[] = {0,0,0,1};
- colorDisabled[] = {0,0,0,0.3};
- rows = 1;
-
- drawSideArrows = 0;
- idcLeft = -1;
- idcRight = -1;
- maxHistoryDelay = 1;
- soundSelect[] = {"", 0.1, 1};
- period = 1;
- shadow = 2;
- class ScrollBar {
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- border = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- thumb = "#(argb,8,8,3)color(1,1,1,1)";
- };
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-class RscCombo;
-class cse_gui_comboBoxBase: RscCombo {
- idc = -1;
- type = 4;
- style = "0x10 + 0x200";
- x = 0;
- y = 0;
- w = 0.3;
- h = 0.035;
- color[] = {0,0,0,0.6};
- colorActive[] = {1,0,0,1};
- colorBackground[] = {0,0,0,1};
- colorDisabled[] = {1,1,1,0.25};
- colorScrollbar[] = {1,0,0,1};
- colorSelect[] = {0,0,0,1};
- colorSelectBackground[] = {1,1,1,0.7};
- colorText[] = {1,1,1,1};
-
- arrowEmpty = "";
- arrowFull = "";
- wholeHeight = 0.45;
- font = FontCSE;
- sizeEx = 0.031;
- soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1};
- soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1};
- soundCollapse[] = {"\A3\ui_f\data\sound\RscCombo\soundCollapse",0.1,1};
- maxHistoryDelay = 1.0;
- class ScrollBar
- {
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- border = "";
- };
- class ComboScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-
-class cse_gui_mapBase {
- moveOnEdges = 1;
- x = "SafeZoneXAbs";
- y = "SafeZoneY + 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "SafeZoneWAbs";
- h = "SafeZoneH - 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- type = 100; // Use 100 to hide markers
- style = 48;
- shadow = 0;
-
- ptsPerSquareSea = 5;
- ptsPerSquareTxt = 3;
- ptsPerSquareCLn = 10;
- ptsPerSquareExp = 10;
- ptsPerSquareCost = 10;
- ptsPerSquareFor = 9;
- ptsPerSquareForEdge = 9;
- ptsPerSquareRoad = 6;
- ptsPerSquareObj = 9;
- showCountourInterval = 0;
- scaleMin = 0.001;
- scaleMax = 1.0;
- scaleDefault = 0.16;
- maxSatelliteAlpha = 0.85;
- alphaFadeStartScale = 0.35;
- alphaFadeEndScale = 0.4;
- colorBackground[] = {0.969,0.957,0.949,1.0};
- colorSea[] = {0.467,0.631,0.851,0.5};
- colorForest[] = {0.624,0.78,0.388,0.5};
- colorForestBorder[] = {0.0,0.0,0.0,0.0};
- colorRocks[] = {0.0,0.0,0.0,0.3};
- colorRocksBorder[] = {0.0,0.0,0.0,0.0};
- colorLevels[] = {0.286,0.177,0.094,0.5};
- colorMainCountlines[] = {0.572,0.354,0.188,0.5};
- colorCountlines[] = {0.572,0.354,0.188,0.25};
- colorMainCountlinesWater[] = {0.491,0.577,0.702,0.6};
- colorCountlinesWater[] = {0.491,0.577,0.702,0.3};
- colorPowerLines[] = {0.1,0.1,0.1,1.0};
- colorRailWay[] = {0.8,0.2,0.0,1.0};
- colorNames[] = {0.1,0.1,0.1,0.9};
- colorInactive[] = {1.0,1.0,1.0,0.5};
- colorOutside[] = {0.0,0.0,0.0,1.0};
- colorTracks[] = {0.84,0.76,0.65,0.15};
- colorTracksFill[] = {0.84,0.76,0.65,1.0};
- colorRoads[] = {0.7,0.7,0.7,1.0};
- colorRoadsFill[] = {1.0,1.0,1.0,1.0};
- colorMainRoads[] = {0.9,0.5,0.3,1.0};
- colorMainRoadsFill[] = {1.0,0.6,0.4,1.0};
- colorGrid[] = {0.1,0.1,0.1,0.6};
- colorGridMap[] = {0.1,0.1,0.1,0.6};
- colorText[] = {1, 1, 1, 0.85};
-font = "PuristaMedium";
-sizeEx = 0.0270000;
-stickX[] = {0.20, {"Gamma", 1.00, 1.50} };
-stickY[] = {0.20, {"Gamma", 1.00, 1.50} };
-onMouseButtonClick = "";
-onMouseButtonDblClick = "";
-
- fontLabel = "PuristaMedium";
- sizeExLabel = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontGrid = "TahomaB";
- sizeExGrid = 0.02;
- fontUnits = "TahomaB";
- sizeExUnits = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontNames = "PuristaMedium";
- sizeExNames = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2";
- fontInfo = "PuristaMedium";
- sizeExInfo = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontLevel = "TahomaB";
- sizeExLevel = 0.02;
- text = "#(argb,8,8,3)color(1,1,1,1)";
- class ActiveMarker {
- color[] = {0.30, 0.10, 0.90, 1.00};
- size = 50;
- };
- class Legend
- {
- x = "SafeZoneX + ( ((safezoneW / safezoneH) min 1.2) / 40)";
- y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
- h = "3.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- font = "PuristaMedium";
- sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- colorBackground[] = {1,1,1,0.5};
- color[] = {0,0,0,1};
- };
- class Task
- {
- icon = "\A3\ui_f\data\map\mapcontrol\taskIcon_CA.paa";
- iconCreated = "\A3\ui_f\data\map\mapcontrol\taskIconCreated_CA.paa";
- iconCanceled = "\A3\ui_f\data\map\mapcontrol\taskIconCanceled_CA.paa";
- iconDone = "\A3\ui_f\data\map\mapcontrol\taskIconDone_CA.paa";
- iconFailed = "\A3\ui_f\data\map\mapcontrol\taskIconFailed_CA.paa";
- color[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])"};
- colorCreated[] = {1,1,1,1};
- colorCanceled[] = {0.7,0.7,0.7,1};
- colorDone[] = {0.7,1,0.3,1};
- colorFailed[] = {1,0.3,0.2,1};
- size = 27;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- };
- class Waypoint
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class WaypointCompleted
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypointCompleted_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class CustomMark
- {
- icon = "\A3\ui_f\data\map\mapcontrol\custommark_ca.paa";
- size = 24;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {0,0,0,1};
- };
- class Command
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- size = 18;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {1,1,1,1};
- };
- class Bush
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = "14/2";
- importance = "0.2 * 14 * 0.05 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Rock
- {
- icon = "\A3\ui_f\data\map\mapcontrol\rock_ca.paa";
- color[] = {0.1,0.1,0.1,0.8};
- size = 12;
- importance = "0.5 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class SmallTree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.6 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Tree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.9 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class busstop
- {
- icon = "\A3\ui_f\data\map\mapcontrol\busstop_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class fuelstation
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fuelstation_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class hospital
- {
- icon = "\A3\ui_f\data\map\mapcontrol\hospital_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class church
- {
- icon = "\A3\ui_f\data\map\mapcontrol\church_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class lighthouse
- {
- icon = "\A3\ui_f\data\map\mapcontrol\lighthouse_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class power
- {
- icon = "\A3\ui_f\data\map\mapcontrol\power_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powersolar
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powersolar_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwave
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwave_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwind
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwind_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class quay
- {
- icon = "\A3\ui_f\data\map\mapcontrol\quay_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class shipwreck
- {
- icon = "\A3\ui_f\data\map\mapcontrol\shipwreck_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class transmitter
- {
- icon = "\A3\ui_f\data\map\mapcontrol\transmitter_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class watertower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\watertower_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class Cross
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Cross_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Chapel
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Chapel_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Bunker
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 14;
- importance = "1.5 * 14 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fortress
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 16;
- importance = "2 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fountain
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fountain_ca.paa";
- size = 11;
- importance = "1 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Ruin
- {
- icon = "\A3\ui_f\data\map\mapcontrol\ruin_ca.paa";
- size = 16;
- importance = "1.2 * 16 * 0.05";
- coefMin = 1;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Stack
- {
- icon = "\A3\ui_f\data\map\mapcontrol\stack_ca.paa";
- size = 20;
- importance = "2 * 16 * 0.05";
- coefMin = 0.9;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Tourism
- {
- icon = "\A3\ui_f\data\map\mapcontrol\tourism_ca.paa";
- size = 16;
- importance = "1 * 16 * 0.05";
- coefMin = 0.7;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class ViewTower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\viewtower_ca.paa";
- size = 16;
- importance = "2.5 * 16 * 0.05";
- coefMin = 0.5;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
-};
-
-#endif
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/ui/menu.hpp b/TO_MERGE/cse/sys_medical/ui/menu.hpp
deleted file mode 100644
index a9ce19d32e..0000000000
--- a/TO_MERGE/cse/sys_medical/ui/menu.hpp
+++ /dev/null
@@ -1,612 +0,0 @@
-class cse_sys_medicalMenu {
- idd = 314412;
- movingEnable = true;
- onLoad = "uiNamespace setVariable ['cse_sys_medicalMenu', _this select 0]; ['cse_sys_medical', true] call cse_fnc_gui_blurScreen; [_this select 0] spawn cse_fnc_onMenuOpen_CMS;";
- onUnload = " ['cse_sys_medical', false] call cse_fnc_gui_blurScreen; ['cse_onMenuOpen_CMS', 'onEachFrame'] call BIS_fnc_removeStackedEventHandler;";
-
- class controlsBackground {
-
- class HeaderBackground: cse_gui_backgroundBase{
- idc = -1;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "#(argb,8,8,3)color(0,0,0,0)";
- //moving = 1;
- };
- class CenterBackground: HeaderBackground {
- /*x = 0.138;
- y = 0.17;
- w = 1.2549;
- h = 0.836601;*/
- y = "2.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- h = "16 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- //text = "#(argb,8,8,3)color(0,0,0,0.65)";
- //text = "cse\cse_sys_medical\data\ui_background.paa";
- text = "#(argb,8,8,3)color(0,0,0,0.8)";
- colorText[] = {0, 0, 0, "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- colorBackground[] = {0,0,0,"(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- };
- class BottomBackground: CenterBackground {
- y = "(18.6 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2))";
- h = "9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- };
- };
-
- class controls {
- class HeaderName {
- idc = 1;
- type = CT_STATIC;
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_LEFT + ST_SHADOW;
- font = "PuristaMedium";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.95, 0.95, 0.95, 0.75};
- colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- text = "";
- };
-
- class IconsBackGroundBar: cse_gui_backgroundBase{
- idc = -1;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "2.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "3.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- //text = "#(argb,8,8,3)color(0,0,0,0.4)";
- text ="cse\cse_sys_medical\data\cse_background_img.paa";
- colorText[] = {1, 1, 1, 0.0};
- //moving = 1;
- };
- class CatagoryLeft: HeaderName {
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "2.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12.33 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_CENTER;
- //colorText[] = {0.6, 0.7, 1.0, 1};
- colorText[] = {1, 1, 1.0, 0.9};
- colorBackground[] = {0,0,0,0};
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.2)";
- text = $STR_CSE_UI_EXAMINE_TREATMENT;
- };
- class CatagoryCenter: CatagoryLeft {
- x = "13.33 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = $STR_CSE_UI_STATUS;
- };
- class CatagoryRight: CatagoryCenter{
- x = "25.66 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = $STR_CSE_UI_OVERVIEW;
- };
- class Line: cse_gui_backgroundBase {
- idc = -1;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "37 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.03 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "#(argb,8,8,3)color(1,1,1,0.5)";
- };
-
- class iconImg1: cse_gui_backgroundBase {
- idc = 111;
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.73 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.1)";
- colorBackground[] = {0,0,0,1};
- colorPicture[] = {1,1,1,1};
- colorText[] = {1,1,1,1};
- text = "cse\cse_sys_medical\data\icons\triage_card_small.paa";
- };
- class iconImg2: iconImg1 {
- idc = 112;
- x = "3 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_medical\data\icons\examine_patient_small.paa";
- };
- class iconImg3: iconImg1 {
- idc = 113;
- x = "4.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_medical\data\icons\bandage_fracture_small.paa";
- };
- class iconImg4: iconImg1 {
- idc = 114;
- x = "6 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_medical\data\icons\medication_small.paa";
- };
- class iconImg5: iconImg1 {
- idc = 115;
- x = "7.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_medical\data\icons\airway_management_small.paa";
- };
- class iconImg6: iconImg1 {
- idc = 116;
- x = "9 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_medical\data\icons\advanced_treatment_small.paa";
- };
- class iconImg7: iconImg1 {
- idc = 117;
- x = "10.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_medical\data\icons\icon_carry.paa"; // to be replaced later on!
- };
- class iconImg8: iconImg1 {
- idc = 118;
- x = "12 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_medical\data\icons\toggle_self_small.paa";
- };
-
-
- class BtnIconLeft1: cse_gui_buttonBase {
- idc = 11;
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.73 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.1)";
- /*animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.3)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.1)";
- animTextureOver = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.95)";
- animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.2)";
- animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.3)";*/
-
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureOver = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.0)";
- action = "['triage'] call cse_fnc_displayOptions_CMS;";
- };
- class BtnIconLeft2: BtnIconLeft1 {
- idc = 12;
- x = "3 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['examine'] call cse_fnc_displayOptions_CMS;";
- };
- class BtnIconLeft3: BtnIconLeft1 {
- idc = 13;
- x = "4.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['bandage'] call cse_fnc_displayOptions_CMS;";
- };
- class BtnIconLeft4: BtnIconLeft1 {
- idc = 14;
- x = "6 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['medication'] call cse_fnc_displayOptions_CMS;";
- };
- class BtnIconLeft5: BtnIconLeft1 {
- idc = 15;
- x = "7.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['airway'] call cse_fnc_displayOptions_CMS;";
- };
- class BtnIconLeft6: BtnIconLeft1 {
- idc = 16;
- x = "9 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['advanced'] call cse_fnc_displayOptions_CMS;";
- };
- class BtnIconLeft7: BtnIconLeft1 {
- idc = 17;
- x = "10.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['drag'] call cse_fnc_displayOptions_CMS;";
- };
- class BtnIconLeft8: BtnIconLeft1 {
- idc = 18;
- x = "12 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['toggle'] call cse_fnc_displayOptions_CMS;";
- };
-
-
- class TriageCardList: cse_gui_listBoxBase {
- idc = 212;
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.0};
- };
-
-
- // Left side
- class BtnMenu1: BtnIconLeft1 {
- idc = 20;
- y = "5.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "";
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.9)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.8)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.5)";
- animTextureOver = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)";
- animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1, 1, 1, 1};
- color2[] = {0,0,0, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.5,0.5,0.5,0.8};
- colorFocused[] = {0,0,0,1};
- periodFocus = 1;
- periodOver = 1;
- /*animTextureNormal = "cse\cse_sys_medical\data\cse_background_img.paa";
- animTextureDisabled = "cse\cse_sys_medical\data\cse_background_img.paa";
- animTextureOver = "cse\cse_sys_medical\data\cse_background_img.paa";
- animTextureFocused = "cse\cse_sys_medical\data\cse_background_img.paa";
- animTexturePressed = "cse\cse_sys_medical\data\cse_background_img.paa";
- animTextureDefault = "cse\cse_sys_medical\data\cse_background_img.paa";*/
-
- action = "";
- };
- class BtnMenu2: BtnMenu1 {
- idc = 21;
- y = "6.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu3: BtnMenu1 {
- idc = 22;
- y = "7.6 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu4: BtnMenu1 {
- idc = 23;
- y = "8.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text ="";
- };
- class BtnMenu5: BtnMenu1 {
- idc = 24;
- y = "9.8 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu6: BtnMenu1 {
- idc = 25;
- y = "10.9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu7: BtnMenu1 {
- idc = 26;
- y = "12 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu8: BtnMenu1 {
- idc = 27;
- y = "13.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
-
-
-
- // center
-
- class bodyImgBackground: cse_gui_backgroundBase {
- idc = -1;
- x = "13.33 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.73 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12.33 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "12.33 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
- colorBackground[] = {1,1,1,1};
- colorPicture[] = {1,1,1,1};
- colorText[] = {1,1,1,1};
- text = "cse\cse_sys_medical\data\body_background.paa";
- };
- class bodyImgHead: bodyImgBackground {
- idc = 50;
- x = "13.33 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.73 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12.33 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "12.33 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
- colorBackground[] = {1,1,1,1};
- colorPicture[] = {1,1,1,1};
- colorText[] = {1,1,1,1};
- text = "cse\cse_sys_medical\data\body_head.paa";
- };
-
- class bodyImgTorso: bodyImgHead {
- idc = 51;
- text = "cse\cse_sys_medical\data\body_torso.paa";
- };
- class bodyImgArms_l: bodyImgHead {
- idc = 52;
- text = "cse\cse_sys_medical\data\body_arm_left.paa";
- };
- class bodyImgArms_r: bodyImgHead {
- idc = 53;
- text = "cse\cse_sys_medical\data\body_arm_right.paa";
- };
- class bodyImgLegs_l: bodyImgHead {
- idc = 54;
- text = "cse\cse_sys_medical\data\body_leg_left.paa";
- };
- class bodyImgLegs_r: bodyImgHead {
- idc = 55;
- text = "cse\cse_sys_medical\data\body_leg_right.paa";
- };
-
-
- class selectHead: cse_gui_buttonBase {
- idc = 301;
- x = "18.8 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "1.4 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.1)";
- /*animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.4)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.4)";
- animTextureOver = "#(argb,8,8,3)color(0,0,0,0.99)";
- animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.99)";
- animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.4)";
- animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.4)";*/
-
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureOver = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.0)";
- action = "CSE_SELECTED_BODY_PART_CMS = 'head'; [CSE_SYS_MEDICAL_INTERACTION_TARGET] spawn cse_fnc_updateUIInfo_CMS;";
- };
- class selectTorso : selectHead {
- idc = 302;
- x = "18.4 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "2.2 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "4.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- action = "CSE_SELECTED_BODY_PART_CMS = 'body'; [CSE_SYS_MEDICAL_INTERACTION_TARGET] spawn cse_fnc_updateUIInfo_CMS;";
- };
- class selectLeftArm: selectHead{
- idc = 303;
- x = "17.4 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "1.1 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "4.3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- action = "CSE_SELECTED_BODY_PART_CMS = 'hand_r'; [CSE_SYS_MEDICAL_INTERACTION_TARGET] spawn cse_fnc_updateUIInfo_CMS;";
- };
- class selectRightArm: selectLeftArm{
- idc = 304;
- x = "20.6 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "CSE_SELECTED_BODY_PART_CMS = 'hand_l'; [CSE_SYS_MEDICAL_INTERACTION_TARGET] spawn cse_fnc_updateUIInfo_CMS;";
- };
- class selectLeftLeg :selectHead {
- idc = 305;
- x = "18.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "9.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "1.1 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "6 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- action = "CSE_SELECTED_BODY_PART_CMS = 'leg_r'; [CSE_SYS_MEDICAL_INTERACTION_TARGET] spawn cse_fnc_updateUIInfo_CMS;";
- };
- class selectRightLeg :selectLeftLeg {
- idc = 306;
- x = "19.6 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "CSE_SELECTED_BODY_PART_CMS = 'leg_l'; [CSE_SYS_MEDICAL_INTERACTION_TARGET] spawn cse_fnc_updateUIInfo_CMS;";
- };
-
-
- class TriageTextBottom: HeaderName {
- idc = 2000;
- x = "13.33 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "16.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12.33 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_CENTER;
- colorText[] = {1, 1, 1.0, 1};
- colorBackground[] = {0,0.0,0.0,0.7};
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- text = "";
- };
-
-
-
- // Right side
-
- class InjuryList: cse_gui_listBoxBase {
- idc = 213;
- x = "25.66 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12.33 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.5};
- };
-
- // bottom
-
- // activity log
-
- class ActivityLogHeader: CatagoryLeft {
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "18.6 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "18.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_CENTER;
- colorText[] = {0.6, 0.7, 1.0, 1};
- colorBackground[] = {0,0,0,0};
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- text = $STR_CSE_UI_ACTIVITY_LOG;
- };
- class QuickViewHeader: ActivityLogHeader {
- x = "19.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = $STR_CSE_UI_QUICK_VIEW;
- };
- class LineBottomHeaders: Line {
- y = "19.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- };
- class ActivityLog: InjuryList {
- idc = 214;
- style = 16;
- type = 102;
- rows=1;
- colorBackground[] = {0, 0, 0, 1};
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "(19.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2))";
- w = "18.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "6.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.0};
- columns[] = {0.0, 0.08};
- canDrag=true;
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- drawSideArrows = 0;
- idcLeft = -1;
- idcRight = -1;
- };
-
- class QuikViewLog: InjuryList {
- idc = 215;
- style = 16;
- type = 102;
- rows=1;
- colorBackground[] = {0, 0, 0, 1};
- x = "21.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "(19.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2))";
- w = "18.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "6.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.0};
-
- columns[] = {0.0, 0.08};
- canDrag=true;
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- drawSideArrows = 0;
- idcLeft = -1;
- idcRight = -1;
- };
-
- class selectTriageStatus: cse_gui_buttonBase {
- idc = 2001;
- x = "13.33 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "16.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12.33 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_CENTER;
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureOver = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.0)";
- action = "[] call cse_fnc_dropDownTriageCard_CMS;";
- };
- class selectTriageStatusNone: selectTriageStatus {
- idc = 2002;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = $STR_CSE_UI_TRIAGE_NONE;
- style = ST_CENTER;
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureOver = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.9)";
- action = "[] call cse_fnc_dropDownTriageCard_CMS; [CSE_SYS_MEDICAL_INTERACTION_TARGET,0] call cse_fnc_setTriageStatus_CMS;";
- };
-
- class selectTriageStatusMinor: selectTriageStatus {
- idc = 2003;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = $STR_CSE_UI_TRIAGE_MINOR;
- style = ST_CENTER;
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- animTextureNormal = "#(argb,8,8,3)color(0,0.5,0,0.9)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0.5,0,0.9)";
- animTextureOver = "#(argb,8,8,3)color(0,0.5,0,0.9)";
- animTextureFocused = "#(argb,8,8,3)color(0,0.5,0,0.9)";
- animTexturePressed = "#(argb,8,8,3)color(0,0.5,0,0.9)";
- animTextureDefault = "#(argb,8,8,3)color(0,0.5,0,0.9)";
- action = "[] call cse_fnc_dropDownTriageCard_CMS; [CSE_SYS_MEDICAL_INTERACTION_TARGET,1] call cse_fnc_setTriageStatus_CMS;";
- };
- class selectTriageStatusDelayed: selectTriageStatus {
- idc = 2004;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = $STR_CSE_UI_TRIAGE_DELAYED;
- style = ST_CENTER;
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- animTextureNormal = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
- animTextureDisabled = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
- animTextureOver = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
- animTextureFocused = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
- animTexturePressed = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
- animTextureDefault = "#(argb,8,8,3)color(0.77,0.51,0.08,0.9)";
- action = "[] call cse_fnc_dropDownTriageCard_CMS; [CSE_SYS_MEDICAL_INTERACTION_TARGET,2] call cse_fnc_setTriageStatus_CMS;";
- };
- class selectTriageStatusImmediate: selectTriageStatus {
- idc = 2005;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = $STR_CSE_UI_TRIAGE_IMMEDIATE;
- style = ST_CENTER;
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- animTextureNormal = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
- animTextureDisabled = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
- animTextureOver = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
- animTextureFocused = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
- animTexturePressed = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
- animTextureDefault = "#(argb,8,8,3)color(1,0.2,0.2,0.9)";
- action = "[] call cse_fnc_dropDownTriageCard_CMS; [CSE_SYS_MEDICAL_INTERACTION_TARGET,3] call cse_fnc_setTriageStatus_CMS;";
- };
- class selectTriageStatusDeceased: selectTriageStatus {
- idc = 2006;
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- text = $STR_CSE_UI_TRIAGE_DECEASED;
- style = ST_CENTER;
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureOver = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.9)";
- animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.9)";
- action = "[] call cse_fnc_dropDownTriageCard_CMS; [CSE_SYS_MEDICAL_INTERACTION_TARGET,4] call cse_fnc_setTriageStatus_CMS;";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_medical/variable_defines.sqf b/TO_MERGE/cse/sys_medical/variable_defines.sqf
deleted file mode 100644
index ae8a5bf509..0000000000
--- a/TO_MERGE/cse/sys_medical/variable_defines.sqf
+++ /dev/null
@@ -1,61 +0,0 @@
-waituntil {!isnil "cse_fnc_defineVariable"};
-// public variables
-
- ["cse_injuryVector",[],true,"cms"] call cse_fnc_defineVariable;
- ["cse_treatedInjuryVector",[],true,"cms"] call cse_fnc_defineVariable;
-
- ["cse_openWounds",[[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0]],true,"cms"] call cse_fnc_defineVariable;
- ["cse_bandagedWounds",[[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0]],true,"cms"] call cse_fnc_defineVariable;
- ["cse_fractures",[[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0],[0,0,0]],true,"cms"] call cse_fnc_defineVariable;
- ["cse_airway", 0, true, "cms"] call cse_fnc_defineVariable;
- ["cse_tourniquets",[0,0,0,0,0,0],true,"cms"] call cse_fnc_defineVariable;
- ["cse_splints",[0,0,0,0,0,0],true,"cms"] call cse_fnc_defineVariable;
- ["cse_isBleeding_CMS",false,true,"cms"] call cse_fnc_defineVariable;
- ["cse_hasPain_CMS",false,true,"cms"] call cse_fnc_defineVariable;
- ["cse_hasLostBlood_CMS",false,true,"cms"] call cse_fnc_defineVariable;
- ["cse_airwayTreated",false,true,"cms"] call cse_fnc_defineVariable;
-
-
- // Airway
- ["cse_airwayOccluded", false, true, "cms"] call cse_fnc_defineVariable;
- ["cse_airwayRespiratoryArrest", false, true, "cms"] call cse_fnc_defineVariable;
- ["cse_airwayCollapsed", false, true, "cms"] call cse_fnc_defineVariable;
- ["cse_airwayStatus", 100, false, "cms"] call cse_fnc_defineVariable;
-
- // logs
- ["cse_quickviewLog_CMS",[],true,"cms"] call cse_fnc_defineVariable;
- ["cse_activityLog_CMS",[],true,"cms"] call cse_fnc_defineVariable;
- ["cse_triageLevel",0,true,"cms"] call cse_fnc_defineVariable;
- ["cse_triageCard",[],true,"cms"] call cse_fnc_defineVariable;
-
-
- ["cse_medicClass",0,true,"cms_static",0,true] call cse_fnc_defineVariable; // should be a persistent variable; must not be removed by a reset all defaults call
- ["cse_medical_facility",0,true,"cms_static",0,true] call cse_fnc_defineVariable; // should be a persistent variable; must not be removed by a reset all defaults call
-
- ["cse_noInstantDeath",false,true,"cms"] call cse_fnc_defineVariable;
- ["cse_cardiacArrest_CMS",false,true,"cms"] call cse_fnc_defineVariable;
-
- // private variables
- ["cse_bloodVolume",100,false,"cms"] call cse_fnc_defineVariable;
- ["cse_bloodIVVolume",0,false,"cms"] call cse_fnc_defineVariable;
- ["cse_plasmaIVVolume",0,false,"cms"] call cse_fnc_defineVariable;
- ["cse_salineIVVolume",0,false,"cms"] call cse_fnc_defineVariable;
-
- ["cse_pain",0,false,"cms"] call cse_fnc_defineVariable;
- ["cse_heartRate",80,false,"cms"] call cse_fnc_defineVariable;
- ["cse_andrenaline",0,false,"cms"] call cse_fnc_defineVariable;
- ["cse_heartRateAdjustments",[],false,"cms"] call cse_fnc_defineVariable;
-
- ["cse_bloodPressure", [80,120],false,"cms"] call cse_fnc_defineVariable;
- ["cse_peripheralResistance", 100,false,"cms"] call cse_fnc_defineVariable;
- ["cse_cardiacOutput", 5.25,false,"cms"] call cse_fnc_defineVariable; // Source for default: http://en.wikipedia.org/wiki/Cardiac_output#Example_values
-
-
- ["cse_givenMorphine",0,false,"cms"] call cse_fnc_defineVariable;
- ["cse_givenAtropine",0,false,"cms"] call cse_fnc_defineVariable;
- ["cse_givenEpinephrine",0,false,"cms"] call cse_fnc_defineVariable;
-
- ["cse_bodyPartStatus",[0,0,0,0,0,0],false,"cms"] call cse_fnc_defineVariable;
- ["cse_bodyPartStatusPrevious_cms",[0,0,0,0,0,0],false,"cms"] call cse_fnc_defineVariable;
-
- ["cse_fnc_unitLoop_CMS",false,false,"cms"] call cse_fnc_defineVariable;
diff --git a/TO_MERGE/cse/sys_misc/CfgFunctions.h b/TO_MERGE/cse/sys_misc/CfgFunctions.h
deleted file mode 100644
index 051d374e3d..0000000000
--- a/TO_MERGE/cse/sys_misc/CfgFunctions.h
+++ /dev/null
@@ -1,9 +0,0 @@
-class CfgFunctions {
- class CSE {
- class ModulesMisc {
- file = "cse\cse_sys_misc\functions";
- class handleDamage_DMG { recompile = 1;};
- class moduleAmbianceSoundLoop { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_misc/CfgVehicles.h b/TO_MERGE/cse/sys_misc/CfgVehicles.h
deleted file mode 100644
index d2945620e1..0000000000
--- a/TO_MERGE/cse/sys_misc/CfgVehicles.h
+++ /dev/null
@@ -1,151 +0,0 @@
-class CfgVehicles
-{
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class cse_adjust_stamina: Module_F {
- scope = 2;
- displayName = "Adjust Stamina [CSE]";
- icon = "\cse\cse_main\data\cse_medical_module.paa";
- category = "cseMisc";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class adjustment {
- displayName = "Adjustment";
- description = "How fast should the stamina be adjusted?";
- typeName = "NUMBER";
- defaultValue = 1;
- };
- };
- class ModuleDescription {
- description = "Custom stamina adjustment module";
- sync[] = {};
- };
- };
- class cse_damage_ai: Module_F {
- scope = 1; // hidden, for backwards compatability
- displayName = "Damage Thredshold AI [CSE]";
- icon = "\cse\cse_main\data\cse_medical_module.paa";
- category = "cse_medical";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class damageThresholdAI {
- displayName = "Damage Threshold AI";
- description = "How much damage does it take for an AI to be killed?";
- typeName = "NUMBER";
- defaultValue = 1;
- };
- class damageThresholdPlayers {
- displayName = "Damage Threshold Players";
- description = "How much damage does it take for a player to be killed?";
- typeName = "NUMBER";
- defaultValue = 1;
- };
- };
- class ModuleDescription {
- description = "Custom damage threshold module"; // Short description, will be formatted as structured text
- sync[] = {};
- };
- };
-
-
- class cse_moduleDamageSettings: Module_F {
- scope = 2;
- displayName = "Damage Settings [CSE]";
- icon = "\cse\cse_main\data\cse_medical_module.paa";
- category = "cse_medical";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class damageThresholdAI {
- displayName = "Damage Threshold AI";
- description = "How much damage does it take for an AI to be killed?";
- typeName = "NUMBER";
- defaultValue = 1;
- };
- class damageThresholdPlayers {
- displayName = "Damage Threshold Players";
- description = "How much damage does it take for a player to be killed?";
- typeName = "NUMBER";
- defaultValue = 1;
- };
- };
- class ModuleDescription {
- description = "Custom damage threshold module";
- sync[] = {};
- };
- };
-
- class cse_moduleAmbianceSound: Module_F {
- scope = 2;
- displayName = "Ambiance Sounds [CSE]";
- icon = "\cse\cse_main\data\cse_basic_module.paa";
- category = "cseMisc";
- function = "cse_fnc_moduleAmbianceSoundLoop";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "Combat Space Enhancement";
- class Arguments {
- class soundFiles {
- displayName = "Sounds";
- description = "Classnames of the ambiance sounds played. Seperated by ','. ";
- typeName = "STRING";
- defaultValue = "";
- };
- class minimalDistance {
- displayName = "Minimal Distance";
- description = "Minimal Distance";
- typeName = "NUMBER";
- defaultValue = 400;
- };
- class maximalDistance {
- displayName = "Maximal Distance";
- description = "Maximal Distance";
- typeName = "NUMBER";
- defaultValue = 900;
- };
- class minimalDelay {
- displayName = "Minimal Delay";
- description = "Minimal Delay between sounds played";
- typeName = "NUMBER";
- defaultValue = 10;
- };
- class maximalDelay {
- displayName = "Maximal Delay";
- description = "Maximal Delay between sounds played";
- typeName = "NUMBER";
- defaultValue = 170;
- };
- class followPlayers {
- displayName = "Follow Players";
- description = "Follow players. If set to false, loop will play sounds only nearby logic position.";
- typeName = "BOOL";
- defaultValue = 0;
- };
- class soundVolume {
- displayName = "Volume";
- description = "The volume of the sounds played";
- typeName = "NUMBER";
- defaultValue = 0;
- };
- };
- class ModuleDescription {
- description = "Ambiance sounds loop (synced across MP)";
- sync[] = {};
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_misc/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_misc/Combat_Space_Enhancement.h
deleted file mode 100644
index ef408ddbe6..0000000000
--- a/TO_MERGE/cse/sys_misc/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,32 +0,0 @@
-class Combat_Space_Enhancement {
- class cfgModules {
- class cse_adjust_stamina {
- init = "call compile preprocessFile 'cse\cse_sys_misc\stamina\init.sqf';";
- name = "Stamina adjustment";
- };
- class cse_damage_ai {
- init = "call compile preprocessFile 'cse\cse_sys_misc\damage\init.sqf';";
- name = "Damage thresholds for AI";
- class EventHandlers {
- class CAManBase {
- handleDamage = "_this call cse_fnc_handleDamage_DMG;";
- };
- };
- };
-
- class cse_moduleDamageSettings {
- init = "call compile preprocessFile 'cse\cse_sys_misc\damage\init.sqf';";
- name = "Damage thresholds for AI and players";
- class EventHandlers {
- class CAManBase {
- handleDamage = "_this call cse_fnc_handleDamage_DMG;";
- };
- };
- };
-
- class cse_moduleRemoveBodyOnDisconnect {
- init = "call compile preprocessFile 'cse\cse_sys_misc\moduleRemoveBodyOnDisconnect.sqf';";
- name = "Remove Player bodies on disconnect";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_misc/config.cpp b/TO_MERGE/cse/sys_misc/config.cpp
deleted file mode 100644
index 21223915df..0000000000
--- a/TO_MERGE/cse/sys_misc/config.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-class CfgPatches {
- class cse_sys_misc {
- units[] = {""};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_gui","cse_main", "cse_f_modules", "cse_f_eh"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_misc {
- list[] = {"cse_sys_misc"};
- };
- };
-};
-#include "CfgFunctions.h"
-#include "CfgVehicles.h"
-#include "Combat_Space_Enhancement.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_misc/damage/init.sqf b/TO_MERGE/cse/sys_misc/damage/init.sqf
deleted file mode 100644
index ee09a538e4..0000000000
--- a/TO_MERGE/cse/sys_misc/damage/init.sqf
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-init.sqf
-Usage:
-Author: Glowbal
-
-Arguments:
-Returns:
-
-Affects: Local
-Executes: call
-*/
-
-private ["_args"];
-_args = _this;
-
-CSE_DAMAGE_THRESHOLD_AI_DMG = 1;
-CSE_DAMAGE_THRESHOLD_PLAYERS_DMG = 1;
-{
- _value = _x select 1;
- if (!isnil "_value") then {
- if (_x select 0 == "damageThresholdAI") exitwith {
- CSE_DAMAGE_THRESHOLD_AI_DMG = _x select 1;
- };
- if (_x select 0 == "damageThresholdPlayers") exitwith {
- CSE_DAMAGE_THRESHOLD_PLAYERS_DMG = _x select 1;
- };
- };
-}foreach _args;
-
-
-waituntil {!isnil "cse_main"};
-["cse_damageBodypart_DMG", 0, false, "dmg"] call cse_fnc_defineVariable;
-["cse_damageBodypartPrevious_DMG", 0, false, "dmg"] call cse_fnc_defineVariable;
-
diff --git a/TO_MERGE/cse/sys_misc/functions/fn_handleDamage_DMG.sqf b/TO_MERGE/cse/sys_misc/functions/fn_handleDamage_DMG.sqf
deleted file mode 100644
index a459b70094..0000000000
--- a/TO_MERGE/cse/sys_misc/functions/fn_handleDamage_DMG.sqf
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * handleDamage_DMG.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_unit","_selectionName","_amountOfDamage", "_previousDamage", "_totalDamage"];
-_unit = _this select 0;
-_selectionName = _this select 1;
-_amountOfDamage = _this select 2;
-
-if (_amountOfDamage > 0.9 && {alive _unit}) then {
- _amountOfDamage = 0.9;
-};
-
-if !(["cse_sys_medical"] call cse_fnc_isModuleEnabled_F) then {
- if !(isPlayer _unit) then {
- if (_amountOfDamage >= CSE_DAMAGE_THRESHOLD_AI_DMG) then {
- [_unit] call cse_fnc_setDead;
- _amountOfDamage = 1;
- };
- } else {
- if (_amountOfDamage >= CSE_DAMAGE_THRESHOLD_PLAYERS_DMG) then {
- [_unit] call cse_fnc_setDead;
- _amountOfDamage = 1;
- };
- };
-} else {
- // let CMS handle the damage
- if (([_unit] call cse_fnc_hasMedicalEnabled_CMS)) exitwith {
-
- };
-
- _previousDamage = [_unit,"cse_damageBodypartPrevious_DMG", 0] call cse_fnc_getVariable;
- [_unit,"cse_bodyPartStatusPrevious", _amountOfDamage - _previousDamage] call cse_fnc_setVariable;
-
-
- _totalDamage = [_unit,"cse_damageBodypart_DMG", 0] call cse_fnc_getVariable;
- _totalDamage = _totalDamage + (_amountOfDamage - _previousDamage);
- [_unit,"cse_damageBodypart_DMG",_totalDamage] call cse_fnc_setVariable;
-
-
- // we will handle it here.
- if !(isPlayer _unit) then {
- if (_totalDamage >= CSE_DAMAGE_THRESHOLD_AI_DMG) then {
- [_unit] call cse_fnc_setDead;
- _amountOfDamage = 1;
- };
- } else {
- if (_totalDamage >= CSE_DAMAGE_THRESHOLD_PLAYERS_DMG) then {
- [_unit] call cse_fnc_setDead;
- _amountOfDamage = 1;
- };
- };
-};
-
-_amountOfDamage
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_misc/stamina/init.sqf b/TO_MERGE/cse/sys_misc/stamina/init.sqf
deleted file mode 100644
index 8f0ef44fa7..0000000000
--- a/TO_MERGE/cse/sys_misc/stamina/init.sqf
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * init.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_args"];
-_args = _this;
-
-CSE_STAMINA_ADJUSTMENT_STM = 1;
-
-{
- _value = _x select 1;
- if (!isnil "_value") then {
- if (_x select 0 == "adjustment") then {
- CSE_STAMINA_ADJUSTMENT_STM = _x select 1;
- };
- };
-}foreach _args;
-
-if (!hasInterface) exitwith {};
-waituntil{!isnil "cse_gui" && !isnil "cse_main"};
-
-if (CSE_STAMINA_ADJUSTMENT_STM > 0) then {
- ["cse_adjust_stamina", [], {
- _currentStamina = getFatigue player;
- _difference = _currentStamina - _previousStamina;
- if (_difference > 0) then {
- _difference = _difference * CSE_STAMINA_ADJUSTMENT_STM;
- player setFatigue (_previousStamina + _difference);
- _previousStamina = (_previousStamina + _difference);
- } else {
- _previousStamina = _currentStamina;
- };
- }] call cse_fnc_addTaskToPool_f;
-
-} else {
- player enableFatigue false;
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/CfgEventHandlers.hpp b/TO_MERGE/cse/sys_nametags/CfgEventHandlers.hpp
deleted file mode 100644
index ab75a246bb..0000000000
--- a/TO_MERGE/cse/sys_nametags/CfgEventHandlers.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class Extended_PreInit_EventHandlers {
- class ADDON {
- init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) );
- };
-};
-
-class Extended_PostInit_EventHandlers {
- class ADDON {
- init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_postInit.sqf) );
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/CfgVehicles.hpp b/TO_MERGE/cse/sys_nametags/CfgVehicles.hpp
deleted file mode 100644
index a0d8133e8a..0000000000
--- a/TO_MERGE/cse/sys_nametags/CfgVehicles.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// TODO Check what faction classes are available within ACE and move this to a core pbo
-class CfgFactionClasses
-{
- class NO_CATEGORY;
- class ACEMisc: NO_CATEGORY {
- displayName = "ACE Misc Modules";
- };
-};
-
-
-class CfgVehicles
-{
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class GVAR(Module): Module_F {
- scope = 2;
- displayName = $STR_ACE_NameTags_Title;
- icon = QUOTE(PATHOF(data\module_icon.paa));
- category = "ACEMisc";
- function = QUOTE(FUNC(initalizeModule));
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- class enableModule {
- displayName = $STR_ACE_NameTags_Arg_enable;
- description = $STR_ACE_NameTags_Arg_enable_Desc;
- typeName = "BOOL";
- defaultValue = 0;
- };
- class indirectDistance {
- displayName = $STR_ACE_NameTags_Arg_indirectDistance;
- description = $STR_ACE_NameTags_Arg_indirectDistance_Desc;
- typeName = "NUMBER";
- defaultValue = 7.5;
- };
- class cursorTargetDistance {
- displayName = $STR_ACE_NameTags_Arg_directDistance;
- description = $STR_ACE_NameTags_Arg_directDistance_Desc;
- typeName = "NUMBER";
- defaultValue = 20;
- };
- class allowDifferentSides {
- displayName = $STR_ACE_NameTags_Arg_differentSides;
- description = $STR_ACE_NameTags_Arg_differentSides_Desc;
- typeName = "BOOL";
- defaultValue = 0;
- };
- class enableSoundWaves {
- displayName = $STR_ACE_NameTags_Arg_soundWaves;
- description = $STR_ACE_NameTags_Arg_soundWaves_Desc;
- typeName = "BOOL";
- defaultValue = 0;
- };
- };
- class ModuleDescription {
- description = $STR_ACE_NameTags_ModuleDesc;
- sync[] = {};
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/XEH_postInit.sqf b/TO_MERGE/cse/sys_nametags/XEH_postInit.sqf
deleted file mode 100644
index 97b6926c5b..0000000000
--- a/TO_MERGE/cse/sys_nametags/XEH_postInit.sqf
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * XEH_postInit.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-if (!hasInterface) exitwith {}; // No need for this module on HC or dedicated server.
-
-#include "script_component.hpp"
-
-// Settings
-if (isNil QUOTE(ACE_NameTagsModule)) then {
- GVAR(INDIRECT_TAGS_DISTANCE) = 7.5;
- GVAR(DIRECT_TAG_DISTANCE) = 20;
- GVAR(ENABLE_SOUNDWAVES) = false;
- GVAR(ALLOW_OWN_SIDE_ONLY) = true;
- GVAR(ENABLE_MODULE) = true;
-};
-
-// In case the module has been placed and the enable setting has been put to false
-if (!GVAR(ENABLE_MODULE)) exitwith {};
-
-// Client side options
-// TODO Implement a framework for adjusting client side settings.
-GVAR(DRAW_TAG_ICONS) = true;
-GVAR(ENABLE_INDIRECT) = false;
-GVAR(TAG_DISPLAY_COLOR) = [1,1,1,1];
-GVAR(SHOW_SOUNDWAVES) = false;
-GVAR(DISPLAY_RANK) = false;
-
-// If the distance values are set incorrectly, ensure we handle this
-if (GVAR(DIRECT_TAG_DISTANCE) < GVAR(INDIRECT_TAGS_DISTANCE)) then {
- GVAR(DIRECT_TAG_DISTANCE) = GVAR(INDIRECT_TAGS_DISTANCE);
-};
-
-// If both are below 1m, exit because they will not show up.
-if (GVAR(DIRECT_TAG_DISTANCE) < 1) exitwith {};
-
-// Draw the icons for each nametag
-// TODO Look into replacement with cutRsc instead of icon3d
-addMissionEventHandler ["Draw3D", FUNC(drawNameTags)];
-
-if (GVAR(ENABLE_SOUNDWAVES)) then {
-
- GVAR(SOUNDWAVE_ICONS) = [QUOTE(PATHTOF(data\soundwaves\soundwave1.paa)),QUOTE(PATHTOF(data\soundwaves\soundwave2.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave3.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave4.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave5.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave6.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave7.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave8.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave9.paa)), QUOTE(PATHTOF(data\soundwaves\soundwave_silent.paa))];
-
- // TODO Implement function for checking if an addon is loaded
- //if (["task_force_radio"] call ace_fnc_isModLoaded_F) then {
- if (isnil "TFAR_fnc_isSpeaking") then {
- TFAR_fnc_isSpeaking = { if (!isnil "TF_tangent_lr_pressed") then {(TF_tangent_lr_pressed || TF_tangent_sw_pressed || TF_tangent_dd_pressed)} else { false }; };
- };
- //};
-
- // TODO Move to unscheduled environment with PFH
- [] spawn {
- waituntil{
- waituntil {alive player};
- /*ACE_player*/ player call FUNC(handleSpeaking);
- !GVAR(ENABLE_SOUNDWAVES); // exit when the soundwaves have been disabled
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/XEH_preInit.sqf b/TO_MERGE/cse/sys_nametags/XEH_preInit.sqf
deleted file mode 100644
index 702a785859..0000000000
--- a/TO_MERGE/cse/sys_nametags/XEH_preInit.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * XEH_preInit.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#include "script_component.hpp"
-
-PREP(drawNameTags);
-PREP(findNearbyUnits);
-PREP(handleSpeaking);
-PREP(allowSide);
-PREP(initalizeModule);
diff --git a/TO_MERGE/cse/sys_nametags/config.cpp b/TO_MERGE/cse/sys_nametags/config.cpp
deleted file mode 100644
index 8a90482389..0000000000
--- a/TO_MERGE/cse/sys_nametags/config.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ACE_gui","ACE_main"};
- version = VERSION;
- author[] = {$STR_ACE_Core_ACETeam};
- authorUrl = "http://ACEmod.com"; // TODO website link?
- };
-};
-
-class CfgAddons {
- class PreloadAddons {
- class ADDON {
- list[] = {QUOTE(ADDON)};
- };
- };
-};
-
-#include "CfgVehicles.hpp"
-#include "CfgEventHandlers.hpp"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/data/empty.paa b/TO_MERGE/cse/sys_nametags/data/empty.paa
deleted file mode 100644
index a354c7eb38..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/empty.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/module_icon.paa b/TO_MERGE/cse/sys_nametags/data/module_icon.paa
deleted file mode 100644
index 1710ef74c9..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/module_icon.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave1.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave1.paa
deleted file mode 100644
index ce4f85eb69..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave1.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave2.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave2.paa
deleted file mode 100644
index 0bc59cde24..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave2.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave3.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave3.paa
deleted file mode 100644
index 39f3e8e95b..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave3.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave4.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave4.paa
deleted file mode 100644
index 7ab8b6d944..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave4.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave5.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave5.paa
deleted file mode 100644
index f3e98d47aa..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave5.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave6.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave6.paa
deleted file mode 100644
index 3f29976c9f..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave6.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave7.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave7.paa
deleted file mode 100644
index e705c70b42..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave7.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave8.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave8.paa
deleted file mode 100644
index e6027d878a..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave8.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave9.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave9.paa
deleted file mode 100644
index 91ddfd02df..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave9.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave_silent.paa b/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave_silent.paa
deleted file mode 100644
index 27f34b38ab..0000000000
Binary files a/TO_MERGE/cse/sys_nametags/data/soundwaves/soundwave_silent.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_nametags/functions/fnc_allowSide.sqf b/TO_MERGE/cse/sys_nametags/functions/fnc_allowSide.sqf
deleted file mode 100644
index d28c9a336d..0000000000
--- a/TO_MERGE/cse/sys_nametags/functions/fnc_allowSide.sqf
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * fn_allowSide_TAGS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: side
- * @Return:
- * @PublicAPI: false
- */
-#include "script_component.hpp"
-
-if (GVAR(ALLOW_OWN_SIDE_ONLY)) exitwith {
- _this == playerSide; /* side ACE_player */
-};
-((_this getFriend playerSide /* side ACE_player */ ) >= 0.6);
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/functions/fnc_drawNameTags.sqf b/TO_MERGE/cse/sys_nametags/functions/fnc_drawNameTags.sqf
deleted file mode 100644
index da05c477e4..0000000000
--- a/TO_MERGE/cse/sys_nametags/functions/fnc_drawNameTags.sqf
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * fn_drawNameTags_TAGS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-#include "script_component.hpp"
-#define FONT "EtelkaMonospacePro"
-
-private ["_cursor","_soundWaves", "_nameOfUnit","_pos","_color", "_nearbyUnits", "_iconOptions", "_iconSets", "_unit", "_colorOfIcon", "_nearObj"];
-if (visibleMap || !GVAR(DRAW_TAG_ICONS)) exitwith {};
-
-_nearObj = if (isNull curatorCamera) then {/* ACE_player */ if (isNull (missionnamespace getvariable ["bis_fnc_moduleRemoteControl_unit",objnull])) then { player} else {(missionnamespace getvariable ["bis_fnc_moduleRemoteControl_unit",objnull]) }; } else { curatorCamera };
-
-if (GVAR(ENABLE_INDIRECT)) then {
- {
- _nameOfUnit = _x select 0;
- _pos = _x select 1;
- _color = _x select 2;
- _unit = _x select 3;
- _iconDrawn = QUOTE(PATHTOF(data\empty.paa));
- if (_unit getvariable [QGVAR(isSpeaking),false] && GVAR(SHOW_SOUNDWAVES)) then {
- _iconDrawn = (GVAR(SOUNDWAVE_ICONS) select ((round(random (count GVAR(SOUNDWAVE_ICONS) - 1)))));
- };
- drawIcon3D [_iconDrawn,_color, _pos, 2, 2, 1 ,toUpper _nameOfUnit, 1, 0.03, FONT];
- false;
- }count (_nearObj call FUNC(findNearbyUnits));
-};
-
-_cursor = cursortarget;
-if (_cursor == _cursor && isTouchingGround _cursor) then {
- if (_cursor isKindOf "CAManBase" && ((_cursor distance _nearObj) < GVAR(DIRECT_TAG_DISTANCE)) && ((side _cursor) call FUNC(allowSide))) then {
-
- // TODO Improve this switch statement
- _pos = visiblePositionASL _cursor;
- switch (stance _cursor) do {
- case "STAND": {
- _pos set [2, ((_cursor modelToWorld [0,0,0]) select 2)+2];
- };
- case "CROUCH": {
- _pos set [2, ((_cursor modelToWorld [0,0,0]) select 2)+1.5];
- };
- case "PRONE": {
- _pos set [2, ((_cursor modelToWorld [0,0,0]) select 2)+0.5];
- };
- default {
- _pos set [2, ((_cursor modelToWorld [0,0,0]) select 2) + 1.5];
- };
- };
- _color = +GVAR(TAG_DISPLAY_COLOR);
-
- _nameOfUnit = name _cursor; //[_cursor] call FUNC(getName); // TODO Implement a getName function
- // TODO implement module checking
- /*if (ACE_NameTags_SYS_MEDICAL_SYSTEM_ENABLED_TAGS) then {
- _status = [_cursor] call FUNC(getTriageStatus_CMS);
- if ((_status select 1) >0) then {
- _nameOfUnit = _nameOfUnit + " ["+ (_status select 0) + "]";
- _color = _status select 2;
- };
- };*/
- _iconDrawn = QUOTE(PATHTOF(data\empty.paa));
- if (_unit getvariable [QGVAR(isSpeaking),false] && GVAR(SHOW_SOUNDWAVES)) then {
- _iconDrawn = (GVAR(SOUNDWAVE_ICONS) select ((round(random (count GVAR(SOUNDWAVE_ICONS) - 1)))));
- };
- drawIcon3D [_iconDrawn,_color, _pos, 2, 2, 1 ,toUpper _nameOfUnit, 1, 0.03, FONT];
-
- };
-};
diff --git a/TO_MERGE/cse/sys_nametags/functions/fnc_findNearbyUnits.sqf b/TO_MERGE/cse/sys_nametags/functions/fnc_findNearbyUnits.sqf
deleted file mode 100644
index 122823c46c..0000000000
--- a/TO_MERGE/cse/sys_nametags/functions/fnc_findNearbyUnits.sqf
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * fn_findNearbyUnits_TAGS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#include "script_component.hpp"
-
-private ["_info", "_nameOfUnit", "_color", "_isTalking", "_pos", "_nearest"];
-_info = [];
-if (alive player) then {
- _nearest = (_this nearEntities [["CAManBase"], GVAR(INDIRECT_TAGS_DISTANCE)]);
- {
- if (_x != _this && (vehicle _x == _x) && isTouchingGround _X) then {
- if (lineIntersects [eyePos _this, eyePos _x, _x, _this]) exitwith{};
- if ((side _x) call FUNC(allowSide) && !(_x == cursortarget)) then {
- _nameOfUnit = name _x;
- if (_x getvariable ["ACE_isDead",false]) then { // TODO, how do we check for dead units?
- _nameOfUnit = _unit getvariable ["ACE_name","Unknown"]; // TODO is there are function to get the name of a unit?
- };
- _pos = visiblePositionASL _x;
-
- // TODO This can be done better
- switch (stance _x) do {
- case "STAND": {
- _pos set [2, ((_x modelToWorld [0,0,0]) select 2)+2];
- };
- case "CROUCH": {
- _pos set [2, ((_x modelToWorld [0,0,0]) select 2)+1.5];
- };
- case "PRONE": {
- _pos set [2, ((_x modelToWorld [0,0,0]) select 2) + 0.5];
- };
- default {
- _pos set [2, ((_x modelToWorld [0,0,0]) select 2) + 1.5];
- };
- };
-
- _color = +GVAR(TAG_DISPLAY_COLOR);
- _color set [3, 0];
- _isTalking = (_x getvariable [QGVAR(isSpeaking),false]);
-
- // TODO implement module checking
- /*if (ACE_NameTags_SYS_MEDICAL_SYSTEM_ENABLED_TAGS) then {
- _status = [_x] call FUNC(getTriageStatus_CMS;
- if ((_status select 1) >0) then {
- _nameOfUnit = _nameOfUnit + " ["+ (_status select 0) + "]";
- _color = _status select 2;
- };
- };*/
- if (GVAR(DISPLAY_RANK)) then {
- _nameOfUnit = (rank _x) + " " + _nameOfUnit;
- };
- _color set [3,(1-((_x distance _this) / GVAR(INDIRECT_TAGS_DISTANCE))) + 0.05];
- _info pushback [_nameOfUnit, _pos, _color, _x];
- };
- };
- }foreach _nearest;
-};
-
-_info;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/functions/fnc_handleSpeaking.sqf b/TO_MERGE/cse/sys_nametags/functions/fnc_handleSpeaking.sqf
deleted file mode 100644
index a61f810969..0000000000
--- a/TO_MERGE/cse/sys_nametags/functions/fnc_handleSpeaking.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * fn_handleSpeaking_TAGS.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-#include "script_component.hpp"
-
-// TODO Implement a check mod loaded function
-#define ACTION_PUSH_TO_TALK_PRESSED (inputAction "PushToTalk" > 0)
-#define ACTION_TFAR_RADIO_ACTIVE false // [] call {if (["task_force_radio"] call FUNC(isModLoaded_F)) then {player call TFAR_fnc_isSpeaking} else { false };}
-#define ACTION_ACRE_RADIO_ACTIVE false // [] call {if (["acre_api"] call FUNC(isModLoaded_F)) then {[player] call ACRE_api_fnc_isBroadcasting} else { false };}
-
-private ["_unit"];
-_unit = _this select 0;
-
-if (_unit != player /* _unit != ACE_Player */) exitwith {};
-
-// TODO check mod loaded function
-/*if (["task_force_radio"] call FUNC(isModLoaded_F)) then {
- waituntil {!isnil "TF_tangent_lr_pressed"};
-};*/
-
-waituntil {
- if (ACTION_TFAR_RADIO_ACTIVE || ACTION_PUSH_TO_TALK_PRESSED || ACTION_ACRE_RADIO_ACTIVE) then {
- if !(_unit getvariable [QGVAR(isSpeaking), false]) then {
- _unit setvariable [QGVAR(isSpeaking), true, true];
- };
- } else {
- if (_unit getvariable [QGVAR(isSpeaking), false]) then {
- _unit setvariable [QGVAR(isSpeaking), false, true];
- };
- };
- !(alive _unit) /* _unit != ACE_Player */
-};
-
-_unit setvariable [QGVAR(isSpeaking),nil,true];
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/functions/fnc_initalizeModule.sqf b/TO_MERGE/cse/sys_nametags/functions/fnc_initalizeModule.sqf
deleted file mode 100644
index 7db37789db..0000000000
--- a/TO_MERGE/cse/sys_nametags/functions/fnc_initalizeModule.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * fnc_initalizeModule.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#include "script_component.hpp"
-
-if (!hasInterface) exitwith {}; // No need for this module on HC or dedicated server.
-
-private ["_logic"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
-if (!isNull _logic) then {
- // TODO default values should be defined somewhere through an include, so they are the same in CfgVehicles and here.
- GVAR(ENABLE_MODULE) = _logic getvariable ["enableModule", false];
- GVAR(INDIRECT_TAGS_DISTANCE) = _logic getvariable ["indirectDistance", 7.5];
- GVAR(DIRECT_TAG_DISTANCE) = _logic getvariable ["cursorTargetDistance", 20];
- GVAR(ALLOW_OWN_SIDE_ONLY) = !(_logic getvariable ["allowDifferentSides", false]);
- GVAR(ENABLE_SOUNDWAVES) = _logic getvariable ["enableSoundWaves", false];
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/script_component.hpp b/TO_MERGE/cse/sys_nametags/script_component.hpp
deleted file mode 100644
index 4637f8de75..0000000000
--- a/TO_MERGE/cse/sys_nametags/script_component.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#define COMPONENT nametags
-#include "\z\ace\addons\main\script_mod.hpp"
-
-#ifdef DEBUG_ENABLED_NAMETAGS
- #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_NAMETAGS
- #define DEBUG_SETTINGS DEBUG_SETTINGS_NAMETAGS
-#endif
-
-#include "\z\ace\addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_nametags/stringtable.xml b/TO_MERGE/cse/sys_nametags/stringtable.xml
deleted file mode 100644
index 53100d4ceb..0000000000
--- a/TO_MERGE/cse/sys_nametags/stringtable.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
- Name Tags [ACE]
-
-
- Enable Name Tags
-
-
- Enable the name tags
-
-
- Indirect Distance
-
-
- Distance for indirect Tags
-
-
- Target Distance
-
-
- Distance for the direct Tag (Cursortarget)
-
-
- Enable Soundwaves
-
-
- Enable Soundwaves when a player is speaking
-
-
- Allow Different sides
-
-
- Allow name tags for all friendly sides, instead of only player side
-
-
- Adjust the name tags settings.
-
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/CfgFunctions.h b/TO_MERGE/cse/sys_vehicles/CfgFunctions.h
deleted file mode 100644
index edaf4839e6..0000000000
--- a/TO_MERGE/cse/sys_vehicles/CfgFunctions.h
+++ /dev/null
@@ -1,17 +0,0 @@
-class CfgFunctions {
- class CSE {
- class VehicleInteraction
- {
- file = "cse\cse_sys_vehicles\functions";
- class openMenu_VEH { recompile = 1; };
- class onMenuOpen_VEH { recompile = 1; };
- class displayOptions_VEH { recompile = 1; };
- class updateInformationList_VEH { recompile = 1; };
- class getSelectedData_VEH { recompile = 1; };
- class getCrewOptions_VEH { recompile = 1; };
- class getCargoOptions_VEH { recompile = 1; };
- class getRepairOptions_VEH { recompile = 1; };
- class replaceBatteryDarter_VEH { recompile = 1; };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_vehicles/CfgWeapons.h b/TO_MERGE/cse/sys_vehicles/CfgWeapons.h
deleted file mode 100644
index 135aad0972..0000000000
--- a/TO_MERGE/cse/sys_vehicles/CfgWeapons.h
+++ /dev/null
@@ -1,26 +0,0 @@
-class CfgWeapons {
- class ItemCore;
- class InventoryItem_Base_F;
-
- class cse_battery: ItemCore
- {
- scope=2;
- displayName="Battery";
- model="\cse\cse_sys_vehicles\equipment\battery_darter.p3d";
- picture="\cse\cse_sys_vehicles\equipment\img\battery_dartery.paa";
- descriptionShort="Battery";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=0.01;
- type=201;
- };
- };
-
- class cse_battery_darter: cse_battery
- {
- displayName="Darter Battery";
- model="\cse\cse_sys_vehicles\equipment\battery_darter.p3d";
- picture="\cse\cse_sys_vehicles\equipment\img\battery_darter.paa";
- descriptionShort="Darter Battery";
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_vehicles/Combat_Space_Enhancement.h
deleted file mode 100644
index 435bc34323..0000000000
--- a/TO_MERGE/cse/sys_vehicles/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1 +0,0 @@
-class Combat_Space_Enhancement {};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/UI.h b/TO_MERGE/cse/sys_vehicles/UI.h
deleted file mode 100644
index e5276de4b6..0000000000
--- a/TO_MERGE/cse/sys_vehicles/UI.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "ui\define.hpp"
-#include "ui\menu.hpp"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/config.cpp b/TO_MERGE/cse/sys_vehicles/config.cpp
deleted file mode 100644
index c99c763b90..0000000000
--- a/TO_MERGE/cse/sys_vehicles/config.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#define _ARMA_
-class CfgPatches
-{
- class cse_sys_vehicles
- {
- units[] = {};
- weapons[] = {};
- requiredVersion = 0.1;
- requiredAddons[] = {"cse_gui","cse_main"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-class CfgAddons {
- class PreloadAddons {
- class cse_sys_vehicles {
- list[] = {"cse_sys_vehicles"};
- };
- };
-};
-#include "CfgFunctions.h"
-#include "UI.h"
-#include "Combat_Space_Enhancement.h"
-
-#include "CfgWeapons.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/data/icons/icon_cargo.paa b/TO_MERGE/cse/sys_vehicles/data/icons/icon_cargo.paa
deleted file mode 100644
index dd82cbbad3..0000000000
Binary files a/TO_MERGE/cse/sys_vehicles/data/icons/icon_cargo.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_vehicles/data/icons/icon_crew.paa b/TO_MERGE/cse/sys_vehicles/data/icons/icon_crew.paa
deleted file mode 100644
index b5d8d0fa7a..0000000000
Binary files a/TO_MERGE/cse/sys_vehicles/data/icons/icon_crew.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_vehicles/data/icons/icon_repair.paa b/TO_MERGE/cse/sys_vehicles/data/icons/icon_repair.paa
deleted file mode 100644
index 54b61f6b10..0000000000
Binary files a/TO_MERGE/cse/sys_vehicles/data/icons/icon_repair.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_vehicles/equipment/battery_darter.p3d b/TO_MERGE/cse/sys_vehicles/equipment/battery_darter.p3d
deleted file mode 100644
index 2768e0d1e7..0000000000
Binary files a/TO_MERGE/cse/sys_vehicles/equipment/battery_darter.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_vehicles/equipment/data/battery_darter.rvmat b/TO_MERGE/cse/sys_vehicles/equipment/data/battery_darter.rvmat
deleted file mode 100644
index 397e78345c..0000000000
--- a/TO_MERGE/cse/sys_vehicles/equipment/data/battery_darter.rvmat
+++ /dev/null
@@ -1,68 +0,0 @@
-ambient[]={1,1,1,1};
-diffuse[]={1,1,1,1};
-forcedDiffuse[]={0,0,0,0};
-emmisive[]={0,0,0,1};
-specular[]={0.70399898,0.70399898,0.70399898,0};
-specularPower=70;
-PixelShaderID="Super";
-VertexShaderID="Super";
-class Stage2
-{
- texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage3
-{
- texture="#(argb,8,8,3)color(0,0,0,0,MC)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage4
-{
- texture="#(argb,8,8,3)color(1,1,1,1,AS)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage5
-{
- texture="#(argb,8,8,3)color(0,0.05,1,1,SMDI)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
-class Stage6
-{
- texture="#(ai,32,128,1)fresnel(0.98,1.02)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1,0,0};
- up[]={0,1,0};
- dir[]={0,0,0};
- pos[]={0,0,0};
- };
-};
diff --git a/TO_MERGE/cse/sys_vehicles/equipment/data/battery_darter_co.paa b/TO_MERGE/cse/sys_vehicles/equipment/data/battery_darter_co.paa
deleted file mode 100644
index f50a36ca01..0000000000
Binary files a/TO_MERGE/cse/sys_vehicles/equipment/data/battery_darter_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_vehicles/equipment/img/battery_darter.paa b/TO_MERGE/cse/sys_vehicles/equipment/img/battery_darter.paa
deleted file mode 100644
index a3ba2cdf80..0000000000
Binary files a/TO_MERGE/cse/sys_vehicles/equipment/img/battery_darter.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_displayOptions_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_displayOptions_VEH.sqf
deleted file mode 100644
index 8d2debb604..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_displayOptions_VEH.sqf
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * fn_displayOptions_VEH.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-#define START_IDC 20
-#define END_IDC 27
-#define AMOUNT_OF_ENTRIES (count _entries)
-
-private ["_name","_display","_ctrl","_counter","_code"];
-
-_name = _this select 0;
-if (isDedicated) exitwith{};
-_entries = switch (_name) do {
- case "crew": {[_name] call cse_fnc_getCrewOptions_VEH};
- case "cargo": {[_name] call cse_fnc_getCargoOptions_VEH};
- case "repair": {[_name] call cse_fnc_getRepairOptions_VEH};
- default {[]};
-};
-CSE_LATEST_DISPLAY_OPTION_MENU_VEH = _name;
-
-disableSerialization;
-_display = uiNamespace getVariable 'cse_sys_vehicleMenu';
-for [{_x=START_IDC},{_x <= END_IDC},{_x=_x+1}] do {
- _ctrl = (_display displayCtrl (_x));
- _ctrl ctrlSetText "";
- //_ctrl ctrlSetPosition[-100,-100];
- _ctrl ctrlShow false;
- _ctrl ctrlSetEventHandler ["ButtonClick",""];
- _ctrl ctrlSetTooltip "";
- _ctrl ctrlCommit 0;
-};
-
-_counter = 0;
-{
- //player sidechat format["TRIGGERED: %1",_x];
- if (_counter > END_IDC) exitwith {};
- _ctrl = (_display displayCtrl (START_IDC + _counter));
- if (!(_counter > AMOUNT_OF_ENTRIES)) then {
- _ctrl ctrlSetText (_x select 0);
- _code = format["[CSE_SYS_VEHICLE_INTERACTION_TARGET,PLAYER] call { %1 };",(_x select 1)];
- _ctrl ctrlSetEventHandler ["ButtonClick", _code];
- _ctrl ctrlSetTooltip (_x select 2);
- _ctrl ctrlShow true;
- } else {
- _ctrl ctrlSetText "";
- _ctrl ctrlSetEventHandler ["ButtonClick",""];
- };
- _ctrl ctrlCommit 0;
- _counter = _counter + 1;
-}foreach _entries;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_getCargoOptions_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_getCargoOptions_VEH.sqf
deleted file mode 100644
index 1712a4025b..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_getCargoOptions_VEH.sqf
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * fn_getCargoOptions_VEH.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return"];
-_return = [];
-
-//if (CSE_SYS_VEHICLE_INTERACTION_TARGET != (vehicle player)) then {
- if !(CSE_SYS_VEHICLE_INTERACTION_TARGET isKindOf "Man") then {
- if (!isNull([CSE_SYS_VEHICLE_INTERACTION_TARGET] call cse_fnc_getSelectedData_VEH)) then {
-
- _return set [count _return, ["Unload Cargo","CloseDialog 0; [([CSE_SYS_VEHICLE_INTERACTION_TARGET] call cse_fnc_getSelectedData_VEH),CSE_SYS_VEHICLE_INTERACTION_TARGET] call cse_fnc_unloadObject_LOG;","Unload the current selected cargo"]];
- } else {
- _return set [count _return, ["Unload Cargo","hint 'You have to select an item in the list first!';","Unload the current selected cargo"]];
- };
- };
-//};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_getCrewOptions_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_getCrewOptions_VEH.sqf
deleted file mode 100644
index 7a6c3562f0..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_getCrewOptions_VEH.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * fn_getCrewOptions_VEH.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return","_selectedTarget", "_casList"];
-_return = [];
-
-CSE_fnc_dummy = {};
-if !(CSE_SYS_VEHICLE_INTERACTION_TARGET isKindOf "CaManBase") then {
- _selectedTarget = ([CSE_SYS_VEHICLE_INTERACTION_TARGET] call cse_fnc_getSelectedData_VEH);
- if (!isNull _selectedTarget) then {
- if (["cse_sys_medical"] call cse_fnc_isModuleEnabled_F) then {
- if (!([_selectedTarget] call cse_fnc_isAwake)) then {
- _return pushback ["Unload Casualty","[player,([CSE_SYS_VEHICLE_INTERACTION_TARGET] call cse_fnc_getSelectedData_VEH)] call cse_fnc_unload_CMS;","Unload Casualty"];
- };
- _return pushback ["Medical Menu","private ['_cmsTarget']; _cmsTarget = ([CSE_SYS_VEHICLE_INTERACTION_TARGET] call cse_fnc_getSelectedData_VEH); closeDialog 314436; [_cmsTarget] call cse_fnc_openMenu_CMS;","Open the CMS Medical Menu for selected unit"];
- };
-
- if (["cse_sys_advanced_interaction"] call cse_fnc_isModuleEnabled_F) then {
- if ([_selectedTarget] call cse_fnc_isArrested) then {
- _return pushback ["Unload Detainee","[player,([CSE_SYS_VEHICLE_INTERACTION_TARGET] call cse_fnc_getSelectedData_VEH)] call cse_fnc_unload_AIM;","Unload Detainee"];
- };
- };
- };
-};
-
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_getRepairOptions_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_getRepairOptions_VEH.sqf
deleted file mode 100644
index 5fb8bc681d..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_getRepairOptions_VEH.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * fn_getRepairOptions_VEH.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_return"];
-_return = [];
-
-if (CSE_SYS_VEHICLE_INTERACTION_TARGET != (vehicle player)) then {
- if (CSE_SYS_VEHICLE_INTERACTION_TARGET isKindOf "CAR") then {
- //_return set [count _return, ["Replace Tires","[_this select 0,_this select 1] call CSE_fnc_dummy;","Replace the tires of this vehicle"]];
- };
- if ((CSE_SYS_VEHICLE_INTERACTION_TARGET isKindOf "B_UAV_01_F" || CSE_SYS_VEHICLE_INTERACTION_TARGET isKindOf "O_UAV_01_F" || CSE_SYS_VEHICLE_INTERACTION_TARGET isKindOf "G_UAV_01_F") && ([player, "cse_battery_darter"] call cse_fnc_hasItem) && (fuel CSE_SYS_VEHICLE_INTERACTION_TARGET < 1)) then {
- _return pushback ["Replace Battery","[_this select 0,_this select 1] call cse_fnc_replaceBatteryDarter_veh;","Replace battery of the Darter"];
- };
-};
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_getSelectedData_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_getSelectedData_VEH.sqf
deleted file mode 100644
index 3080093114..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_getSelectedData_VEH.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * fn_getSelectedData_VEH.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_veh","_curSelected", "_return","_loaded","_crew"];
-_veh = _this select 0;
- _curSelected = lbCurSel 212;
- _return = ObjNull;
-
- if (_curSelected > -1) then {
- if (CSE_LATEST_DISPLAY_OPTION_MENU_VEH == "cargo") then {
- _loaded = _veh getvariable ["cse_logistics_loadedCargo_LOG",[]];
- if (_curSelected >= count _loaded) exitwith{};
- _return = _loaded select _curSelected;
- };
-
-
- if (CSE_LATEST_DISPLAY_OPTION_MENU_VEH == "crew") then {
- _crew = crew _veh;
- if (_curSelected >= count _crew) exitwith{};
- _return = _crew select _curSelected;
- };
- };
-_return
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_onMenuOpen_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_onMenuOpen_VEH.sqf
deleted file mode 100644
index 08cc1c6099..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_onMenuOpen_VEH.sqf
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * fn_onMenuOpen_VEH.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-_this spawn {
- if (isnil "CSE_LATEST_DISPLAY_OPTION_MENU_VEH") then {
- CSE_LATEST_DISPLAY_OPTION_MENU_VEH = "crew";
- };
- CSE_VEHICLE_INTERACTION_MENU_OPEN = true;
- private ["_display","_target","_previous"];
- _target = CSE_SYS_VEHICLE_INTERACTION_TARGET;
- [CSE_LATEST_DISPLAY_OPTION_MENU_VEH,_target] call cse_fnc_displayOptions_VEH;
-
- // 11 till 18
- disableSerialization;
- _display = uiNamespace getVariable 'cse_sys_vehicleMenu';
- (_display displayCtrl 11) ctrlSetTooltip "Crew";
- (_display displayCtrl 12) ctrlSetTooltip "Cargo";
- (_display displayCtrl 13) ctrlSetTooltip "Damages & Repair";
-
- (_display displayCtrl 1) ctrlSetText format["%1",(getText(configFile >> "Cfgvehicles" >> typeof _target >> "displayName"))];
-
- cse_fnc_updateIcons_VEH = {
- private ["_display","_startIDC","_idc","_options","_name","_amount"];
- disableSerialization;
- _display = uiNamespace getVariable 'cse_sys_vehicleMenu';
- _startIDC = 111;
-
- _options = ["crew","cargo","repair"]; // temp from 118 to 111 (ONLY NEED THIS ONCE FOR NOW);
- for "_idc" from _startIDC to 118 step 1 do
- {
- if (count _options <= (_idc - 111)) exitwith{};
- _name = _options select (_idc - 111);
- _amount = switch (_name) do {
- case "crew": {crew CSE_SYS_VEHICLE_INTERACTION_TARGET};
- case "cargo": {CSE_SYS_VEHICLE_INTERACTION_TARGET getvariable ["cse_logistics_loadedCargo_LOG",[]]};
- case "repair": {[_name] call cse_fnc_getRepairOptions_VEH};
- case "advanced": {[]};
- default {[]};
- };
- if ((count _amount) > 0) then {
- (_display displayCtrl _idc) ctrlSettextColor [1,1,1,1];
- } else {
- (_display displayCtrl _idc) ctrlSettextColor [0.4,0.4,0.4,1];
- };
- };
- };
-
- ["cse_onMenuOpen_Veh", "onEachFrame", {
- [CSE_LATEST_DISPLAY_OPTION_MENU_VEH] call cse_fnc_displayOptions_VEH;
- [CSE_SYS_VEHICLE_INTERACTION_TARGET] call cse_fnc_updateInformationList_VEH;
- [] call cse_fnc_updateIcons_VEH;
- }, [_display]] call BIS_fnc_addStackedEventHandler;
-
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_openMenu_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_openMenu_VEH.sqf
deleted file mode 100644
index dd98511136..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_openMenu_VEH.sqf
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * fn_openMenu_VEH.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_target"];
-if (count _this > 0) then {
- _target = _this select 0;
-
-} else {
- _target = cursortarget;
-};
-if (player == _target) exitwith{};
-CSE_SYS_VEHICLE_INTERACTION_TARGET = _target;
-[player,_target] call cse_fnc_registerInteractingWith;
-createDialog "cse_sys_vehicleMenu";
-
-[_target] spawn {
- waituntil {sleep 0.1; !dialog};
- [player,_this select 0] call cse_fnc_unregisterInteractingWith;
-};
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_replaceBatteryDarter_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_replaceBatteryDarter_VEH.sqf
deleted file mode 100644
index 94039db703..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_replaceBatteryDarter_VEH.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * fn_replaceBatteryDarter_VEH.sqf
- * @Descr: REplace the darter battery
- * @Author: Glowbal
- *
- * @Arguments: [darter OBJECT, unit UNIT]
- * @Return: bool
- * @PublicAPI: false
- */
-
-private ["_uav", "_unit"];
-_uav = _this select 0;
-_unit = _this select 1;
-
-if !(_uav isKindOf "B_UAV_01_F" || _uav isKindOf "O_UAV_01_F" || _uav isKindOf "G_UAV_01_F") exitwith {false;};
-if !([_unit, "cse_battery_darter"] call cse_fnc_hasItem) exitwith {false;};
-
-[_unit, "cse_battery_darter"] call cse_fnc_useItem;
-_uav setFuel 1;
-
-true;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/functions/fn_updateInformationList_VEH.sqf b/TO_MERGE/cse/sys_vehicles/functions/fn_updateInformationList_VEH.sqf
deleted file mode 100644
index 366be83a0f..0000000000
--- a/TO_MERGE/cse/sys_vehicles/functions/fn_updateInformationList_VEH.sqf
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * fn_updateInformationList_VEH.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- */
-
-private ["_veh","_counter","_loaded","_cmsEnabled","_status","_crew", "_display"];
-_veh = _this select 0;
-
-disableSerialization;
-_display = uiNamespace getVariable 'cse_sys_vehicleMenu';
-if (isNil "_display") exitwith {};
-if (isNull _display) exitwith {};
-
-_listBox = (_display displayCtrl 212);
-
-_returnList = [];
-if (CSE_LATEST_DISPLAY_OPTION_MENU_VEH == "cargo") exitwith {
- lbclear _listBox;
- _returnList = _veh getvariable ["cse_logistics_loadedCargo_LOG",[]];
- {
- _listBox lbadd (getText(configFile >> "Cfgvehicles" >> typeof _x >> "displayName"));
- }foreach _returnList;
-};
-
-if (CSE_LATEST_DISPLAY_OPTION_MENU_VEH == "crew") exitwith {
- _returnList = crew _veh;
- _cmsEnabled = ["cse_sys_medical"] call cse_fnc_isModuleEnabled_F;
- lbclear _listBox;
- {
- if (_cmsEnabled) then {
- _status = [_x] call cse_fnc_getTriageStatus_CMS;
- if ((_status select 1) >0) then {
- _nameOfUnit = ([_x] call cse_fnc_getName) + " ["+ (_status select 0) + "]";
- _listBox lbadd _nameOfUnit;
- _listBox lbSetColor [_foreachIndex, _status select 2];
- } else {
- _listBox lbadd ([_x] call cse_fnc_getName);
- };
- } else {
- _listBox lbadd ([_x] call cse_fnc_getName);
- };
- }foreach _returnList;
-
-// waituntil{!(crew _veh isEqualTo _returnList)};
-};
-
-_returnList;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/init.sqf b/TO_MERGE/cse/sys_vehicles/init.sqf
deleted file mode 100644
index 11e767557e..0000000000
--- a/TO_MERGE/cse/sys_vehicles/init.sqf
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * init.sqf
- * @Descr:
- * @Author: Glowbal
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: true
- */
-
-waituntil {!isnil "cse_main"};
-waituntil {!isnil "cse_fnc_defineVariable"};
-
-cse_fnc_interactWithVehicle_Condition = {
-private ["_return"];
- _return = false;
- if (((_this select 0) distance (_this select 1) < 15)) then {
- if (((_this select 1) isKindOf "Car") || ((_this select 1) isKindOf "Air") || ((_this select 1) isKindOf "Tank")) then {
- _return = true;
- };
- };
- _return
-};
-
-_entries = [
- ["Vehicle", {(_this call cse_fnc_interactWithVehicle_Condition) && (vehicle player == player)}, CSE_ICON_PATH + "icon_vehicle.paa",
- {
- closeDialog 0;
- [_this select 1] call cse_fnc_openMenu_VEH;
- }, "Vehicle Interaction"],
-
- ["Vehicle", {(vehicle player != player)}, CSE_ICON_PATH + "icon_vehicle.paa",
- {
- closeDialog 0;
- [vehicle player] call cse_fnc_openMenu_VEH;
- }, "Vehicle Interaction"]
-];
-["ActionMenu","interaction", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/stringtable.xml b/TO_MERGE/cse/sys_vehicles/stringtable.xml
deleted file mode 100644
index 8b718b1eab..0000000000
--- a/TO_MERGE/cse/sys_vehicles/stringtable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/ui/define.hpp b/TO_MERGE/cse/sys_vehicles/ui/define.hpp
deleted file mode 100644
index c521de470f..0000000000
--- a/TO_MERGE/cse/sys_vehicles/ui/define.hpp
+++ /dev/null
@@ -1,797 +0,0 @@
-
-#ifndef CSE_DEFINE_H
-#define CSE_DEFINE_H
-// define.hpp
-
-#define true 1
-#define false 0
-
-#define CT_STATIC 0
-#define CT_BUTTON 1
-#define CT_EDIT 2
-#define CT_SLIDER 3
-#define CT_COMBO 4
-#define CT_LISTBOX 5
-#define CT_TOOLBOX 6
-#define CT_CHECKBOXES 7
-#define CT_PROGRESS 8
-#define CT_HTML 9
-#define CT_STATIC_SKEW 10
-#define CT_ACTIVETEXT 11
-#define CT_TREE 12
-#define CT_STRUCTURED_TEXT 13
-#define CT_CONTEXT_MENU 14
-#define CT_CONTROLS_GROUP 15
-#define CT_SHORTCUTBUTTON 16
-#define CT_XKEYDESC 40
-#define CT_XBUTTON 41
-#define CT_XLISTBOX 42
-#define CT_XSLIDER 43
-#define CT_XCOMBO 44
-#define CT_ANIMATED_TEXTURE 45
-#define CT_OBJECT 80
-#define CT_OBJECT_ZOOM 81
-#define CT_OBJECT_CONTAINER 82
-#define CT_OBJECT_CONT_ANIM 83
-#define CT_LINEBREAK 98
-#define CT_ANIMATED_USER 99
-#define CT_MAP 100
-#define CT_MAP_MAIN 101
-#define CT_LISTNBOX 102
-
-// Static styles
-#define ST_POS 0x0F
-#define ST_HPOS 0x03
-#define ST_VPOS 0x0C
-#define ST_LEFT 0x00
-#define ST_RIGHT 0x01
-#define ST_CENTER 0x02
-#define ST_DOWN 0x04
-#define ST_UP 0x08
-#define ST_VCENTER 0x0c
-
-#define ST_TYPE 0xF0
-#define ST_SINGLE 0
-#define ST_MULTI 16
-#define ST_TITLE_BAR 32
-#define ST_PICTURE 48
-#define ST_FRAME 64
-#define ST_BACKGROUND 80
-#define ST_GROUP_BOX 96
-#define ST_GROUP_BOX2 112
-#define ST_HUD_BACKGROUND 128
-#define ST_TILE_PICTURE 144
-#define ST_WITH_RECT 160
-#define ST_LINE 176
-
-#define ST_SHADOW 0x100
-#define ST_NO_RECT 0x200 // this style works for CT_STATIC in conjunction with ST_MULTI
-#define ST_KEEP_ASPECT_RATIO 0x800
-
-#define ST_TITLE ST_TITLE_BAR + ST_CENTER
-
-// Slider styles
-#define SL_DIR 0x400
-#define SL_VERT 0
-#define SL_HORZ 0x400
-
-#define SL_TEXTURES 0x10
-
-// Listbox styles
-#define LB_TEXTURES 0x10
-#define LB_MULTI 0x20
-#define FontCSE "PuristaMedium"
-
-class cse_gui_backgroundBase {
- type = CT_STATIC;
- idc = -1;
- style = ST_PICTURE;
- colorBackground[] = {0,0,0,0};
- colorText[] = {1, 1, 1, 1};
- font = FontCSE;
- text = "";
- sizeEx = 0.032;
-};
-class cse_gui_editBase
-{
- access = 0;
- type = 2;
- x = 0;
- y = 0;
- h = 0.04;
- w = 0.2;
- colorBackground[] =
- {
- 0,
- 0,
- 0,
- 1
- };
- colorText[] =
- {
- 0.95,
- 0.95,
- 0.95,
- 1
- };
- colorSelection[] =
- {
- "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])",
- "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])",
- 1
- };
- autocomplete = "";
- text = "";
- size = 0.2;
- style = "0x00 + 0x40";
- font = "PuristaMedium";
- shadow = 2;
- sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorDisabled[] =
- {
- 1,
- 1,
- 1,
- 0.25
- };
-};
-
-
-
-class cse_gui_buttonBase {
- idc = -1;
- type = 16;
- style = ST_LEFT;
- text = "";
- action = "";
- x = 0.0;
- y = 0.0;
- w = 0.25;
- h = 0.04;
- size = 0.03921;
- sizeEx = 0.03921;
- color[] = {1.0, 1.0, 1.0, 1};
- color2[] = {1.0, 1.0, 1.0, 1};
- /*colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.5])"};
- colorbackground2[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.4};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- colorFocused[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])", 0.8};
- colorBackgroundFocused[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.8};
- */
-
- colorBackground[] = {1,1,1,0.95};
- colorbackground2[] = {1,1,1,0.95};
- colorDisabled[] = {1,1,1,0.6};
- colorFocused[] = {1,1,1,1};
- colorBackgroundFocused[] = {1,1,1,1};
- periodFocus = 1.2;
- periodOver = 0.8;
- default = false;
- class HitZone {
- left = 0.00;
- top = 0.00;
- right = 0.00;
- bottom = 0.00;
- };
-
- class ShortcutPos {
- left = 0.00;
- top = 0.00;
- w = 0.00;
- h = 0.00;
- };
-
- class TextPos {
- left = 0.002;
- top = 0.0004;
- right = 0.0;
- bottom = 0.00;
- };
- textureNoShortcut = "";
- animTextureNormal = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDisabled = "cse\cse_gui\data\buttonDisabled_gradient.paa";
- animTextureOver = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureFocused = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTexturePressed = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- animTextureDefault = "cse\cse_gui\data\buttonNormal_gradient_top.paa";
- period = 0.5;
- font = FontCSE;
- soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
- soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0};
- soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1};
- soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
- class Attributes {
- font = FontCSE;
- color = "#E5E5E5";
- align = "center";
- shadow = "true";
- };
- class AttributesImage {
- font = FontCSE;
- color = "#E5E5E5";
- align = "left";
- shadow = "true";
- };
-};
-
-class cse_gui_RscProgress {
- type = 8;
- style = 0;
- colorFrame[] = {1,1,1,0.7};
- colorBar[] = {1,1,1,0.7};
- texture = "#(argb,8,8,3)color(1,1,1,0.7)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-};
-
-
-class cse_gui_staticBase {
- idc = -1;
- type = CT_STATIC;
- x = 0.0;
- y = 0.0;
- w = 0.183825;
- h = 0.104575;
- style = ST_LEFT;
- font = FontCSE;
- sizeEx = 0.03921;
- colorText[] = {0.95, 0.95, 0.95, 1.0};
- colorBackground[] = {0, 0, 0, 0};
- text = "";
-};
-
-class RscListBox;
-class cse_gui_listBoxBase : RscListBox{
- type = CT_LISTBOX;
- style = ST_MULTI;
- font = FontCSE;
- sizeEx = 0.03921;
- color[] = {1, 1, 1, 1};
- colorText[] = {0.543, 0.5742, 0.4102, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 1};
- colorSelectBackground2[] = {0.543, 0.5742, 0.4102, 1.0};
- colorDisabled[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", 0.25};
- period = 1.2;
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 1};
- maxHistoryDelay = 1.0;
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- soundSelect[] = {"",0.1,1};
- soundExpand[] = {"",0.1,1};
- soundCollapse[] = {"",0.1,1};
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
- class ScrollBar {
- color[] = {1, 1, 1, 0.6};
- colorActive[] = {1, 1, 1, 1};
- colorDisabled[] = {1, 1, 1, 0.3};
- thumb = "";
- arrowFull = "";
- arrowEmpty = "";
- border = "";
- };
-};
-
-
-class cse_gui_listNBox {
- access = 0;
- type = CT_LISTNBOX;// 102;
- style =ST_MULTI;
- w = 0.4;
- h = 0.4;
- font = FontCSE;
- sizeEx = 0.031;
-
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- columns[] = {0.0};
- color[] = {1, 1, 1, 1};
-
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {0.95, 0.95, 0.95, 1};
- colorSelect[] = {0.95, 0.95, 0.95, 1};
- colorSelect2[] = {0.95, 0.95, 0.95, 1};
- colorSelectBackground[] = {0, 0, 0, 0.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.5};
- colorActive[] = {0,0,0,1};
- colorDisabled[] = {0,0,0,0.3};
- rows = 1;
-
- drawSideArrows = 0;
- idcLeft = -1;
- idcRight = -1;
- maxHistoryDelay = 1;
- soundSelect[] = {"", 0.1, 1};
- period = 1;
- shadow = 2;
- class ScrollBar {
- arrowEmpty = "#(argb,8,8,3)color(1,1,1,1)";
- arrowFull = "#(argb,8,8,3)color(1,1,1,1)";
- border = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- thumb = "#(argb,8,8,3)color(1,1,1,1)";
- };
- class ListScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {1,1,1,0.6};
- colorActive[] = {1,1,1,1};
- colorDisabled[] = {1,1,1,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-class RscCombo;
-class cse_gui_comboBoxBase: RscCombo {
- idc = -1;
- type = 4;
- style = "0x10 + 0x200";
- x = 0;
- y = 0;
- w = 0.3;
- h = 0.035;
- color[] = {0,0,0,0.6};
- colorActive[] = {1,0,0,1};
- colorBackground[] = {0,0,0,1};
- colorDisabled[] = {1,1,1,0.25};
- colorScrollbar[] = {1,0,0,1};
- colorSelect[] = {0,0,0,1};
- colorSelectBackground[] = {1,1,1,0.7};
- colorText[] = {1,1,1,1};
-
- arrowEmpty = "";
- arrowFull = "";
- wholeHeight = 0.45;
- font = FontCSE;
- sizeEx = 0.031;
- soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1};
- soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1};
- soundCollapse[] = {"\A3\ui_f\data\sound\RscCombo\soundCollapse",0.1,1};
- maxHistoryDelay = 1.0;
- class ScrollBar
- {
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- border = "";
- };
- class ComboScrollBar {
- arrowEmpty = "\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
- arrowFull = "\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
- autoScrollDelay = 5;
- autoScrollEnabled = 0;
- autoScrollRewind = 0;
- autoScrollSpeed = -1;
- border = "\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
- color[] = {0.3,0.3,0.3,0.6};
- colorActive[] = {0.3,0.3,0.3,1};
- colorDisabled[] = {0.3,0.3,0.3,0.3};
- height = 0;
- scrollSpeed = 0.06;
- shadow = 0;
- thumb = "\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
- width = 0;
- };
-};
-
-
-
-class cse_gui_mapBase {
- moveOnEdges = 1;
- x = "SafeZoneXAbs";
- y = "SafeZoneY + 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "SafeZoneWAbs";
- h = "SafeZoneH - 1.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- type = 100; // Use 100 to hide markers
- style = 48;
- shadow = 0;
-
- ptsPerSquareSea = 5;
- ptsPerSquareTxt = 3;
- ptsPerSquareCLn = 10;
- ptsPerSquareExp = 10;
- ptsPerSquareCost = 10;
- ptsPerSquareFor = 9;
- ptsPerSquareForEdge = 9;
- ptsPerSquareRoad = 6;
- ptsPerSquareObj = 9;
- showCountourInterval = 0;
- scaleMin = 0.001;
- scaleMax = 1.0;
- scaleDefault = 0.16;
- maxSatelliteAlpha = 0.85;
- alphaFadeStartScale = 0.35;
- alphaFadeEndScale = 0.4;
- colorBackground[] = {0.969,0.957,0.949,1.0};
- colorSea[] = {0.467,0.631,0.851,0.5};
- colorForest[] = {0.624,0.78,0.388,0.5};
- colorForestBorder[] = {0.0,0.0,0.0,0.0};
- colorRocks[] = {0.0,0.0,0.0,0.3};
- colorRocksBorder[] = {0.0,0.0,0.0,0.0};
- colorLevels[] = {0.286,0.177,0.094,0.5};
- colorMainCountlines[] = {0.572,0.354,0.188,0.5};
- colorCountlines[] = {0.572,0.354,0.188,0.25};
- colorMainCountlinesWater[] = {0.491,0.577,0.702,0.6};
- colorCountlinesWater[] = {0.491,0.577,0.702,0.3};
- colorPowerLines[] = {0.1,0.1,0.1,1.0};
- colorRailWay[] = {0.8,0.2,0.0,1.0};
- colorNames[] = {0.1,0.1,0.1,0.9};
- colorInactive[] = {1.0,1.0,1.0,0.5};
- colorOutside[] = {0.0,0.0,0.0,1.0};
- colorTracks[] = {0.84,0.76,0.65,0.15};
- colorTracksFill[] = {0.84,0.76,0.65,1.0};
- colorRoads[] = {0.7,0.7,0.7,1.0};
- colorRoadsFill[] = {1.0,1.0,1.0,1.0};
- colorMainRoads[] = {0.9,0.5,0.3,1.0};
- colorMainRoadsFill[] = {1.0,0.6,0.4,1.0};
- colorGrid[] = {0.1,0.1,0.1,0.6};
- colorGridMap[] = {0.1,0.1,0.1,0.6};
- colorText[] = {1, 1, 1, 0.85};
-font = "PuristaMedium";
-sizeEx = 0.0270000;
-stickX[] = {0.20, {"Gamma", 1.00, 1.50} };
-stickY[] = {0.20, {"Gamma", 1.00, 1.50} };
-onMouseButtonClick = "";
-onMouseButtonDblClick = "";
-
- fontLabel = "PuristaMedium";
- sizeExLabel = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontGrid = "TahomaB";
- sizeExGrid = 0.02;
- fontUnits = "TahomaB";
- sizeExUnits = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontNames = "PuristaMedium";
- sizeExNames = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2";
- fontInfo = "PuristaMedium";
- sizeExInfo = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontLevel = "TahomaB";
- sizeExLevel = 0.02;
- text = "#(argb,8,8,3)color(1,1,1,1)";
- class ActiveMarker {
- color[] = {0.30, 0.10, 0.90, 1.00};
- size = 50;
- };
- class Legend
- {
- x = "SafeZoneX + ( ((safezoneW / safezoneH) min 1.2) / 40)";
- y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
- h = "3.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- font = "PuristaMedium";
- sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- colorBackground[] = {1,1,1,0.5};
- color[] = {0,0,0,1};
- };
- class Task
- {
- icon = "\A3\ui_f\data\map\mapcontrol\taskIcon_CA.paa";
- iconCreated = "\A3\ui_f\data\map\mapcontrol\taskIconCreated_CA.paa";
- iconCanceled = "\A3\ui_f\data\map\mapcontrol\taskIconCanceled_CA.paa";
- iconDone = "\A3\ui_f\data\map\mapcontrol\taskIconDone_CA.paa";
- iconFailed = "\A3\ui_f\data\map\mapcontrol\taskIconFailed_CA.paa";
- color[] = {"(profilenamespace getvariable ['IGUI_TEXT_RGB_R',0])","(profilenamespace getvariable ['IGUI_TEXT_RGB_G',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])","(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])"};
- colorCreated[] = {1,1,1,1};
- colorCanceled[] = {0.7,0.7,0.7,1};
- colorDone[] = {0.7,1,0.3,1};
- colorFailed[] = {1,0.3,0.2,1};
- size = 27;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- };
- class Waypoint
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class WaypointCompleted
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypointCompleted_ca.paa";
- color[] = {0,0,0,1};
- size = 20;
- importance = "1.2 * 16 * 0.05";
- coefMin = 0.900000;
- coefMax = 4;
- };
- class CustomMark
- {
- icon = "\A3\ui_f\data\map\mapcontrol\custommark_ca.paa";
- size = 24;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {0,0,0,1};
- };
- class Command
- {
- icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa";
- size = 18;
- importance = 1;
- coefMin = 1;
- coefMax = 1;
- color[] = {1,1,1,1};
- };
- class Bush
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = "14/2";
- importance = "0.2 * 14 * 0.05 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Rock
- {
- icon = "\A3\ui_f\data\map\mapcontrol\rock_ca.paa";
- color[] = {0.1,0.1,0.1,0.8};
- size = 12;
- importance = "0.5 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class SmallTree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.6 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class Tree
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa";
- color[] = {0.45,0.64,0.33,0.4};
- size = 12;
- importance = "0.9 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- };
- class busstop
- {
- icon = "\A3\ui_f\data\map\mapcontrol\busstop_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class fuelstation
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fuelstation_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class hospital
- {
- icon = "\A3\ui_f\data\map\mapcontrol\hospital_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class church
- {
- icon = "\A3\ui_f\data\map\mapcontrol\church_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class lighthouse
- {
- icon = "\A3\ui_f\data\map\mapcontrol\lighthouse_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class power
- {
- icon = "\A3\ui_f\data\map\mapcontrol\power_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powersolar
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powersolar_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwave
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwave_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class powerwind
- {
- icon = "\A3\ui_f\data\map\mapcontrol\powerwind_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class quay
- {
- icon = "\A3\ui_f\data\map\mapcontrol\quay_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class shipwreck
- {
- icon = "\A3\ui_f\data\map\mapcontrol\shipwreck_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class transmitter
- {
- icon = "\A3\ui_f\data\map\mapcontrol\transmitter_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class watertower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\watertower_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {1,1,1,1};
- };
- class Cross
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Cross_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Chapel
- {
- icon = "\A3\ui_f\data\map\mapcontrol\Chapel_CA.paa";
- size = 24;
- importance = 1;
- coefMin = 0.85;
- coefMax = 1.0;
- color[] = {0,0,0,1};
- };
- class Bunker
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 14;
- importance = "1.5 * 14 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fortress
- {
- icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa";
- size = 16;
- importance = "2 * 16 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Fountain
- {
- icon = "\A3\ui_f\data\map\mapcontrol\fountain_ca.paa";
- size = 11;
- importance = "1 * 12 * 0.05";
- coefMin = 0.25;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Ruin
- {
- icon = "\A3\ui_f\data\map\mapcontrol\ruin_ca.paa";
- size = 16;
- importance = "1.2 * 16 * 0.05";
- coefMin = 1;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Stack
- {
- icon = "\A3\ui_f\data\map\mapcontrol\stack_ca.paa";
- size = 20;
- importance = "2 * 16 * 0.05";
- coefMin = 0.9;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class Tourism
- {
- icon = "\A3\ui_f\data\map\mapcontrol\tourism_ca.paa";
- size = 16;
- importance = "1 * 16 * 0.05";
- coefMin = 0.7;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
- class ViewTower
- {
- icon = "\A3\ui_f\data\map\mapcontrol\viewtower_ca.paa";
- size = 16;
- importance = "2.5 * 16 * 0.05";
- coefMin = 0.5;
- coefMax = 4;
- color[] = {0,0,0,1};
- };
-};
-
-#endif
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_vehicles/ui/menu.hpp b/TO_MERGE/cse/sys_vehicles/ui/menu.hpp
deleted file mode 100644
index 4fa0ab7eaa..0000000000
--- a/TO_MERGE/cse/sys_vehicles/ui/menu.hpp
+++ /dev/null
@@ -1,278 +0,0 @@
-class cse_sys_vehicleMenu {
- idd = 314436;
- movingEnable = false;
- onLoad = "uiNamespace setVariable ['cse_sys_vehicleMenu', _this select 0]; ['cse_onMenuOpen_Veh', true] call cse_fnc_gui_blurScreen; [_this select 0] call cse_fnc_onMenuOpen_VEH; ";
- onUnload = "CSE_VEHICLE_INTERACTION_MENU_OPEN = false; ['cse_onMenuOpen_Veh', false] call cse_fnc_gui_blurScreen; ['cse_onMenuOpen_Veh', 'onEachFrame'] call BIS_fnc_removeStackedEventHandler;";
-
- class controlsBackground {
- class HeaderBackground: cse_gui_backgroundBase{
- idc = -1;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "#(argb,8,8,3)color(0,0,0,0)";
- //moving = 1;
- };
- class CenterBackground: HeaderBackground {
- /*x = 0.138;
- y = 0.17;
- w = 1.2549;
- h = 0.836601;*/
- y = "2.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- h = "16 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- //text = "#(argb,8,8,3)color(0,0,0,0.65)";
- //text = "cse\cse_sys_medical\data\ui_background.paa";
- text = "#(argb,8,8,3)color(0,0,0,0.9)";
- colorText[] = {0, 0, 0, "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- colorBackground[] = {0,0,0,"(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- };
- /*class BottomBackground: CenterBackground {
- y = "(18.6 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2))";
- h = "9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- };*/
- };
-
- class controls {
- class HeaderName {
- idc = 1;
- type = CT_STATIC;
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_LEFT + ST_SHADOW;
- font = "PuristaMedium";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- colorText[] = {0.95, 0.95, 0.95, 0.75};
- colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.9])"};
- text = "";
- };
-
- class IconsBackGroundBar: cse_gui_backgroundBase{
- idc = -1;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "2.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "3.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- //text = "#(argb,8,8,3)color(0,0,0,0.4)";
- text ="cse\cse_sys_medical\data\cse_background_img.paa";
- colorText[] = {1, 1, 1, 0.0};
- //moving = 1;
- };
- class CatagoryLeft: HeaderName {
- x = "1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "2.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "12.33 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- style = ST_CENTER;
- //colorText[] = {0.6, 0.7, 1.0, 1};
- colorText[] = {1, 1, 1.0, 0.9};
- colorBackground[] = {0,0,0,0};
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.2)";
- text = "ACTIONS & OVERVIEW";
- };
- class CatagoryCenter: CatagoryLeft {
- x = "13.33 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "ACTIONS";
- };
- class CatagoryRight: CatagoryCenter{
- x = "25.66 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "VEHICLE";
- };
- class Line: cse_gui_backgroundBase {
- idc = -1;
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "37 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.03 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "#(argb,8,8,3)color(1,1,1,0.5)";
- };
-
-
-
- class BtnIconLeft1: cse_gui_buttonBase {
- idc = 11;
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.73 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.1)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureOver = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureFocused = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTexturePressed = "#(argb,8,8,3)color(0,0,0,0.0)";
- animTextureDefault = "#(argb,8,8,3)color(0,0,0,0.0)";
- action = "['crew'] call cse_fnc_displayOptions_VEH;";
- };
- class BtnIconLeft2: BtnIconLeft1 {
- idc = 12;
- x = "3 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['cargo'] call cse_fnc_displayOptions_VEH;";
- };
- class BtnIconLeft3: BtnIconLeft1 {
- idc = 13;
- x = "4.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "['repair'] call cse_fnc_displayOptions_VEH;";
- };
- class BtnIconLeft4: BtnIconLeft1 {
- idc = 14;
- x = "6 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "";
- };
- class BtnIconLeft5: BtnIconLeft1 {
- idc = 15;
- x = "7.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "";
- };
- class BtnIconLeft6: BtnIconLeft1 {
- idc = 16;
- x = "9 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "";
- };
- class BtnIconLeft7: BtnIconLeft1 {
- idc = 17;
- x = "10.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "";
- };
- class BtnIconLeft8: BtnIconLeft1 {
- idc = 18;
- x = "12 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- action = "";
- };
- class iconImg1: cse_gui_backgroundBase {
- idc = 111;
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "3.73 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.1)";
- colorBackground[] = {0,0,0,1};
- colorPicture[] = {1,1,1,1};
- colorText[] = {1,1,1,1};
- text = "cse\cse_sys_vehicles\data\icons\icon_crew.paa";
- };
- class iconImg2: iconImg1 {
- idc = 112;
- x = "3 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_vehicles\data\icons\icon_cargo.paa";
- };
- class iconImg3: iconImg1 {
- idc = 113;
- x = "4.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "cse\cse_sys_vehicles\data\icons\icon_repair.paa";
- };
- class iconImg4: iconImg1 {
- idc = 114;
- x = "6 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "";
- };
- class iconImg5: iconImg1 {
- idc = 115;
- x = "7.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "";
- };
- class iconImg6: iconImg1 {
- idc = 116;
- x = "9 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "";
- };
- class iconImg7: iconImg1 {
- idc = 117;
- x = "10.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "";
- };
- class iconImg8: iconImg1 {
- idc = 118;
- x = "12 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- text = "";
- };
-
-
- class informationList: cse_gui_listBoxBase {
- idc = 212;
- x = "1.5 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "11.6 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
- rowHeight = 0.03;
- colorBackground[] = {0, 0, 0, 0.2};
- colorText[] = {1,1, 1, 1.0};
- colorScrollbar[] = {1,1, 1, 1.0};
- colorSelect[] = {1,1, 1, 1.0};
- colorSelect2[] = {1,1, 1, 1.0};
- colorSelectBackground[] = {0, 0, 0, 1.0};
- colorSelectBackground2[] = {0.0, 0.0, 0.0, 0.7};
- };
-
-
-
- class BtnMenu1: BtnIconLeft1 {
- idc = 20;
- x = "13.6 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
- y = "5.4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- w = "11.6 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- text = "";
- size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.9)";
- animTextureNormal = "#(argb,8,8,3)color(0,0,0,0.8)";
- animTextureDisabled = "#(argb,8,8,3)color(0,0,0,0.5)";
- animTextureOver = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)";
- animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)";
- animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
- color[] = {1, 1, 1, 1};
- color2[] = {0,0,0, 1};
- colorBackgroundFocused[] = {1,1,1,1};
- colorBackground[] = {1,1,1,1};
- colorbackground2[] = {1,1,1,1};
- colorDisabled[] = {0.5,0.5,0.5,0.8};
- colorFocused[] = {0,0,0,1};
- periodFocus = 1;
- periodOver = 1;
- action = "";
- };
- class BtnMenu2: BtnMenu1 {
- idc = 21;
- y = "6.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu3: BtnMenu1 {
- idc = 22;
- y = "7.6 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu4: BtnMenu1 {
- idc = 23;
- y = "8.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text ="";
- };
- class BtnMenu5: BtnMenu1 {
- idc = 24;
- y = "9.8 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu6: BtnMenu1 {
- idc = 25;
- y = "10.9 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu7: BtnMenu1 {
- idc = 26;
- y = "12 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- class BtnMenu8: BtnMenu1 {
- idc = 27;
- y = "13.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
- text = "";
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/CfgFunctions.h b/TO_MERGE/cse/sys_weaponheat/CfgFunctions.h
deleted file mode 100644
index 876d69d6c6..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/CfgFunctions.h
+++ /dev/null
@@ -1,27 +0,0 @@
-class CfgFunctions {
- class CSE {
- class WeaponHeat {
- file = "cse\cse_sys_weaponheat\functions";
- class canSwapBarrel_wh { recompile = 1; };
- class clearMalfunction_wh { recompile = 1; };
- class generateMalfunctions_wh { recompile = 1; };
- class generateHeatHaze_wh { recompile = 1; };
- class generateSmoke_wh { recompile = 1; };
- class getBarrelMass_wh { recompile = 1; };
- class getBarrelTemperature_wh { recompile = 1; };
- class getBulletMass_wh { recompile = 1; };
- class getIn_wh { recompile = 1; };
- class getOut_wh { recompile = 1; };
- class handleWeaponHeat_wh { recompile = 1; };
- class jamWeapon_wh { recompile = 1; };
- class put_wh { recompile = 1; };
- class registerBarrelExchangeActions_wh { recompile = 1; };
- class setBarrelTemperature_wh { recompile = 1; };
- class swapBarrel_wh { recompile = 1; };
- class take_wh { recompile = 1; };
- class removeParticleEffectHeat_WH { recompile = 1; };
- class addParticleEffectHeat_WH { recompile = 1; };
- class setParticleEffectHeat_WH { recompile = 1; };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/CfgSounds.h b/TO_MERGE/cse/sys_weaponheat/CfgSounds.h
deleted file mode 100644
index 9e38b28878..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/CfgSounds.h
+++ /dev/null
@@ -1,33 +0,0 @@
-class CfgSounds
-{
- class cse_weaponheat_barrel_exchange
- {
- name="cse_weaponheat_barrel_exchange";
- sound[]={"\cse\cse_sys_weaponheat\sound\barrel_exchange.wav",1,1};
- titles[]={};
- };
- class cse_jamming_rifle
- {
- name="cse_jamming_rifle";
- sound[]={"\cse\cse_sys_weaponheat\sound\jamming_rifle.wav",1,1};
- titles[]={};
- };
- class cse_jamming_pistol
- {
- name="cse_jamming_pistol";
- sound[]={"\cse\cse_sys_weaponheat\sound\jamming_pistol.wav",1,1};
- titles[]={};
- };
- class cse_fixing_rifle
- {
- name="cse_fixing_rifle";
- sound[]={"\cse\cse_sys_weaponheat\sound\fixing_rifle.wav",1,1};
- titles[]={};
- };
- class cse_fixing_pistol
- {
- name="cse_fixing_pistol";
- sound[]={"\cse\cse_sys_weaponheat\sound\fixing_pistol.wav",1,1};
- titles[]={};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/CfgVehicles.h b/TO_MERGE/cse/sys_weaponheat/CfgVehicles.h
deleted file mode 100644
index 0716bea9c5..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/CfgVehicles.h
+++ /dev/null
@@ -1,46 +0,0 @@
-class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
- class cse_sys_weaponheat: Module_F {
- scope = 2;
- displayName = "Weapon Heat [CSE]";
- icon = "\cse\cse_main\data\cse_rifle_module.paa";
- category = "cseModules";
- function = "cse_fnc_initalizeModule_F";
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- class Arguments {
- class genericSpareBarrel {
- displayName = "Generic Spare Barrel";
- description = "Allow players to use a generic spare barrel that fits all weapons.";
- typeName = "BOOL";
- defaultValue = true;
- };
- };
- class ModuleDescription {
- description = "Weapon heating";
- };
- };
-
- class Item_Base_F;
- class cse_sparebarrelbagItem: Item_Base_F
- {
- scope = 2;
- scopeCurator = 2;
- displayName = "Spare Barrel Bag";
- author = "Combat Space Enhancement";
- vehicleClass = "Items";
- class TransportItems
- {
- class cse_sparebarrelbag
- {
- name = "cse_sparebarrelbag";
- count = 1;
- };
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_weaponheat/CfgWeapons.h b/TO_MERGE/cse/sys_weaponheat/CfgWeapons.h
deleted file mode 100644
index 361a1652c1..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/CfgWeapons.h
+++ /dev/null
@@ -1,49 +0,0 @@
-class CfgWeapons {
- class ItemCore;
- class InventoryItem_Base_F;
- class cse_sparebarrelbag: ItemCore
- {
- scope=2;
- displayName="Spare Barrel Bag";
- // TODO: Replace the place holders
- model="\cse\cse_sys_weaponheat\equipment\barrel_m16.p3d";
- picture="\cse\cse_sys_weaponheat\equipment\img\barrel_m16.paa";
- descriptionShort="Spare Barrel Bag";
- class ItemInfo: InventoryItem_Base_F
- {
- mass=40;
- type=201;
- };
- };
-
- class cse_barrel_m16: cse_sparebarrelbag
- {
- displayName="M16 Spare Barrel";
- descriptionShort="M16 Spare Barrel";
- model="\cse\cse_sys_weaponheat\equipment\barrel_m16.p3d";
- picture="\cse\cse_sys_weaponheat\equipment\img\barrel_m16.paa";
- };
-
- class cse_barrel_ak74: cse_sparebarrelbag
- {
- displayName="AK Spare Barrel";
- descriptionShort="AK Spare Barrel";
- model="\cse\cse_sys_weaponheat\equipment\barrel_ak74.p3d";
- picture="\cse\cse_sys_weaponheat\equipment\img\barrel_ak74.paa";
- };
-
- class Rifle_Base_F;
- class arifle_MX_Base_F;
- class arifle_MX_SW_F: arifle_MX_Base_F
- {
- cse_exchangeableBarrel = 1;
- };
- class LMG_Zafir_F: Rifle_Base_F
- {
- cse_exchangeableBarrel = 1;
- };
- class LMG_Mk200_F: Rifle_Base_F
- {
- cse_exchangeableBarrel = 1;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/Combat_Space_Enhancement.h b/TO_MERGE/cse/sys_weaponheat/Combat_Space_Enhancement.h
deleted file mode 100644
index 70239b39c0..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/Combat_Space_Enhancement.h
+++ /dev/null
@@ -1,18 +0,0 @@
-class Combat_Space_Enhancement {
- class CfgModules {
- class cse_sys_weaponheat {
- init = "call compile preprocessFile 'cse\cse_sys_weaponheat\init_sys_weaponheat.sqf';";
- name = "Weapon Heating";
- class EventHandlers {
- class AllVehicles {
- GetIn = "call cse_fnc_getIn_wh; false";
- GetOut = "call cse_fnc_getOut_wh; false";
- };
-
- class CAManBase {
- killed = "[_this select 1] call cse_fnc_removeParticleEffectHeat_WH;";
- };
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/config.cpp b/TO_MERGE/cse/sys_weaponheat/config.cpp
deleted file mode 100644
index 415f7c322a..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/config.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-class CfgPatches {
- class cse_sys_weaponheat {
- units[] = {"cse_sparebarrelbagItem"};
- weapons[] = {};
- requiredVersion = 1.0;
- requiredAddons[] = {"cse_f_eh","cse_main", "A3_Weapons_F", "A3_Weapons_F_Rifles_MX"};
- version = "0.10.0_rc";
- author[] = {"Combat Space Enhancement"};
- authorUrl = "http://csemod.com";
- };
-};
-
-class cse_sys_weaponheat {
- class PreloadAddons {
- class cse_sys_weaponheat {
- list[] = {"cse_sys_weaponheat"};
- };
- };
-};
-
-#include "CfgVehicles.h"
-#include "CfgWeapons.h"
-#include "CfgSounds.h"
-#include "CfgFunctions.h"
-#include "Combat_Space_Enhancement.h"
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/barrel_ak74.p3d b/TO_MERGE/cse/sys_weaponheat/equipment/barrel_ak74.p3d
deleted file mode 100644
index cffce0919b..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/equipment/barrel_ak74.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/barrel_m16.p3d b/TO_MERGE/cse/sys_weaponheat/equipment/barrel_m16.p3d
deleted file mode 100644
index ac893e24e5..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/equipment/barrel_m16.p3d and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_ak74.rvmat b/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_ak74.rvmat
deleted file mode 100644
index b96145eaea..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_ak74.rvmat
+++ /dev/null
@@ -1,22 +0,0 @@
-ambient[]={0.80000001,0.80000001,0.80000001,0};
-diffuse[]={0.80000001,0.80000001,0.80000001,0};
-forcedDiffuse[]={0,0,0,0};
-emmisive[]={0,0,0,0};
-specular[]={0.2,0.2,0.2,0};
-specularPower=10.6;
-renderFlags[]=
-{
- "NoAlphaWrite"
-};
-PixelShaderID="Glass";
-VertexShaderID="Glass";
-class Stage1
-{
- texture="#(argb,8,8,3)color(1,1,1,0.9)";
- uvSource="none";
-};
-class Stage2
-{
- texture="a3\data_f\env_chrome_co.paa";
- uvSource="none";
-};
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_ak74_co.paa b/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_ak74_co.paa
deleted file mode 100644
index de0d49a31b..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_ak74_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16.rvmat b/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16.rvmat
deleted file mode 100644
index c5b74bc7d7..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16.rvmat
+++ /dev/null
@@ -1,92 +0,0 @@
-ambient[]={1.000000,1.000000,1.000000,1.000000};
-diffuse[]={1.000000,1.000000,1.000000,1.000000};
-forcedDiffuse[]={0.000000,0.000000,0.000000,0.000000};
-emmisive[]={0.000000,0.000000,0.000000,1.000000};
-specular[]={0.703999,0.703999,0.703999,0.000000};
-specularPower=70.000000;
-PixelShaderID="Super";
-VertexShaderID="Super";
-class Stage1
-{
- texture="cse\cse_sys_weaponheat\equipment\data\barrel_m16_nohq.paa";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage2
-{
- texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage3
-{
- texture="#(argb,8,8,3)color(0,0,0,0,MC)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage4
-{
- texture="#(argb,8,8,3)color(1,1,1,1,AS)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage5
-{
- texture="#(argb,8,8,3)color(0,0.05,1,1,SMDI)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage6
-{
- texture="#(ai,32,128,1)fresnel(0.98,1.02)";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
-class Stage7
-{
- texture="cse\cse_sys_weaponheat\equipment\data\env_co.tga";
- uvSource="tex";
- class uvTransform
- {
- aside[]={1.000000,0.000000,0.000000};
- up[]={0.000000,1.000000,0.000000};
- dir[]={0.000000,0.000000,0.000000};
- pos[]={0.000000,0.000000,0.000000};
- };
-};
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16_co.paa b/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16_co.paa
deleted file mode 100644
index a3494a0f25..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16_nohq.paa b/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16_nohq.paa
deleted file mode 100644
index f53a424eb6..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/equipment/data/barrel_m16_nohq.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/data/env_co.paa b/TO_MERGE/cse/sys_weaponheat/equipment/data/env_co.paa
deleted file mode 100644
index 77645347b5..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/equipment/data/env_co.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/img/barrel_ak74.paa b/TO_MERGE/cse/sys_weaponheat/equipment/img/barrel_ak74.paa
deleted file mode 100644
index 93b3b8a37c..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/equipment/img/barrel_ak74.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/equipment/img/barrel_m16.paa b/TO_MERGE/cse/sys_weaponheat/equipment/img/barrel_m16.paa
deleted file mode 100644
index 92b4f2fc8b..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/equipment/img/barrel_m16.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/defines.h b/TO_MERGE/cse/sys_weaponheat/functions/defines.h
deleted file mode 100644
index e7cf47b9d1..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/defines.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#define PI 3.14159265
-#define ABSOLUTE_ZERO_IN_CELSIUS -273.15
-#define KELVIN(t) (t - ABSOLUTE_ZERO_IN_CELSIUS)
-#define CELSIUS(t) (t + ABSOLUTE_ZERO_IN_CELSIUS)
-#define CENTIMETER(i) (i * 2.54)
-#define STEFAN_BOLTZMANN_CONSTANT 0.00000005670373 // W / (m^2 * K^4)
-#define HEAT_TRANSFER_COEFFICIENT_STEEL 25.0 // W / (m^2 * K)
-#define HEAT_CAPACITY_STEEL 0.466 // J / (g * K)
-
-// Source: http://www.engineeringtoolbox.com/emissivity-coefficients-d_447.html
-#define EMISSIVITY_STAINLESS_STEEL 0.54
-
-// Source http://www.azom.com/properties.aspx?ArticleID=965
-// We have taken the average density for this
-// (7.85 + 8.06 / 2) min + max / 2
-#define DENSITY_STAINLESS_STEEL 7.955 // g / cm^3
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_addParticleEffectHeat_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_addParticleEffectHeat_wh.sqf
deleted file mode 100644
index cb324f892b..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_addParticleEffectHeat_wh.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_addParticleEffectsHeat_wh.sqf
- * @Descr: Adds a heat effect for the units weapon.
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: PARTICLE The particleeffect object
- * @PublicAPI: false
- */
-
-private ["_unit", "_currentParticleEffect", "_weaponDirection", "_particleEffect", "_rightHandPosition"];
-_unit = _this select 0;
-
-_currentParticleEffect = _unit getvariable "cse_particleEffect_Heat_WH";
-if (!isnil "_currentParticleEffect") exitwith {_currentParticleEffect};
-_rightHandPosition = ATLtoASL (_unit modelToWorld (_unit selectionPosition "RightHand"));
-
-_weaponDirection = _unit weaponDirection _weapon;
-
-_dummyObj = "cse_LogicDummy" createVehicleLocal [0,0,0];
-_dummyObj attachTo [_unit, _weaponDirection vectorMultiply 0.2, "LeftHand"];
-
-_particleEffect = "#particlesource" createVehicle (getPos _dummyObj);
-_particleEffect setParticleCircle [0, [0, 0, 0]];
-_particleEffect setParticleRandom [0.2, [0, 0, 0], [0.0, 0.0, 0], 0.1, 0.1, [0, 0, 0, 0], 0, 0];
-_particleEffect setParticleParams [["\A3\data_f\ParticleEffects\Universal\Refract",1, 0, 1, 0], "", "Billboard", 3, 0.1, [0, 0, 0], [0, 0, 0.0], 0, 0.5, 0.5, 0.1, [1.0], [[1, 0.7, 0.7, 0.0]], [1], 0, 0, "", "", _dummyObj];
-_particleEffect setDropInterval 0.04;
-
-_unit setvariable ["cse_particleEffect_Heat_WH", _particleEffect];
-_unit setvariable ["cse_particleEffect_Heat_dummyObj_WH", _dummyObj];
-_particleEffect;
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_canSwapBarrel_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_canSwapBarrel_wh.sqf
deleted file mode 100644
index 3e1480cee4..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_canSwapBarrel_wh.sqf
+++ /dev/null
@@ -1,10 +0,0 @@
-private ["_unit", "_weapon"];
-_unit = _this select 0;
-_weapon = _this select 1;
-
-if (getNumber(configFile >> "CfgWeapons" >> _weapon >> "cse_exchangeableBarrel") != 1) exitWith { false };
-
-if ([_unit, getText(configFile >> "CfgWeapons" >> _weapon >> "cse_spareBarrel")] call cse_fnc_hasItem) exitWith { true };
-if (cse_genericSpareBarrel_wh && [_unit, "cse_sparebarrelbag"] call cse_fnc_hasItem) exitWith { true };
-
-false
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_clearMalfunction_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_clearMalfunction_wh.sqf
deleted file mode 100644
index 9223a16969..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_clearMalfunction_wh.sqf
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * fn_jamWeapon_wh.sqf
- * @Descr: Clears the malfunction of a given unit/weapon/muzzle combination
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING]
- * @Return: nil
- * @PublicAPI: true
- */
-
-#define SUCCESS_RATE 0.9
-
-private ["_unit", "_weapon", "_muzzle"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-
-if ((currentMuzzle _unit) != _muzzle) exitWith {};
-if (_unit getVariable["CSE_ClearingMalfunction", false]) exitWith {};
-if (!(_unit getVariable[format["CSE_Malfunction_%1_%2", _weapon, _muzzle], false])) exitWith {};
-
-// Beginning of the procedure to clear the malfunction
-_unit setVariable["CSE_ClearingMalfunction", true, false];
-
-_unit playActionNow "reloadMagazine";
-sleep 2; // TODO: This should depend on the weapon type (maybe consider the weapon mass)
-if (SUCCESS_RATE > random 1) then {
- _unit setVariable [format["CSE_Malfunction_%1_%2", _weapon, _muzzle], false, !(_unit isKindOf "Man")];
-};
-
-// End of the procedure to clear the malfunction
-_unit setVariable["CSE_ClearingMalfunction", false, false];
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_generateHeatHaze_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_generateHeatHaze_wh.sqf
deleted file mode 100644
index 0bcfe6e90e..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_generateHeatHaze_wh.sqf
+++ /dev/null
@@ -1,35 +0,0 @@
-#define MAX_TEMP_HEAT_EFFECT 1000
-
-private ["_unit", "_weapon", "_muzzle", "_ammo", "_malfunctionRate"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-_ammo = _this select 3;
-_barrelTemperature = _this select 4;
-
-if (_unit getVariable[format["cse_weaponHeat_TemperatureEffects_%1_%2", _weapon, _muzzle], false]) exitWith {};
-
-if (_barrelTemperature >= 100) then {
- _unit setvariable [format["cse_weaponHeat_TemperatureEffects_%1_%2", _weapon, _muzzle], true];
-
- [_unit, _weapon, _muzzle, _ammo] spawn {
- _unit = _this select 0;
- _weapon = _this select 1;
- _muzzle = _this select 2;
- _ammo = _this select 3;
-
- _particleEffect = [_unit] call cse_fnc_addParticleEffectHeat_WH;
- _currentTemp = [_unit, _weapon, _muzzle, _ammo] call cse_fnc_getBarrelTemperature_wh;
- while {_currentTemp >= 100 && alive _unit} do {
- _currentTemp = [_unit, _weapon, _muzzle, _ammo] call cse_fnc_getBarrelTemperature_wh;
- if (currentWeapon _unit == _weapon) then {
- _percentage = 0 max (_currentTemp / MAX_TEMP_HEAT_EFFECT) min 1;
- [_unit, _percentage] call cse_fnc_setParticleEffectHeat_WH;
- } else {
- [_unit, 0] call cse_fnc_setParticleEffectHeat_WH;
- };
- sleep 1;
- };
- [_unit] call cse_fnc_removeParticleEffectHeat_WH;
- };
-};
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_generateMalfunctions_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_generateMalfunctions_wh.sqf
deleted file mode 100644
index 991e6a02cf..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_generateMalfunctions_wh.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * fn_generateMalfunctions_wh.sqf
- * @Descr: Generates weapon malfunctions based on barrel temperature and weapon cleanness
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING, barrelTemperature NUMBER]
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-#define MALFUNCTION_BASE_RATE 0.0001 // Base rate 1 : 10000
-
-private ["_unit", "_weapon", "_muzzle", "_malfunctionRate"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-_barrelTemperature = _this select 3;
-
-if (_unit getVariable[format["CSE_Malfunction_%1_%2", _weapon, _muzzle], false]) exitWith {
- switch (getNumber (configFile >> "CfgWeapons" >> _weapon >> "type")) do {
- case 1: {
- playSound3d["\cse\cse_sys_weaponheat\sound\jamming_rifle.wav", _unit, false, getPos _unit, 1.5, 1, 10];
- };
- case 2: {
- playSound3d["\cse\cse_sys_weaponheat\sound\jamming_pistol.wav", _unit, false, getPos _unit, 1.5, 1, 10];
- };
- default {
-
- };
- };
-
-};
-
-_malfunctionRate = MALFUNCTION_BASE_RATE max (_barrelTemperature / 1500)^4;
-
-// TODO: Add consideration of weapon cleanness
-
-if (_malfunctionRate > random 1) then {
- [_unit, _weapon, _muzzle] call cse_fnc_jamWeapon_wh;
-
- switch (getNumber (configFile >> "CfgWeapons" >> _weapon >> "type")) do {
- case 1: {
- playSound3d["\cse\cse_sys_weaponheat\sound\jamming_rifle.wav", _unit, false, getPos _unit, 15, 1, 10];
- };
- case 2: {
- playSound3d["\cse\cse_sys_weaponheat\sound\jamming_pistol.wav", _unit, false, getPos _unit, 15, 1, 10];
- };
- default {
-
- };
- };
-};
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_generateSmoke_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_generateSmoke_wh.sqf
deleted file mode 100644
index a9a7f2c048..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_generateSmoke_wh.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * fn_generateSmoke_wh.sqf
- * @Descr: Generates a smoke effect based on barrel temperature
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING, _bullet OBJECT, barrelTemperature NUMBER]
- * @Return: nil
- * @PublicAPI: false
- */
-
-
-private ["_unit", "_weapon", "_muzzle", "_bullet", "_bulletPosition", "_weaponDirection", "_intensity", "_particlePosition", "_distance"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-_bullet = _this select 3;
-_barrelTemperature = _this select 4;
-
-if (_barrelTemperature < 80) exitWith {};
-
-_bulletPosition = getPosATL _bullet;
-_weaponDirection = _unit weaponDirection _weapon;
-_intensity = (_barrelTemperature / 2000) min 0.3;
-
-{
- _distance = 0.05 + random 0.27;
- _particlePosition = _bulletPosition vectorAdd (_weaponDirection vectorMultiply _distance);
- drop ["\A3\data_f\missileSmoke", "", "Billboard", 1, 1.5,_particlePosition, [0, 0, 0], 1, 7.0, 5.5, 0.075,[0.28, 0.33, 0.37], [[.5, .5, .5, _intensity], [.6, .6, .6,_intensity*0.2]], [random 1,random 1,random 1], 0, 0, "", "", ""];
-} forEach [0, 1];
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_getBarrelMass_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_getBarrelMass_wh.sqf
deleted file mode 100644
index 1c638f3ec0..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_getBarrelMass_wh.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * fn_getBarrelMass_wh.sqf
- * @Descr: Calculates the mass of the barrel
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING]
- * @Return: barrel mass in gramm
- * @PublicAPI: false
- */
-
-
-private ["_unit", "_weapon", "_muzzle", "_barrelMass"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-
-_barrelMass = 0.40 * (getNumber (configFile >> "CfgWeapons" >> _weapon >> "WeaponSlotsInfo" >> "mass")) * 50; // estimated barrel mass in gramm
-if (_barrelMass == 0) then {
- // TODO: Find a way to estimate the barrel mass in this case
- _barrelMass = 4000;
- if (!(_unit isKindOf "Man")) then {
- _barrelMass = _barrelMass * 10;
- };
-};
-switch (_weapon) do {
- case (primaryWeapon _unit) : { _barrelMass = 1000 max _barrelMass };
- case (secondaryWeapon _unit) : { _barrelMass = 2000 max _barrelMass };
- case (handgunWeapon _unit) : { _barrelMass = 400 max _barrelMass };
-};
-
-_barrelMass
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_getBarrelTemperature_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_getBarrelTemperature_wh.sqf
deleted file mode 100644
index c9c01d50b7..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_getBarrelTemperature_wh.sqf
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * fn_getBarrelTemperature_wh.sqf
- * @Descr: Calculates the current barrel temperature
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING, ammo STRING]
- * @Return: barrel temperature in degree celsius
- * @PublicAPI: true
- */
-
-
-#include "defines.h"
-
-private ["_unit", "_weapon", "_muzzle", "_ammo", "_barrelMass", "_barrelLength", "_barrelCaliber", "_area", "_barrelDiameter", "_ambientTemperature", "_barrelTemperature", "_lastUpdateTime", "_deltaTime", "_simulationStep", "_fluidVelocity", "_dynamicHeatTransferCoefficient"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-_ammo = _this select 3;
-
-_barrelMass = [_unit, _weapon, _muzzle] call cse_fnc_getBarrelMass_wh;
-_barrelSurface = _barrelMass * 0.00015; // Rough estimation based on barrel mass only
-
-_barrelLength = getNumber(configFile >> "CfgWeapons" >> _weapon >> "AB_barrelLength");
-_barrelCaliber = getNumber(configFile >> "CfgAmmo" >> _ammo >> "AB_caliber");
-if (_barrelLength > 0 && _barrelCaliber > 0) then {
- // Estimate barrel surface based on barrel mass and barrel length and barrel caliber
- _area = _barrelMass / (DENSITY_STAINLESS_STEEL * PI * CENTIMETER(_barrelLength));
- _barrelDiameter = sqrt(CENTIMETER(_barrelCaliber)^2 + 4 * _area);
-
- _barrelSurface = _barrelDiameter * PI * CENTIMETER(_barrelLength);
- _barrelSurface = _barrelSurface / 10000; // convert from m^2 to cm^2
-};
-
-_ambientTemperature = 15;
-if (["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) then {
- _ambientTemperature = ((getPosASL _unit) select 2) call cse_ab_ballistics_fnc_get_temperature_at_height;
-};
-
-_barrelTemperature = _unit getVariable [format["CSE_BarrelTemperature_%1", _weapon], _ambientTemperature];
-_lastUpdateTime = _unit getVariable [format["CSE_BarrelUpdateTime_%1", _weapon], diag_tickTime];
-
-_deltaTime = diag_tickTime - _lastUpdateTime;
-
-while {_deltaTime > 0} do {
- _simulationStep = (_deltaTime min 1); // max step size 1 second
-
- // TODO: Do we want conductive heat transfer from the barrel to other parts of the weapon?
-
- // Source: https://de.wikipedia.org/wiki/W%C3%A4rme%C3%BCbergangskoeffizient
- // Source: https://en.wikipedia.org/wiki/Combined_forced_and_natural_convection
- _fluidVelocity = vectorMagnitude (wind vectorDiff (velocity _unit));
- _dynamicHeatTransferCoefficient = 12 * sqrt(_fluidVelocity) + 2;
- // Source: https://en.wikipedia.org/wiki/Convective_heat_transfer
- _barrelTemperature = _barrelTemperature - (HEAT_TRANSFER_COEFFICIENT_STEEL + _dynamicHeatTransferCoefficient) * _barrelSurface * (_barrelTemperature - _ambientTemperature) / (HEAT_CAPACITY_STEEL * _barrelMass) * _simulationStep;
-
- // Source: https://en.wikipedia.org/wiki/Thermal_radiation
- _barrelTemperature = _barrelTemperature - EMISSIVITY_STAINLESS_STEEL * STEFAN_BOLTZMANN_CONSTANT * _barrelSurface * (KELVIN(_barrelTemperature)^4 - KELVIN(_ambientTemperature)^4) / (HEAT_CAPACITY_STEEL * _barrelMass) * _simulationStep;
-
- _deltaTime = _deltaTime - _simulationStep;
-};
-
-_barrelTemperature
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_getBulletMass_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_getBulletMass_wh.sqf
deleted file mode 100644
index 3075e2be18..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_getBulletMass_wh.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * fn_getBulletMass_wh.sqf
- * @Descr: Calculates the mass of the bullet
- * @Author: Ruthberg
- *
- * @Arguments: ammo STRING
- * @Return: bullet mass in gramm
- * @PublicAPI: false
- */
-
-
-private ["_ammo", "_bulletMass", "_caliber"];
-_ammo = _this;
-
-_bulletMass = getNumber(configFile >> "CfgAmmo" >> _ammo >> "AB_bulletMass");
-if (_bulletMass == 0) then {
- // Try to estimate the mass based on BIS caliber
- // B_762x51_Ball: caliber 1.0 <--> 7.62 NATO M80: bullet mass 147 grain (9.46064086 g)
- _caliber = getNumber(configFile >> "CfgAmmo" >> _ammo >> "caliber");
- _bulletMass = _muzzleVelocity / 850 * _caliber * 9.46064086;
-} else {
- _bulletMass = _bulletMass * 0.06479891;
-};
-
-_bulletMass
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_getIn_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_getIn_wh.sqf
deleted file mode 100644
index 000261f184..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_getIn_wh.sqf
+++ /dev/null
@@ -1,9 +0,0 @@
-private ["_vehicle", "_position", "_unit", "_handle"];
-_vehicle = _this select 0;
-_position = _this select 1;
-_unit = _this select 2;
-
-if (_unit != player) exitWith {};
-_handle = _vehicle addEventHandler ["Fired", {_this call cse_fnc_handleWeaponHeat_wh}];
-
-_vehicle setVariable ["cse_weapon_heat_fired_event_handler", _handle];
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_getOut_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_getOut_wh.sqf
deleted file mode 100644
index f734099eb7..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_getOut_wh.sqf
+++ /dev/null
@@ -1,12 +0,0 @@
-private ["_vehicle", "_position", "_unit", "_handle"];
-_vehicle = _this select 0;
-_position = _this select 1;
-_unit = _this select 2;
-
-if (_unit != player) exitWith {};
-_handle = _vehicle getVariable "cse_weapon_heat_fired_event_handler";
-
-if (!isNil "_handle") then {
- _vehicle removeEventHandler ["Fired", _handle];
- _vehicle setVariable ["cse_weapon_heat_fired_event_handler", nil];
-};
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_handleWeaponHeat_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_handleWeaponHeat_wh.sqf
deleted file mode 100644
index 7ac712917b..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_handleWeaponHeat_wh.sqf
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * fn_handleWeaponHeat_wh.sqf
- * @Descr: Is expected to be triggered by the fired eventhandler from BI.
- * @Author: Ruthberg
- *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
- *
- * Params:
- * 1. unit: Object - Object the event handler is assigned to
- * 2. weapon: String - Fired weapon
- * 3. muzzle: String - Muzzle that was used
- * 4. mode: String - Current mode of the fired weapon
- * 5. ammo: String - Ammo used
- * 6. magazine: String - magazine name which was used
- * 7. projectile: Object - Object of the projectile that was shot (Arma 2: OA and onwards)
- */
-
-#include "defines.h"
-
-private ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_bullet", "_barrelTemperature", "_muzzleVelocity", "_barrelMass", "_bulletMass", "_caliber", "_kineticEnergy"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-_mode = _this select 3;
-_ammo = _this select 4;
-_magazine = _this select 5;
-_bullet = _this select 6;
-
-if (!(isPlayer _unit) || !local _unit) exitWith {};
-if (!(_bullet isKindOf "BulletBase")) exitWith {};
-
-_barrelTemperature = [_unit, _weapon, _muzzle, _ammo] call cse_fnc_getBarrelTemperature_wh;
-
-_muzzleVelocity = getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed");
-_barrelMass = [_unit, _weapon, _muzzle] call cse_fnc_getBarrelMass_wh;
-_bulletMass = _ammo call cse_fnc_getBulletMass_wh;
-
-_kineticEnergy = 0.5 * (_bulletMass / 1000) * _muzzleVelocity^2; // in J
-
-if (_kineticEnergy > 0 && _barrelMass > 0) then {
- _barrelTemperature = _barrelTemperature + _kineticEnergy / (HEAT_CAPACITY_STEEL * _barrelMass);
- [_unit, _weapon, _muzzle, _barrelTemperature] call cse_fnc_setBarrelTemperature_wh;
-};
-
-[_unit, _weapon, _muzzle, _barrelTemperature] call cse_fnc_generateMalfunctions_wh;
-[_unit, _weapon, _muzzle, _ammo, _barrelTemperature] call cse_fnc_generateHeatHaze_wh;
-[_unit, _weapon, _muzzle, _bullet, _barrelTemperature] call cse_fnc_generateSmoke_wh;
-
-// TODO: High barrel temperature side effects
-// cooking off?
-// fire (particle effects)?
-// glowing barrel at very high temperatures?
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_jamWeapon_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_jamWeapon_wh.sqf
deleted file mode 100644
index a47e907cb8..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_jamWeapon_wh.sqf
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * fn_jamWeapon_wh.sqf
- * @Descr: Adds a malfunction to the given unit/weapon/muzzle combination
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING]
- * @Return: nil
- * @PublicAPI: true
- */
-
-private ["_unit", "_weapon", "_muzzle", "_ID"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-
-_unit setVariable[format["CSE_Malfunction_%1_%2", _weapon, _muzzle], true, !(_unit isKindOf "CaManBase")];
-_ID = format["CSE_Malfunction_ID_%1_%2_%3", _unit, _weapon, _muzzle];
-
-[_ID, [_unit, _weapon, _muzzle, _ID], {
- private ["_unit", "_weapon", "_muzzle", "_ID"];
- _unit = _this select 0;
-
- // necessary to prefent weapon jam from resetting when jumping in and out of vehicles.
- if (vehicle _unit == _unit) then {
- _weapon = _this select 1;
- _muzzle = _this select 2;
- _ID = _this select 3;
-
- if (!(_unit getVariable[format["CSE_Malfunction_%1_%2", _weapon, _muzzle], false]) || !(_weapon in (weapons (vehicle _unit)))) exitWith {
- _unit setVariable[format["CSE_Malfunction_%1_%2", _weapon, _muzzle], nil, !(_unit isKindOf "CaManBase")]; // clean up the malfunction variable.
- [_ID] call cse_fnc_removeTaskFromPool_F;
- };
-
- if (currentWeapon _unit == _weapon && currentMuzzle _unit == _muzzle) then {
- (vehicle _unit) setWeaponReloadingTime [_unit, _muzzle, 1];
- };
- };
-}] call cse_fnc_addTaskToPool_f;
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_put_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_put_wh.sqf
deleted file mode 100644
index 1b3c28d7bf..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_put_wh.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-private ["_unit", "_container", "_item", "_itemCargo", "_ambientTemperature", "_spareBarrelTemperature", "_spareBarrelUpdateTime"];
-_unit = _this select 0;
-_container = _this select 1;
-_item = _this select 2;
-
-if (_unit != player) exitWith {};
-if (!([configFile >> "CfgWeapons" >> _item, "cse_sparebarrelbag"] call cse_fnc_inheritsFrom)) exitWith {};
-if (_container == uniformContainer player || _container == vestContainer player || _container == backpackContainer player) exitWith {};
-
-_ambientTemperature = 15;
-if (["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) then {
- _ambientTemperature = ((getPosASL _unit) select 2) call cse_ab_ballistics_fnc_get_temperature_at_height;
-};
-
-_spareBarrelTemperature = _unit getVariable [format["CSE_BarrelTemperature_%1", _item], _ambientTemperature];
-_spareBarrelUpdateTime = _unit getVariable [format["CSE_BarrelUpdateTime_%1", _item], diag_tickTime];
-
-_container setVariable [format["CSE_BarrelTemperature_%1", _item], _spareBarrelTemperature, true];
-_container setVariable [format["CSE_BarrelUpdateTime_%1", _item], _spareBarrelUpdateTime, true];
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_registerBarrelExchangeActions_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_registerBarrelExchangeActions_wh.sqf
deleted file mode 100644
index 5ccdf7e726..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_registerBarrelExchangeActions_wh.sqf
+++ /dev/null
@@ -1,26 +0,0 @@
-if (isDedicated) exitwith{};
-CSE_ICON_PATH = "cse\cse_gui\radialmenu\data\icons\";
-
-cse_exchangeBarrelDisplaySubMenu = {
- [_this] call cse_fnc_Debug;
-
- private ["_subMenus"];
- _subMenus = [];
-
- if ([player, currentWeapon player, currentMuzzle player] call cse_fnc_canSwapBarrel_wh) then {
- _subMenus pushBack ["Swap barrel", CSE_ICON_PATH + "icon_swap_barrels.paa", {
- closeDialog 0;
- [player, currentWeapon player, currentMuzzle player] spawn cse_fnc_swapBarrel_wh;
- }, true, "Swaps out the barrel"];
- };
-
- [_this select 3, _subMenus, _this select 1, CSE_SELECTED_RADIAL_OPTION_N_GUI, true] call cse_fnc_openRadialSecondRing_GUI;
-};
-
-
-_entries = [
- ["Weapon", {([player, currentWeapon player, currentMuzzle player] call cse_fnc_canSwapBarrel_wh)}, CSE_ICON_PATH + "icon_lines_horizontal_s.paa", cse_exchangeBarrelDisplaySubMenu, "Shows available weapon interactions"]
-];
-["ActionMenu","equipment", _entries ] call cse_fnc_addMultipleEntriesToRadialCategory_F;
-
-
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_removeParticleEffectHeat_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_removeParticleEffectHeat_wh.sqf
deleted file mode 100644
index cda3d4b85a..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_removeParticleEffectHeat_wh.sqf
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * fn_removeParticleEffectHeat_wh.sqf
- * @Descr: N/A
- * @Author: Glowbal
- *
- * @Arguments: [unit OBJECT]
- * @Return: BOOL Whatever or not a particle effect has been removed
- * @PublicAPI: false
- */
-
-private ["_unit", "_currentParticleEffect"];
-_unit = _this select 0;
-
-_currentParticleEffect = _unit getvariable "cse_particleEffect_Heat_WH";
-if (!isnil "_currentParticleEffect") exitwith {
- deleteVehicle _currentParticleEffect;
- _unit setvariable ["cse_particleEffect_Heat_WH", nil];
-
- _dummyObj = _unit getvariable "cse_particleEffect_Heat_dummyObj_WH";
- deleteVehicle _dummyObj;
- _unit setvariable ["cse_particleEffect_Heat_dummyObj_WH", nil];
-
- true
-};
-
-false
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_setBarrelTemperature_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_setBarrelTemperature_wh.sqf
deleted file mode 100644
index ccf67a5987..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_setBarrelTemperature_wh.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * fn_setBarrelTemperature_wh.sqf
- * @Descr: Calculates the current barrel temperature
- * @Author: Ruthberg
- *
- * @Arguments: [unit OBJECT, weapon STRING, muzzle STRING]
- * @Return: barrel temperature in degree celsius
- * @PublicAPI: true
- */
-
-
-private ["_unit", "_weapon", "_muzzle", "_barrelTemperature"];
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-_barrelTemperature = _this select 3;
-
-_unit setVariable [format["CSE_BarrelTemperature_%1", _weapon], _barrelTemperature, !(_unit isKindOf "Man")];
-_unit setVariable [format["CSE_BarrelUpdateTime_%1" , _weapon], diag_tickTime, !(_unit isKindOf "Man")];
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_setParticleEffectHeat_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_setParticleEffectHeat_wh.sqf
deleted file mode 100644
index a7735a7cdc..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_setParticleEffectHeat_wh.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-
-private ["_unit", "_percentage", "_currentParticleEffect", "_dummyObj"];
-_unit = _this select 0;
-_percentage = _this select 1;
-
-_currentParticleEffect = _unit getvariable "cse_particleEffect_Heat_WH";
-if (!isnil "_currentParticleEffect") then {
- _dummyObj = _unit getvariable "cse_particleEffect_Heat_dummyObj_WH";
- _dummyObj attachTo [_unit, (_unit weaponDirection _weapon) vectorMultiply 0.2, "LeftHand"];
- _particleEffect setParticleParams [["\A3\data_f\ParticleEffects\Universal\Refract",1, 0, 1, 0], "", "Billboard", 1, 1.0, [0, 0, 0], [0, 0, 0.0], 0, 0.5, 0.5, 0.1, [1.0], [[1, 0.7, 0.7, 0.5 * _percentage]], [1], 0, 0, "", "", _dummyObj];
-};
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_swapBarrel_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_swapBarrel_wh.sqf
deleted file mode 100644
index f15ce020c7..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_swapBarrel_wh.sqf
+++ /dev/null
@@ -1,48 +0,0 @@
-private ["_unit", "_weapon"];
-_unit = _this select 0;
-_weapon = _this select 1;
-
-if (!([_unit, _weapon] call cse_fnc_canSwapBarrel_wh)) exitWith {};
-if (vehicle _unit != _unit && {driver (vehicle _unit) == _unit || commander (vehicle _unit) == _unit || gunner (vehicle _unit) == _unit}) exitWith {};
-
-if (vehicle _unit == _unit && currentWeapon _unit != "" && !(weaponLowered _unit) && (stance _unit != "PRONE")) then {
- _unit action ["WeaponOnBack", _unit];
- waitUntil { weaponLowered _unit }; // probably evil
-};
-
-[_unit, _weapon] spawn {
- private ["_unit", "_weapon", "_spareBarrel", "_ambientTemperature", "_barrelTemperature", "_barrelUpdateTime", "_spareBarrelTemperature", "_spareBarrelUpdateTime"];
- _unit = _this select 0;
- _weapon = _this select 1;
-
- CSE_ORIGINAL_POSITION_BARREL_EXCHANGE_EQ = getPos _unit;
- // TODO: Prohibit the player from using his weapon during the barrel exchange progress
- CSE_CONDITION_BARREL_EXCHANGE_EQ = {((vehicle _unit != _unit && driver (vehicle _unit) != _unit && commander (vehicle _unit) != _unit && gunner (vehicle _unit) != _unit) || (((getPos _unit) distance CSE_ORIGINAL_POSITION_BARREL_EXCHANGE_EQ) < 1 && (weaponLowered _unit || stance _unit == "PRONE")))};
-
- // TODO: Play animation
- playSound "cse_weaponheat_barrel_exchange";
- _barrelExchangeSuccess = [15, CSE_CONDITION_BARREL_EXCHANGE_EQ] call cse_fnc_gui_loadingBar;
-
- if (_barrelExchangeSuccess) then {
- _spareBarrel = getText(configFile >> "CfgWeapons" >> _weapon >> "cse_spareBarrel");
- if (!([_unit, _spareBarrel] call cse_fnc_hasItem)) then {
- _spareBarrel = "cse_sparebarrelbag";
- };
- _ambientTemperature = 15;
- if (["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) then {
- _ambientTemperature = ((getPosASL _unit) select 2) call cse_ab_ballistics_fnc_get_temperature_at_height;
- };
-
- _barrelTemperature = _unit getVariable [format["CSE_BarrelTemperature_%1", _weapon], _ambientTemperature];
- _barrelUpdateTime = _unit getVariable [format["CSE_BarrelUpdateTime_%1", _weapon], diag_tickTime];
-
- _spareBarrelTemperature = _unit getVariable [format["CSE_BarrelTemperature_%1", _spareBarrel], _ambientTemperature];
- _spareBarrelUpdateTime = _unit getVariable [format["CSE_BarrelUpdateTime_%1", _spareBarrel], diag_tickTime];
-
- _unit setVariable [format["CSE_BarrelTemperature_%1", _weapon], _spareBarrelTemperature];
- _unit setVariable [format["CSE_BarrelUpdateTime_%1", _weapon], _spareBarrelUpdateTime];
-
- _unit setVariable [format["CSE_BarrelTemperature_%1", _spareBarrel], _barrelTemperature];
- _unit setVariable [format["CSE_BarrelUpdateTime_%1", _spareBarrel], _barrelUpdateTime];
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/cse/sys_weaponheat/functions/fn_take_wh.sqf b/TO_MERGE/cse/sys_weaponheat/functions/fn_take_wh.sqf
deleted file mode 100644
index 8052b6180d..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/functions/fn_take_wh.sqf
+++ /dev/null
@@ -1,35 +0,0 @@
-private ["_unit", "_container", "_item", "_itemCargo", "_spareBarrelCount", "_ambientTemperature", "_spareBarrelTemperature", "_spareBarrelUpdateTime"];
-_unit = _this select 0;
-_container = _this select 1;
-_item = _this select 2;
-
-if (_unit != player) exitWith {};
-if (!([configFile >> "CfgWeapons" >> _item, "cse_sparebarrelbag"] call cse_fnc_inheritsFrom)) exitWith {};
-if (_container == uniformContainer player || _container == vestContainer player || _container == backpackContainer player) exitWith {};
-
-_itemCargo = getItemCargo _container;
-_spareBarrelCount = 0;
-{
- if (_x == _item) exitWith {
- _spareBarrelCount = (_itemCargo select 1) select _forEachIndex;
- };
-} forEach (_itemCargo select 0);
-
-_ambientTemperature = 15;
-if (["cse_AB_moduleAdvancedBallistics"] call cse_fnc_isModuleEnabled_F) then {
- _ambientTemperature = ((getPosASL _unit) select 2) call cse_ab_ballistics_fnc_get_temperature_at_height;
-};
-
-_spareBarrelTemperature = _ambientTemperature;
-_spareBarrelUpdateTime = diag_tickTime;
-
-if (_spareBarrelCount == 0) then {
- // Assume that we took an already used spare barrel
- _spareBarrelTemperature = _container getVariable [format["CSE_BarrelTemperature_%1", _item], _ambientTemperature];
- _spareBarrelUpdateTime = _container getVariable [format["CSE_BarrelUpdateTime_%1", _item], diag_tickTime];
- _container setVariable [format["CSE_BarrelTemperature_%1", _item], nil];
- _container setVariable [format["CSE_BarrelUpdateTime_%1", _item], nil];
-};
-
-_unit setVariable [format["CSE_BarrelTemperature_%1", _item], _spareBarrelTemperature];
-_unit setVariable [format["CSE_BarrelUpdateTime_%1", _item], _spareBarrelUpdateTime];
diff --git a/TO_MERGE/cse/sys_weaponheat/init_sys_weaponheat.sqf b/TO_MERGE/cse/sys_weaponheat/init_sys_weaponheat.sqf
deleted file mode 100644
index 3b7c664e9e..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/init_sys_weaponheat.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-if (!hasInterface) exitWith {};
-waitUntil {!isNil "cse_gui" && !isNil "cse_main"};
-waitUntil {!isNull player};
-
-player addEventHandler ["Fired", {_this call cse_fnc_handleWeaponHeat_wh}];
-player addEventHandler ["Take", {_this call cse_fnc_take_wh}];
-player addEventHandler ["Put", {_this call cse_fnc_put_wh}];
-
-cse_sys_weaponheat = true;
-cse_genericSpareBarrel_wh = true;
-
-_args = _this;
-{
- _value = _x select 1;
- if (!isNil "_value") then {
- _name = _x select 0;
- if (_name == "genericSpareBarrel") exitWith {
- cse_genericSpareBarrel_wh = _value;
- };
- };
-} forEach _args;
-
-// Clear Malfunction
-["cse_weaponheat_clear_malfunction", (["cse_weaponheat_clear_malfunction","action",[20, 0,1,0]] call cse_fnc_getKeyBindingFromProfile_F),
- {
- [player, currentWeapon player, currentMuzzle player] call cse_fnc_clearMalfunction_wh;
- }] call cse_fnc_addKeyBindingForAction_F;
-
-["cse_weaponheat_clear_malfunction","action", "Clear Malfunction", "Clear Malfunction"] call cse_fnc_settingsDefineDetails_F;
-
-call cse_fnc_registerBarrelExchangeActions_wh;
diff --git a/TO_MERGE/cse/sys_weaponheat/sound/barrel_exchange.wav b/TO_MERGE/cse/sys_weaponheat/sound/barrel_exchange.wav
deleted file mode 100644
index 5d3391099a..0000000000
Binary files a/TO_MERGE/cse/sys_weaponheat/sound/barrel_exchange.wav and /dev/null differ
diff --git a/TO_MERGE/cse/sys_weaponheat/stringtable.xml b/TO_MERGE/cse/sys_weaponheat/stringtable.xml
deleted file mode 100644
index e7f8b63e1a..0000000000
--- a/TO_MERGE/cse/sys_weaponheat/stringtable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/$PBOPREFIX$ b/TO_MERGE/wep_dragon/$PBOPREFIX$
deleted file mode 100644
index 4275fbd056..0000000000
--- a/TO_MERGE/wep_dragon/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\ace\addons\wep_dragon
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/CfgAmmo.hpp b/TO_MERGE/wep_dragon/CfgAmmo.hpp
deleted file mode 100644
index 3798470615..0000000000
--- a/TO_MERGE/wep_dragon/CfgAmmo.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-class CfgAmmo {
- class MissileBase;
- class ShellBase;
-
- class ace_m47_dragon_serviceCharge : ShellBase {
- hit = 1;
- indirectHit = 2;
- indirectHitRange = 1;
- typicalSpeed = 100;
- explosive = 1;
- cost = 300;
- model = "\ca\weapons\empty";
- airFriction = 0;
- timeToLive = 1;
- explosionTime = 0.001;
- soundFly[] = {"",1,1};
- soundEngine[] = {"",1,4};
- CraterEffects = "";
- explosionEffects = "ace_m47_serviceExplosion";
- hitarmor[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitbuilding[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitconcrete[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitdefault[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitfoliage[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitglass[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitglassarmored[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitgroundhard[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitgroundsoft[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitiron[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitman[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitmetal[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitmetalplate[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitplastic[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitrubber[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- hitwood[] = {"soundDefault1", 0.33, "soundDefault2", 0.33, "soundDefault3", 0.33};
- sounddefault1[] = {"\x\ace\addons\arty_ammunition\Sounds\base_eject", 56.2341, 1, 1800};
- sounddefault2[] = {"\x\ace\addons\arty_ammunition\Sounds\base_eject", 56.2341, 1, 1800};
- sounddefault3[] = {"\x\ace\addons\arty_ammunition\Sounds\base_eject", 56.2341, 1, 1800};
- soundHit[] = {"\x\ace\addons\arty_ammunition\Sounds\base_eject",56.23413,1,1800};
- };
-
- class M_47_AT_EP1: MissileBase {
- ace_towsmoke = 0; // no trail
- six_tracerenable = 0; // can't find it?
- ace_guidance_type = "dragon";
- soundFly[] = {"",0,1,0};
- soundEngine[] = {"",0,1,0};
- };
-
- class ace_missile_dragon : M_47_AT_EP1 {
- model = QUOTE(PATHTOF(models\dragon.p3d));
- maxSpeed = 120;
- thrust = 0;
- initTime = 0;
- thrustTime = 0;
- sideAirFriction = 0.025;
- explosionEffects = "";
- CraterEffects = "";
- hitarmor[] = {"soundhit", 1};
- hitbuilding[] = {"soundhit", 1};
- hitconcrete[] = {"soundhit", 1};
- hitdefault[] = {"soundhit", 1};
- hitfoliage[] = {"soundhit", 1};
- hitglass[] = {"soundhit", 1};
- hitglassarmored[] = {"soundhit", 1};
- hitgroundhard[] = {"soundhit", 1};
- hitgroundsoft[] = {"soundhit", 1};
- hitiron[] = {"soundhit", 1};
- hitman[] = {"soundhit", 1};
- hitmetal[] = {"soundhit", 1};
- hitmetalplate[] = {"soundhit", 1};
- hitplastic[] = {"soundhit", 1};
- hitrubber[] = {"soundhit", 1};
- hitwood[] = {"soundhit", 1};
- soundhit[] = {"", 0, 1};
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/CfgEventhandlers.hpp b/TO_MERGE/wep_dragon/CfgEventhandlers.hpp
deleted file mode 100644
index 9aea97ee1a..0000000000
--- a/TO_MERGE/wep_dragon/CfgEventhandlers.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class Extended_PreInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_pre_init));
- };
-};
-
-class Extended_PostInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_post_init));
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/CfgMagazines.hpp b/TO_MERGE/wep_dragon/CfgMagazines.hpp
deleted file mode 100644
index 712e0eb4c6..0000000000
--- a/TO_MERGE/wep_dragon/CfgMagazines.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgMagazines {
- class CA_LauncherMagazine;
-
- class Dragon_EP1: CA_LauncherMagazine {
- model = QUOTE(PATHTOF(models\ace_m47_magazine.p3d));
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/CfgVehicles.hpp b/TO_MERGE/wep_dragon/CfgVehicles.hpp
deleted file mode 100644
index 65081083f6..0000000000
--- a/TO_MERGE/wep_dragon/CfgVehicles.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-class CfgVehicles {
- class LandVehicle;
-
- class StaticWeapon : LandVehicle {
- class Turrets;
- };
-
- class StaticATWeapon : StaticWeapon {
- class Turrets: Turrets {
- class MainTurret;
- };
- };
-
- class ACE_M47_Static_Base : StaticATWeapon {
- class Turrets: Turrets {
- class MainTurret : MainTurret {
- class ViewOptics;
- };
- };
- };
-
- class ACE_M47_Static: ACE_M47_Static_Base {
- scope = 1; // Hide it for now
- model = QUOTE(PATHTOF(models\ace_m47_static.p3d));
- displayName = "M47 Dragon";
- class Turrets: Turrets {
- class MainTurret: MainTurret {
- gunnerAction = "LowKORD_Gunner";
- GVAR(tracker) = "TOWLauncherSingle";
- gunnerOpticsModel = "\ca\Weapons_e\optics_m47";
- weapons[] = {"ACE_M47StaticLauncher"};
- magazines[] = {};
- class ViewOptics : ViewOptics {
- initFov = DRAGON_FOV;
- minFov = DRAGON_FOV;
- maxFov = DRAGON_FOV;
- };
- };
- };
- class AnimationSources {
- class rest_rotate {
- source="user";
- animPeriod=0.00001;
- initPhase=-0.35;
- maxValue="3.60";
- minValue="-3.60";
- };
- class optic_hide {
- source="user";
- animPeriod=0.0001;
- initPhase=1;
- maxValue="1";
- minValue="0";
- };
- class missile_hide {
- source="user";
- animPeriod=0.0001;
- initPhase=0;
- maxValue="1";
- minValue="0";
- };
- };
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/CfgWeapons.hpp b/TO_MERGE/wep_dragon/CfgWeapons.hpp
deleted file mode 100644
index 8f16f0d564..0000000000
--- a/TO_MERGE/wep_dragon/CfgWeapons.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-class CfgWeapons {
- class Weapon_Bag_Base;
- class B_AT_01_weapon_F: Weapon_Bag_Base {
- };
- class ACE_M47StaticLauncher: B_AT_01_weapon_F {
- displayName = "M47 Dragon";
- canLock = 0;
- handAnim[] = {"OFP2_ManSkeleton","\Ca\weapons_E\Data\Anim\M47.rtm"};
- sound[] = {"Ca\Sounds_E\Weapons_E\M47\M47_1",3.1622777,1,1200};
- drySound[] = {"Ca\Sounds_E\Weapons_E\M47\dry",0.0001,1,10};
- reloadMagazineSound[] = {"Ca\Sounds_E\Weapons_E\M47\rocket_reload",1.0,1,30};
- soundFly[] = {"",3.1622777,1,500};
- initSpeed = 20;
- magazines[] = {"Dragon_EP1"};
- reloadTime = 0;
- magazineReloadTime = 0;
- };
-
- class Launcher;
- class M47Launcher_EP1: Launcher {
- displayName = "M47 Dragon";
- canlock = 0;
- model = QUOTE(PATHTOF(models\ace_m47_magazine.p3d));
- picture = QUOTE(PATHTOF(textures\m47_dragon_item_ca.paa));
- };
- class ACE_M47_Daysight: M47Launcher_EP1 {
- displayName = $STR_DN_ACE_DRAGONSUP36; // Stay next to tubes in gear dialogs
- model = QUOTE(PATHTOF(models\ace_m47_optic.p3d));
- picture = QUOTE(PATHTOF(textures\m47_daysight_item_ca.paa));
- optics = 1;
- weaponInfoType = "RscWeaponEmpty";
- modelOptics = "\ca\Weapons_e\optics_m47";
- reloadaction = "";
- showSwitchAction = 1;
- useAsBinocular = 1;
- uipicture = "";
- descriptionshort = "SU-36/P Daysight";
- ace_disposable = 0;
- magazines[] = {};
- type = 4096;
- opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"};
- opticsZoomMin = 0.015;
- opticsZoomMax = 0.015;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/README.md b/TO_MERGE/wep_dragon/README.md
deleted file mode 100644
index 4031d33f8d..0000000000
--- a/TO_MERGE/wep_dragon/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-ace_wep_dragon
-==============
-
-Adds the Dragon AT launcher.
-
-
-## Maintainers
-
-The people responsible for merging changes to this component or answering potential questions.
-
-- [walterpearce](https://github.com/walterpearce)
-- [NouberNou](https://github.com/NouberNou)
diff --git a/TO_MERGE/wep_dragon/XEH_post_init.sqf b/TO_MERGE/wep_dragon/XEH_post_init.sqf
deleted file mode 100644
index a4e4806591..0000000000
--- a/TO_MERGE/wep_dragon/XEH_post_init.sqf
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "script_component.hpp"
-NO_DEDICATED;
-
diff --git a/TO_MERGE/wep_dragon/XEH_pre_init.sqf b/TO_MERGE/wep_dragon/XEH_pre_init.sqf
deleted file mode 100644
index 6eccf9d1dd..0000000000
--- a/TO_MERGE/wep_dragon/XEH_pre_init.sqf
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "script_component.hpp"
-
diff --git a/TO_MERGE/wep_dragon/config.cpp b/TO_MERGE/wep_dragon/config.cpp
deleted file mode 100644
index 00ea7d4a6c..0000000000
--- a/TO_MERGE/wep_dragon/config.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- units[] = { "ACE_M47_Static" };
- weapons[] = { "ACE_M47StaticLauncher", "M47Launcher_EP1", "ACE_M47_Daysight" };
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = { "ace_main", "ace_common" };
- VERSION_CONFIG;
- };
-};
-
-#include "CfgEventhandlers.hpp"
-#include "CfgVehicles.hpp"
-#include "CfgWeapons.hpp"
-#include "CfgAmmo.hpp"
-#include "CfgMagazines.hpp"
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/functions/fnc_dragon_fired.sqf b/TO_MERGE/wep_dragon/functions/fnc_dragon_fired.sqf
deleted file mode 100644
index 1038e64a23..0000000000
--- a/TO_MERGE/wep_dragon/functions/fnc_dragon_fired.sqf
+++ /dev/null
@@ -1,135 +0,0 @@
-//fnc_fired.sqf
-#include "script_component.hpp"
-#define DRAGON_VELOCITY 100
-#define SERVICE_INTERVAL 0.3
-#define DRAGON_SERVICE_COUNT 60
-#define DRAGON_TRIM 1
-#define TRACKINTERVAL 0.025
-
-if ((_this select 0) == player || {(gunner (_this select 0)) == player}) then {
- if ((typeOf (_this select 6)) == "M_47_AT_EP1") then {
- _missile = (_this select 6);
- _vel = velocity _missile;
- _ppos = getPosASL _missile;
- _missile setPosATL [_ppos select 0, _ppos select 1, 5000];
- _unitVec = _vel call ACE_fnc_unitVector;
- _spawnPos = [(_ppos select 0) + (_unitVec select 0), (_ppos select 1) + (_unitVec select 1), (_ppos select 2) + (_unitVec select 2)];
- _shell = "ace_missile_dragon" createVehicle _spawnPos;
- _this set[6, _shell];
- _shell setPosASL _spawnPos;
-
- _newVel = [_unitVec, DRAGON_VELOCITY*1.25] call ACE_fnc_vectorMultiply;
- _shell setVelocity _newVel;
- _shell setVectorDir _unitVec;
- _gunner = _this select 0;
- //setAccTime 0.2;
-
- [
- {
- _unitVec = (velocity _shell) call ACE_fnc_unitVector;
- _polar = _unitVec call CBA_fnc_vect2polar;
- _spos = getPosATL _shell;
- _ppos = getPosASL _shell;
- _screenPos = if (_spos select 2 > _ppos select 2) then {worldToScreen _ppos} else {worldToScreen _spos};
-
- if (count _screenPos > 0 && {alive _gunner}) then {
- _x = (((_screenPos select 0) - 0.5) max -1) min 1;
- _y = (((_screenPos select 1) - 0.45) max -1) min 1;
- _m = ((_shell distance _gunner)*0.009);
-
- //player sideChat format["x: %1, y: %2 m: %3 di: %4 spd: %5", _x*_m, _y*_m*-1, _m, (_shell distance _gunner), (speed _shell)];
-
- _yDeg = 2.1;
- _xDeg = 1.6;
- _difEl = _yDeg*(_y*_m);
- _difEl = ((_difEl min _yDeg) max (_yDeg*-1));
- if(_difEl < 0) then {
- _difEl = _difEl / 2;
- };
- _dir = _xDeg*(_x*_m)*-1;
- _dir = ((_dir min _xDeg) max (_xDeg*-1));
- _difDir = (_polar select 1) + _dir;
- if (_difDir < 0) then {_difDir = _difDir + 360};
- if (_difDir > 360) then {_difDir = _difDir - 360};
- //drop ["\Ca\Data\Cl_basic","","Billboard",1,5,(getPos _shell),[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,0.25]],[0],0.0,2.0,"","",""];
- _firedAdjust = false;
- _shellVelocity = velocity _shell;
- _speed = (3.6*sqrt((_shellVelocity select 0)^2 + (_shellVelocity select 1)^2 + (_shellVelocity select 2)^2))*0.278;
- //hint format["speed: %1\ndistance: %2\ntime: %3", _speed, (_gunner distance _shell), diag_tickTime-_startTime];
- if (diag_tickTime >= _timerCorrect && {_chargeCount > 0}) then {
- if ((abs _dir) >= _xDeg/2) then {
- _firedAdjust = true;
- _difDir = (_polar select 1) + (_dir*0.25);
- if (_difDir < 0) then {_difDir = _difDir + 360};
- if (_difDir > 360) then {_difDir = _difDir - 360};
- //player sideChat "CORRECT!";
- _timerCorrect = diag_tickTime+(SERVICE_INTERVAL*2);
- _newVel = [DRAGON_VELOCITY, (_difDir), (_polar select 2)+(_difEl*0.25)+DRAGON_TRIM] call CBA_fnc_polar2vect;
- _shell setVelocity _newVel;
- _shell setVectorDir (_newVel call ACE_fnc_unitVector);
- "ace_m47_dragon_serviceCharge" createVehicle (getPos _shell);
- _chargeCount = _chargeCount - 1;
- };
- };
-
- if (!_firedAdjust && {diag_tickTime >= _timer} && {_chargeCount > 0}) then {
- _timer = diag_tickTime+SERVICE_INTERVAL;
-
- _newVel = [DRAGON_VELOCITY, _difDir, (_polar select 2)+(_difEl)+DRAGON_TRIM] call CBA_fnc_polar2vect;
- //_newVel = [(velocity _shell), _newVel] call ACE_fnc_vectorAdd;
- // if(_difEl > 0) then {
- // drop ["\Ca\Data\Cl_basic","","Billboard",1,5,(getPos _shell),[0,0,0],1,1.275,1.0,0.0,[0.5],[[0,1,0,1]],[0],0.0,2.0,"","",""];
- // } else {
- // drop ["\Ca\Data\Cl_basic","","Billboard",1,5,(getPos _shell),[0,0,0],1,1.275,1.0,0.0,[0.5],[[0,0,1,1]],[0],0.0,2.0,"","",""];
- // };
- _shell setVelocity _newVel;
- _shell setVectorDir (_newVel call ACE_fnc_unitVector);
-
- // charge FX
- _shellCharge = "ace_m47_dragon_serviceCharge" createVehicle _ppos;
- _shellCharge setPosASL _ppos;
- _chargeCount = _chargeCount - 1;
- };
- };
- _missile setPosATL [_ppos select 0, _ppos select 1, 5000];
- _prevTime = diag_tickTime;
- },
- [_shell,_gunner,_unitVec,_missile],
- 0.0, // delay
- {
- //init
- _shell = _this select 0;
- _gunner = _this select 1;
- _chargeCount = DRAGON_SERVICE_COUNT;
- _timer = diag_tickTime+SERVICE_INTERVAL;
- _timerCorrect = _timer;
- _originalVec = _this select 2;
- _originalPolar = _originalVec call CBA_fnc_vect2polar;
- _targetPolar = +_originalPolar;
- _startTime = diag_tickTime;
- _lastX = 1000;
- _lastY = 1000;
- // Return original missile at explosion
- _missile = _this select 3;
- // start from beginning
- _prevTime = diag_tickTime - TRACKINTERVAL;
- },
- {
- // exit
- if !(isNull _missile) then {
- _missile setVelocity _newVel;
- _missile setVectorDir (_newVel call ACE_fnc_unitVector);
- _missile setPosASL _ppos;
- };
- },
- {
- diag_tickTime - _prevTime > TRACKINTERVAL
- },
- {!alive _shell},
- [
- "_shell", "_gunner", "_chargeCount", "_timer", "_originalVec", "_originalPolar", "_timerCorrect", "_startTime", "_lastX", "_lastY",
- "_missile", "_ppos", "_newVel", "_prevTime"
- ]
- ] call cba_common_fnc_addPerFrameHandlerLogic;
- };
-};
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/functions/script_component.hpp b/TO_MERGE/wep_dragon/functions/script_component.hpp
deleted file mode 100644
index 0aae3f8cee..0000000000
--- a/TO_MERGE/wep_dragon/functions/script_component.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "\z\ace\addons\wep_dragon\script_component.hpp"
\ No newline at end of file
diff --git a/TO_MERGE/wep_dragon/license.txt b/TO_MERGE/wep_dragon/license.txt
deleted file mode 100644
index 7113bf4340..0000000000
--- a/TO_MERGE/wep_dragon/license.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-License (short)
-===============
-
-You are free:
-- to Share to copy, distribute and transmit the work
-
-Under the following conditions:
-- Attribution You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
-- Noncommercial You may not use this work for commercial purposes.
-- No Derivative Works You may not alter, transform, or build upon this work.
-
-With the understanding that:
-
-Waiver Any of the above conditions can be waived if you get permission from the copyright holder.
-
-Public Domain Where the work or any of its elements is in the public domain under applicable law, that status is in no way affected by the license.
-
-Other Rights In no way are any of the following rights affected by the license:
- - Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations;
- - The author's moral rights;
- - Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights.
-
-Notice For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.
-
-
-Full license text
-=================
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-"Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
-"Distribute" means to make available to the public the original and copies of the Work through sale or other transfer of ownership.
-"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-"Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-"Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-"Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-"Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; and,
-to Distribute and Publicly Perform the Work including as incorporated in Collections.
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats, but otherwise you have no rights to make Adaptations. Subject to 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Section 4(d).
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested.
-You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works.
-If You Distribute, or Publicly Perform the Work or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work. The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Collection, at a minimum such credit will appear, if a credit for all contributing authors of Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-For the avoidance of doubt:
-
-Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and,
-Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b).
-Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation.
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-8. Miscellaneous
-
-Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
diff --git a/TO_MERGE/wep_dragon/model.cfg b/TO_MERGE/wep_dragon/model.cfg
deleted file mode 100644
index 7c113bf821..0000000000
--- a/TO_MERGE/wep_dragon/model.cfg
+++ /dev/null
@@ -1,96 +0,0 @@
-class CfgSkeletons {
- class Default {
- isDiscrete = 1;
- skeletonInherit = "";
- skeletonBones[] = {};
- };
-
- class ace_m47_static_skeleton: Default {
- skeletonInherit = "Default";
- skeletonBones[] = {
- "bipod","",
- "grav_box","bipod",
- "launcher","grav_box",
- "optic","launcher",
- "missile","launcher"
- };
- };
-};
-
-class CfgModels {
- class Default {
- sectionsInherit = "";
- sections[] = {};
- };
-
- class ace_m47_static: Default {
- sectionsInherit = "Default";
- sections[] = {};
- skeletonName = "ace_m47_static_skeleton";
- class Animations {
- class MainGun {
- type="rotation";
- selection="launcher";
- sourceAddress = "clamp";
- source="MainGun";
- axis="elevate_axis";
- animPeriod=0.01;
- initPhase=0;
- maxValue="rad 360";
- minValue="rad -360";
- angle1="rad 360";
- angle0="rad -360";
- };
- class MainTurret {
- type="rotation";
- source="MainTurret";
- selection="bipod";
- sourceAddress = "loop";
- axis="rotate_axis";
- animPeriod=0.005;
- minValue="rad -360";
- maxValue="rad +360";
- angle0="rad -360";
- angle1="rad +360";
- };
- class rest_rotate {
- type="rotation";
- selection="grav_box";
- sourceAddress = "clamp";
- source="user";
- axis="elevate_axis";
- animPeriod=0.00001;
- initPhase=-0.35;
- maxValue="3.60";
- minValue="-3.60";
- angle1="rad -360";
- angle0="rad 360";
- };
- class optic_hide
- {
- type = "hide";
- source = "user";
- selection = "optic";
- animPeriod = 0.0001;
- minValue = 0;
- maxValue = 1;
- minPhase = 0;
- maxPhase = 1;
- hideValue = 0.99;
- initPhase = 1;
- };
- class missile_hide
- {
- type = "hide";
- source = "user";
- selection = "missile";
- animPeriod = 0.0001;
- minValue = 0;
- maxValue = 1;
- minPhase = 0;
- maxPhase = 1;
- hideValue = 0.99;
- };
- };
- };
-};
diff --git a/TO_MERGE/wep_dragon/models/ace_m47_magazine.p3d b/TO_MERGE/wep_dragon/models/ace_m47_magazine.p3d
deleted file mode 100644
index e8464fc389..0000000000
Binary files a/TO_MERGE/wep_dragon/models/ace_m47_magazine.p3d and /dev/null differ
diff --git a/TO_MERGE/wep_dragon/models/ace_m47_optic.p3d b/TO_MERGE/wep_dragon/models/ace_m47_optic.p3d
deleted file mode 100644
index 839892f686..0000000000
Binary files a/TO_MERGE/wep_dragon/models/ace_m47_optic.p3d and /dev/null differ
diff --git a/TO_MERGE/wep_dragon/models/ace_m47_static.p3d b/TO_MERGE/wep_dragon/models/ace_m47_static.p3d
deleted file mode 100644
index 15c4d5ef15..0000000000
Binary files a/TO_MERGE/wep_dragon/models/ace_m47_static.p3d and /dev/null differ
diff --git a/TO_MERGE/wep_dragon/models/dragon.p3d b/TO_MERGE/wep_dragon/models/dragon.p3d
deleted file mode 100644
index 42ce5780f2..0000000000
Binary files a/TO_MERGE/wep_dragon/models/dragon.p3d and /dev/null differ
diff --git a/TO_MERGE/wep_dragon/script_component.hpp b/TO_MERGE/wep_dragon/script_component.hpp
deleted file mode 100644
index e593c3d367..0000000000
--- a/TO_MERGE/wep_dragon/script_component.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#define COMPONENT wep_dragon
-#include "\z\ace\Addons\main\script_mod.hpp"
-
-#ifdef DEBUG_ENABLED_WEP_DRAGON
- #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_WEP_DRAGON
- #define DEBUG_SETTINGS DEBUG_SETTINGS_WEP_DRAGON
-#endif
-
-#include "\z\ace\Addons\main\script_macros.hpp"
diff --git a/TO_MERGE/wep_dragon/textures/dragon_text.paa b/TO_MERGE/wep_dragon/textures/dragon_text.paa
deleted file mode 100644
index a8a3787292..0000000000
Binary files a/TO_MERGE/wep_dragon/textures/dragon_text.paa and /dev/null differ
diff --git a/TO_MERGE/wep_dragon/textures/m47_daysight_item_ca.paa b/TO_MERGE/wep_dragon/textures/m47_daysight_item_ca.paa
deleted file mode 100644
index 9768f42b9c..0000000000
Binary files a/TO_MERGE/wep_dragon/textures/m47_daysight_item_ca.paa and /dev/null differ
diff --git a/TO_MERGE/wep_dragon/textures/m47_dragon_item_ca.paa b/TO_MERGE/wep_dragon/textures/m47_dragon_item_ca.paa
deleted file mode 100644
index 0e87574794..0000000000
Binary files a/TO_MERGE/wep_dragon/textures/m47_dragon_item_ca.paa and /dev/null differ
diff --git a/ace_fcs.dll b/ace_fcs.dll
index 189c3c0826..2cb8b86de2 100644
Binary files a/ace_fcs.dll and b/ace_fcs.dll differ
diff --git a/addons/aircraft/Heli_Attack_01_base_F.hpp b/addons/aircraft/Heli_Attack_01_base_F.hpp
index 817b1dacaa..7276b3e402 100644
--- a/addons/aircraft/Heli_Attack_01_base_F.hpp
+++ b/addons/aircraft/Heli_Attack_01_base_F.hpp
@@ -903,7 +903,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
initFov = 0.466;
minFov = 0.466;
maxFov = 0.466;
- visionMode[] = {"Normal","NVG","Ti"};
+ visionMode[] = {"Normal","Ti"};
thermalMode[] = {0,1};
gunnerOpticsColor[] = {0,0,0,1};
directionStabilized = 1;
diff --git a/addons/attach/script_component.hpp b/addons/attach/script_component.hpp
index c09a5b97e1..6d468d89c1 100644
--- a/addons/attach/script_component.hpp
+++ b/addons/attach/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\Addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_ATTACH
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_ATTACH
- #define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH
+ #define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH
#endif
#include "\z\ace\Addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml
index 30997dc2d4..27a0517f9a 100644
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@@ -173,7 +173,7 @@
Échec du AttacherBefestigen fehlgeschlagenПрисоединить Ошибка
- Error en Acoplar
+ Error al acoplar
-
\ No newline at end of file
+
diff --git a/addons/ballistics/scripts/initTargetWall.sqf b/addons/ballistics/scripts/initTargetWall.sqf
index dd1f42bb7d..b09d5897bc 100644
--- a/addons/ballistics/scripts/initTargetWall.sqf
+++ b/addons/ballistics/scripts/initTargetWall.sqf
@@ -4,10 +4,10 @@
_wall = _this select 0;
if (local _wall) then {
- _paper = "UserTexture_1x2_F" createVehicle position _wall;
+ _paper = "UserTexture_1x2_F" createVehicle position _wall;
- _paper attachTo [_wall, [0,-0.02,0.6]];
- _paper setDir getDir _wall;
+ _paper attachTo [_wall, [0,-0.02,0.6]];
+ _paper setDir getDir _wall;
- _paper setObjectTextureGlobal [0, QUOTE(PATHTOF(textures\target_ca.paa))];
+ _paper setObjectTextureGlobal [0, QUOTE(PATHTOF(textures\target_ca.paa))];
};
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index 3832e93f9d..897782747f 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -52,7 +52,7 @@
You need to take him as prisoner first!
- Du must ihn zuerst gefangen nehmen.
+ Du musst ihn zuerst gefangen nehmen.Necesitas hacerle prisionero primero!Najpierw musisz wziąć go jako więźnia!Vous devez d'abord le capturer!
@@ -132,23 +132,28 @@
Surrender
- Ergeben
+ Kapitulieren
+ RendirseStop Surrendering
- Nicht ergeben
+ Den Kampf erneut aufnehmen
+ Dejar de rendirseOnly use on alive units
- Nur auf lebenden Einheiten anwenden
+ Nur bei lebenden Einheiten verwendbar
+ Utilizar solo en unidades vivasOnly use on dismounted inf
- Nur auf abgesessenen Einheiten anwenden
+ Nur bei abgesessener Infanterie verwendbar
+ Utilizar solo en infanteria desmontadaNothing under mouse
- Keine Einheit unter dem Cursor
+ Es wurde nichts ausgewählt
+ Nada bajo el ratón
-
\ No newline at end of file
+
diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp
index eaa585691e..5a00c038e7 100644
--- a/addons/common/CfgVehicles.hpp
+++ b/addons/common/CfgVehicles.hpp
@@ -100,7 +100,7 @@ class CfgVehicles {
transportMaxWeapons = 9001;
transportMaxMagazines = 9001;
transportMaxItems = 9001;
- maximumload = 2000;
+ maximumload = 9001;
class TransportWeapons {};
class TransportMagazines {};
diff --git a/addons/common/RscInfoType.hpp b/addons/common/RscInfoType.hpp
index fe21b05265..9fd402f081 100644
--- a/addons/common/RscInfoType.hpp
+++ b/addons/common/RscInfoType.hpp
@@ -1,23 +1,107 @@
class RscInGameUI {
- class RscUnitInfo;
+ class RscUnitInfo {
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscUnitInfoNoHUD {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
class RscUnitInfoSoldier: RscUnitInfo {
- onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgSoldier', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Soldier')])] call FUNC(localEvent););
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgSoldier', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Soldier')])] call FUNC(localEvent););
};
+
class RscUnitInfoTank: RscUnitInfo {
- onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgVehicle', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Vehicle')])] call FUNC(localEvent););
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgVehicle', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Vehicle')])] call FUNC(localEvent););
};
+
class RscUnitInfoAir: RscUnitInfo {
- onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgAircraft', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Aircraft')])] call FUNC(localEvent););
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgAircraft', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Aircraft')])] call FUNC(localEvent););
};
+
+ class RscUnitInfo_AH64D_gunner {
+ onLoad = QUOTE(uiNamespace setVariable [ARR_2('ACE_dlgAircraft', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Aircraft')])] call FUNC(localEvent););
+ };
+
+ class RscUnitInfoUAV {
+ onLoad = QUOTE(uiNamespace setVariable [ARR_2('ACE_dlgUAV', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'UAV')])] call FUNC(localEvent););
+ };
+
class RscUnitInfoSubmarine: RscUnitInfo {
- onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgSubmarine', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Submarine')])] call FUNC(localEvent););
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgSubmarine', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Submarine')])] call FUNC(localEvent););
};
+
class RscUnitInfoShip: RscUnitInfo {
- onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgShip', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Ship')])] call FUNC(localEvent););
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgShip', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Ship')])] call FUNC(localEvent););
};
+
+ class RscWeaponEmpty {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscWeaponRangeFinder {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscWeaponRangeArtillery {
+ onLoad = QUOTE(uiNamespace setVariable [ARR_2('ACE_dlgArtillery', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Artillery')])] call FUNC(localEvent););
+ };
+
+ class RscWeaponRangeArtilleryAuto {
+ onLoad = QUOTE(uiNamespace setVariable [ARR_2('ACE_dlgArtillery', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Artillery')])] call FUNC(localEvent););
+ };
+
+ class RscWeaponRangeFinderPAS13 {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscOptics_LaserDesignator {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscWeaponRangeFinderMAAWS {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscWeaponRangeFinderAbramsCom {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscWeaponRangeFinderAbramsGun {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscWeaponRangeFinderStrykerMGSGun {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscOptics_strider_commander {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscOptics_titan {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscOptics_punisher {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscOptics_SDV_periscope {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
class RscUnitInfoParachute: RscUnitInfo {
- onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgParachute', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Parachute')])] call FUNC(localEvent););
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgParachute', _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Parachute')])] call FUNC(localEvent););
+ };
+
+ class RscUnitVehicle {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
+ };
+
+ class RscOptics_LaserDesignator_02 {
+ onLoad = QUOTE([ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])] call FUNC(localEvent););
};
};
@@ -25,6 +109,20 @@ class RscDisplayInventory {
onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDisplayInventory"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; [ARR_2('inventoryDisplayLoaded', _this)] call FUNC(localEvent););
};
-class RscDisplayChannel {
- onLoad = QUOTE(_this call FUNC(onLoadRscDisplayChannel));
+// map
+class RscDisplayMainMap {
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDiary"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgMap', _this select 0)]; [ARR_2('mapDisplayLoaded', [ARR_2(_this select 0, 'Ingame')])] call FUNC(localEvent););
+};
+
+class RscDisplayGetReady: RscDisplayMainMap {
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDiary"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgMap', _this select 0)]; [ARR_2('mapDisplayLoaded', [ARR_2(_this select 0, 'Briefing')])] call FUNC(localEvent););
+};
+
+class RscDisplayServerGetReady: RscDisplayGetReady {
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDiary"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgMap', _this select 0)]; [ARR_2('mapDisplayLoaded', [ARR_2(_this select 0, 'ServerBriefing')])] call FUNC(localEvent););
+};
+
+
+class RscDisplayClientGetReady: RscDisplayGetReady {
+ onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDiary"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgMap', _this select 0)]; [ARR_2('mapDisplayLoaded', [ARR_2(_this select 0, 'ClientBriefing')])] call FUNC(localEvent););
};
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 6db323a9f4..a88c349180 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -73,6 +73,7 @@ PREP(getStringFromMissionSQM);
PREP(getTargetAzimuthAndInclination);
PREP(getTargetDistance);
PREP(getTargetObject);
+PREP(getTurnedOnLights);
PREP(getTurretCommander);
PREP(getTurretConfigPath);
PREP(getTurretCopilot);
@@ -111,6 +112,7 @@ PREP(isModLoaded);
PREP(isPlayer);
PREP(isTurnedOut);
PREP(letterToCode);
+PREP(lightIntensityFromObject);
PREP(loadPerson);
PREP(loadPersonLocal);
PREP(loadSettingsFromProfile);
@@ -124,7 +126,6 @@ PREP(numberToDigits);
PREP(numberToDigitsString);
PREP(numberToString);
PREP(onAnswerRequest);
-PREP(onLoadRscDisplayChannel);
PREP(owned);
PREP(player);
PREP(playerSide);
@@ -189,6 +190,9 @@ PREP(getConfigGunner);
PREP(getConfigCommander);
PREP(getHitPoints);
PREP(getHitPointsWithSelections);
+PREP(getReflectorsWithSelections);
+PREP(getLightProperties);
+PREP(getLightPropertiesWeapon);
PREP(getVehicleCrew);
// turrets
@@ -268,10 +272,10 @@ ACE_player = player;
if (hasInterface) then {
// PFH to update the ACE_player variable
[{
- if !(ACE_player isEqualTo (missionNamespace getVariable ["BIS_fnc_moduleRemoteControl_unit", player])) then {
+ if !(ACE_player isEqualTo (call FUNC(player))) then {
_oldPlayer = ACE_player;
- ACE_player = missionNamespace getVariable ["BIS_fnc_moduleRemoteControl_unit", player];
+ ACE_player = call FUNC(player);
uiNamespace setVariable ["ACE_player", ACE_player];
// Raise ACE event
diff --git a/addons/common/functions/fnc_addCanInteractWithCondition.sqf b/addons/common/functions/fnc_addCanInteractWithCondition.sqf
index 99815a08a7..ef46b23706 100644
--- a/addons/common/functions/fnc_addCanInteractWithCondition.sqf
+++ b/addons/common/functions/fnc_addCanInteractWithCondition.sqf
@@ -29,7 +29,7 @@ private "_index";
_index = _conditionNames find _conditionName;
if (_index == -1) then {
- _index = count _conditionNames;
+ _index = count _conditionNames;
};
_conditionNames set [_index, _conditionName];
diff --git a/addons/common/functions/fnc_ambientBrightness.sqf b/addons/common/functions/fnc_ambientBrightness.sqf
index f29ff9e8e5..172739247f 100644
--- a/addons/common/functions/fnc_ambientBrightness.sqf
+++ b/addons/common/functions/fnc_ambientBrightness.sqf
@@ -11,4 +11,4 @@
*/
#include "script_component.hpp"
-sunOrMoon * sunOrMoon * (1 - overcast * 0.25) + (moonIntensity/5 min 1) * (1 - overcast)
+(sunOrMoon * sunOrMoon * (1 - overcast * 0.25) + (moonIntensity/5) * (1 - overcast)) min 1
diff --git a/addons/common/functions/fnc_blurScreen.sqf b/addons/common/functions/fnc_blurScreen.sqf
index c3d101a37e..8f5e50289f 100644
--- a/addons/common/functions/fnc_blurScreen.sqf
+++ b/addons/common/functions/fnc_blurScreen.sqf
@@ -15,28 +15,28 @@ _id = _this select 0;
_show = if (count _this > 1) then {_this select 1} else {false};
if (isnil QGVAR(SHOW_BLUR_SCREEN_COLLECTION)) then {
- GVAR(SHOW_BLUR_SCREEN_COLLECTION) = [];
+ GVAR(SHOW_BLUR_SCREEN_COLLECTION) = [];
};
if (typeName _show == typeName 0) then {
- _show = (_show == 1);
+ _show = (_show == 1);
};
if (_show) then {
- GVAR(SHOW_BLUR_SCREEN_COLLECTION) pushback _id;
- // show blur
- if (isnil QGVAR(MENU_ppHandle_GUI_BLUR_SCREEN)) then {
- GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) = ppEffectCreate ["DynamicBlur", 102];
- GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) ppEffectAdjust [0.9];
- GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) ppEffectEnable true;
- GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) ppEffectCommit 0;
- };
+ GVAR(SHOW_BLUR_SCREEN_COLLECTION) pushback _id;
+ // show blur
+ if (isnil QGVAR(MENU_ppHandle_GUI_BLUR_SCREEN)) then {
+ GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) = ppEffectCreate ["DynamicBlur", 102];
+ GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) ppEffectAdjust [0.9];
+ GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) ppEffectEnable true;
+ GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) ppEffectCommit 0;
+ };
} else {
- GVAR(SHOW_BLUR_SCREEN_COLLECTION) = GVAR(SHOW_BLUR_SCREEN_COLLECTION) - [_id];
- if (GVAR(SHOW_BLUR_SCREEN_COLLECTION) isEqualTo []) then {
- // hide blur
- if (!isnil QGVAR(MENU_ppHandle_GUI_BLUR_SCREEN)) then {
- ppEffectDestroy GVAR(MENU_ppHandle_GUI_BLUR_SCREEN);
- GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) = nil;
- };
- };
+ GVAR(SHOW_BLUR_SCREEN_COLLECTION) = GVAR(SHOW_BLUR_SCREEN_COLLECTION) - [_id];
+ if (GVAR(SHOW_BLUR_SCREEN_COLLECTION) isEqualTo []) then {
+ // hide blur
+ if (!isnil QGVAR(MENU_ppHandle_GUI_BLUR_SCREEN)) then {
+ ppEffectDestroy GVAR(MENU_ppHandle_GUI_BLUR_SCREEN);
+ GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) = nil;
+ };
+ };
};
diff --git a/addons/common/functions/fnc_currentChannel.sqf b/addons/common/functions/fnc_currentChannel.sqf
index a7ca8c1dd5..127f3b7a54 100644
--- a/addons/common/functions/fnc_currentChannel.sqf
+++ b/addons/common/functions/fnc_currentChannel.sqf
@@ -7,11 +7,20 @@
* NONE.
*
* Return value:
- * The current channel. Can be "group", "side", "global", "command", "vehicle" or "direct" (String)
+ * The current channel. Can be "group", "side", "global", "command", "vehicle", "direct" or "custom_X" (String)
*/
#include "script_component.hpp"
-#define CHANNELS ["group", "side", "global", "command", "vehicle", "direct"]
-#define CHANNELS_LOCALIZED [localize "str_channel_group", localize "str_channel_side", localize "str_channel_global", localize "str_channel_command", localize "str_channel_vehicle", localize "str_channel_direct"]
+#define CHANNELS ["global", "side", "command", "group", "vehicle", "direct"]
+#define CHANNELS_LOCALIZED [localize "str_channel_global", localize "str_channel_side", localize "str_channel_command", localize "str_channel_group", localize "str_channel_vehicle", localize "str_channel_direct"]
-CHANNELS select (CHANNELS_LOCALIZED find (uiNamespace getVariable [QGVAR(currentChannel), ""])) max 0
+private "_currentChannel";
+_currentChannel = currentChannel;
+
+if (_currentChannel < count CHANNELS) then {
+ _currentChannel = CHANNELS select _currentChannel;
+} else {
+ _currentChannel = format ["custom_%1", _currentChannel - count CHANNELS - 1];
+};
+
+_currentChannel
diff --git a/addons/common/functions/fnc_displayIcon.sqf b/addons/common/functions/fnc_displayIcon.sqf
index 1fbc4e89aa..15cda902d7 100644
--- a/addons/common/functions/fnc_displayIcon.sqf
+++ b/addons/common/functions/fnc_displayIcon.sqf
@@ -34,13 +34,13 @@
#define Y_POS_ICONS_SECOND (TOP_SIDE + (1.1 * ICON_WIDTH))
// setting values
-#define TOP_RIGHT_DOWN 1
-#define TOP_RIGHT_LEFT 2
-#define TOP_LEFT_DOWN 3
-#define TOP_LEFT_RIGHT 4
+#define TOP_RIGHT_DOWN 1
+#define TOP_RIGHT_LEFT 2
+#define TOP_LEFT_DOWN 3
+#define TOP_LEFT_RIGHT 4
// other constants
-#define DEFAULT_TIME 6
+#define DEFAULT_TIME 6
private ["_iconId", "_show", "_icon", "_allControls", "_refresh", "_timeAlive", "_list", "_color"];
_iconId = _this select 0;
@@ -53,68 +53,68 @@ disableSerialization;
_list = missionNamespace getvariable [QGVAR(displayIconList),[]];
_refresh = {
- private ["_allControls"];
- // Refreshing of all icons..
- _allControls = missionNamespace getvariable [QGVAR(displayIconListControls), []];
- {
- ctrlDelete _x;
- }foreach _allControls;
+ private ["_allControls"];
+ // Refreshing of all icons..
+ _allControls = missionNamespace getvariable [QGVAR(displayIconListControls), []];
+ {
+ ctrlDelete _x;
+ }foreach _allControls;
- _allControls = [];
+ _allControls = [];
- private ["_ctrl", "_setting"];
- _setting = missionNamespace getvariable[QGVAR(settingFeedbackIcons), 0];
- if (_setting > 0) then {
- {
- // +19000 because we want to make certain we are using free IDCs..
- _ctrl = ((findDisplay 46) ctrlCreate ["RscPicture", _foreachIndex + 19000]);
- _position = switch (_setting) do {
- case TOP_RIGHT_DOWN: {[X_POS_ICONS, Y_POS_ICONS + (_foreachIndex * DIFFERENCE_ICONS), ICON_WIDTH, ICON_WIDTH]};
- case TOP_RIGHT_LEFT: {[X_POS_ICONS_SECOND - ((_foreachIndex+3) * DIFFERENCE_ICONS), Y_POS_ICONS_SECOND - (ICON_WIDTH / 2), ICON_WIDTH, ICON_WIDTH]};
- case TOP_LEFT_DOWN: {[LEFT_SIDE + (0.5 * ICON_WIDTH), Y_POS_ICONS + (_foreachIndex * DIFFERENCE_ICONS), ICON_WIDTH, ICON_WIDTH]};
- case TOP_LEFT_RIGHT: {[LEFT_SIDE + (0.5 * ICON_WIDTH) - ((_foreachIndex+3) * DIFFERENCE_ICONS), Y_POS_ICONS_SECOND, ICON_WIDTH, ICON_WIDTH]};
- default {[X_POS_ICONS, Y_POS_ICONS + (_foreachIndex * DIFFERENCE_ICONS), ICON_WIDTH, ICON_WIDTH]};
- };
- _ctrl ctrlSetPosition _position;
- _ctrl ctrlsetText (_x select 1);
- _ctrl ctrlSetTextColor (_x select 2);
- _ctrl ctrlCommit 0;
- _allControls pushback _ctrl;
- }foreach (missionNamespace getvariable [QGVAR(displayIconList),[]]);
- };
- missionNamespace setvariable [QGVAR(displayIconListControls), _allControls];
+ private ["_ctrl", "_setting"];
+ _setting = missionNamespace getvariable[QGVAR(settingFeedbackIcons), 0];
+ if (_setting > 0) then {
+ {
+ // +19000 because we want to make certain we are using free IDCs..
+ _ctrl = ((findDisplay 46) ctrlCreate ["RscPicture", _foreachIndex + 19000]);
+ _position = switch (_setting) do {
+ case TOP_RIGHT_DOWN: {[X_POS_ICONS, Y_POS_ICONS + (_foreachIndex * DIFFERENCE_ICONS), ICON_WIDTH, ICON_WIDTH]};
+ case TOP_RIGHT_LEFT: {[X_POS_ICONS_SECOND - ((_foreachIndex+3) * DIFFERENCE_ICONS), Y_POS_ICONS_SECOND - (ICON_WIDTH / 2), ICON_WIDTH, ICON_WIDTH]};
+ case TOP_LEFT_DOWN: {[LEFT_SIDE + (0.5 * ICON_WIDTH), Y_POS_ICONS + (_foreachIndex * DIFFERENCE_ICONS), ICON_WIDTH, ICON_WIDTH]};
+ case TOP_LEFT_RIGHT: {[LEFT_SIDE + (0.5 * ICON_WIDTH) - ((_foreachIndex+3) * DIFFERENCE_ICONS), Y_POS_ICONS_SECOND, ICON_WIDTH, ICON_WIDTH]};
+ default {[X_POS_ICONS, Y_POS_ICONS + (_foreachIndex * DIFFERENCE_ICONS), ICON_WIDTH, ICON_WIDTH]};
+ };
+ _ctrl ctrlSetPosition _position;
+ _ctrl ctrlsetText (_x select 1);
+ _ctrl ctrlSetTextColor (_x select 2);
+ _ctrl ctrlCommit 0;
+ _allControls pushback _ctrl;
+ }foreach (missionNamespace getvariable [QGVAR(displayIconList),[]]);
+ };
+ missionNamespace setvariable [QGVAR(displayIconListControls), _allControls];
};
if (_show) then {
- if ({(_x select 0 == _iconId)} count _list == 0) then {
- _list pushback [_iconId, _icon, _color, time];
- } else {
- {
- if (_x select 0 == _iconId) exitwith {
- _list set [_foreachIndex, [_iconId, _icon, _color, time]];
- };
- }foreach _list;
- };
- missionNamespace setvariable [QGVAR(displayIconList), _list];
- call _refresh;
+ if ({(_x select 0 == _iconId)} count _list == 0) then {
+ _list pushback [_iconId, _icon, _color, time];
+ } else {
+ {
+ if (_x select 0 == _iconId) exitwith {
+ _list set [_foreachIndex, [_iconId, _icon, _color, time]];
+ };
+ }foreach _list;
+ };
+ missionNamespace setvariable [QGVAR(displayIconList), _list];
+ call _refresh;
- if (_timeAlive >= 0) then {
- [{
+ if (_timeAlive >= 0) then {
+ [{
[_this select 0, false, "", [0,0,0], 0] call FUNC(displayIcon);
}, [_iconId], _timeAlive, _timeAlive] call EFUNC(common,waitAndExecute);
- };
+ };
} else {
- if ({(_x select 0 == _iconId)} count _list == 1) then {
- private "_newList";
- _newList = [];
- {
- if (_x select 0 != _iconId) then {
- _newList pushback _x;
- };
- }foreach _list;
+ if ({(_x select 0 == _iconId)} count _list == 1) then {
+ private "_newList";
+ _newList = [];
+ {
+ if (_x select 0 != _iconId) then {
+ _newList pushback _x;
+ };
+ }foreach _list;
- missionNamespace setvariable [QGVAR(displayIconList), _newList];
- call _refresh;
- };
+ missionNamespace setvariable [QGVAR(displayIconList), _newList];
+ call _refresh;
+ };
};
diff --git a/addons/common/functions/fnc_dumpArray.sqf b/addons/common/functions/fnc_dumpArray.sqf
index a6f08cdd39..8a95172ea7 100644
--- a/addons/common/functions/fnc_dumpArray.sqf
+++ b/addons/common/functions/fnc_dumpArray.sqf
@@ -7,19 +7,19 @@ _var = _this select 0;
_depth = _this select 1;
_pad = "";
for "_i" from 0 to _depth do {
- _pad = _pad + toString [9];
+ _pad = _pad + toString [9];
};
_depth = _depth + 1;
if(IS_ARRAY(_var)) then {
- if((count _var) > 0) then {
- diag_log text format["%1[", _pad];
- {
- [_x, _depth] call FUNC(dumpArray);
- } forEach _var;
- diag_log text format["%1],", _pad];
- } else {
- diag_log text format["%1[],", _pad];
- };
+ if((count _var) > 0) then {
+ diag_log text format["%1[", _pad];
+ {
+ [_x, _depth] call FUNC(dumpArray);
+ } forEach _var;
+ diag_log text format["%1],", _pad];
+ } else {
+ diag_log text format["%1[],", _pad];
+ };
} else {
- diag_log text format["%1%2", _pad, [_var] call FUNC(formatVar)];
+ diag_log text format["%1%2", _pad, [_var] call FUNC(formatVar)];
};
diff --git a/addons/common/functions/fnc_dumpPerformanceCounters.sqf b/addons/common/functions/fnc_dumpPerformanceCounters.sqf
index b9afb8f7eb..acf81ff20a 100644
--- a/addons/common/functions/fnc_dumpPerformanceCounters.sqf
+++ b/addons/common/functions/fnc_dumpPerformanceCounters.sqf
@@ -6,42 +6,42 @@
diag_log text format["REGISTERED ACE PFH HANDLERS"];
diag_log text format["-------------------------------------------"];
if(!isNil "ACE_PFH_COUNTER") then {
- {
- private["_pfh"];
- _pfh = _x select 0;
- diag_log text format["Registered PFH: id=%1, %1:%2", (_pfh select 0), (_pfh select 1), (_pfh select 2) ];
- } forEach ACE_PFH_COUNTER;
+ {
+ private["_pfh"];
+ _pfh = _x select 0;
+ diag_log text format["Registered PFH: id=%1, %1:%2", (_pfh select 0), (_pfh select 1), (_pfh select 2) ];
+ } forEach ACE_PFH_COUNTER;
};
diag_log text format["ACE COUNTER RESULTS"];
diag_log text format["-------------------------------------------"];
{
- private["_counterEntry", "_iter", "_total", "_count", "_delta", "_averageResult"];
- _counterEntry = _x;
- _iter = 0;
- _total = 0;
- _count = 0;
- _averageResult = 0;
- if( (count _counterEntry) > 3) then {
- // calc
- {
- if(_iter > 2) then {
- _count = _count + 1;
- _delta = (_x select 1) - (_x select 0);
-
- _total = _total + _delta;
- };
- _iter = _iter + 1;
- } forEach _counterEntry;
-
- // results
- _averageResult = (_total / _count) * 1000;
-
- // dump results
- diag_log text format["%1: Average: %2s / %3 = %4ms", (_counterEntry select 0), _total, _count, _averageResult];
- } else {
- diag_log text format["%1: No results", (_counterEntry select 0) ];
- };
+ private["_counterEntry", "_iter", "_total", "_count", "_delta", "_averageResult"];
+ _counterEntry = _x;
+ _iter = 0;
+ _total = 0;
+ _count = 0;
+ _averageResult = 0;
+ if( (count _counterEntry) > 3) then {
+ // calc
+ {
+ if(_iter > 2) then {
+ _count = _count + 1;
+ _delta = (_x select 1) - (_x select 0);
+
+ _total = _total + _delta;
+ };
+ _iter = _iter + 1;
+ } forEach _counterEntry;
+
+ // results
+ _averageResult = (_total / _count) * 1000;
+
+ // dump results
+ diag_log text format["%1: Average: %2s / %3 = %4ms", (_counterEntry select 0), _total, _count, _averageResult];
+ } else {
+ diag_log text format["%1: No results", (_counterEntry select 0) ];
+ };
} forEach ACE_COUNTERS;
/*
@@ -49,21 +49,21 @@ diag_log text format["-------------------------------------------"];
diag_log text format["ACE_PERFORMANCE_EXCESSIVE_STEP_TRACKER"];
diag_log text format["-------------------------------------------"];
{
- private["_delay"];
- _delay = _x select 2;
- //if(_delay > 0) then { _delay = _delay / 1000; };
-
- diag_log text format["%1: %2s, delay=%3, handle=%4",(_x select 0), _delay, (_x select 3), (_x select 4)];
+ private["_delay"];
+ _delay = _x select 2;
+ //if(_delay > 0) then { _delay = _delay / 1000; };
+
+ diag_log text format["%1: %2s, delay=%3, handle=%4",(_x select 0), _delay, (_x select 3), (_x select 4)];
} forEach ACE_PERFORMANCE_EXCESSIVE_STEP_TRACKER;
// Dump PFH Trackers
diag_log text format["ACE_PERFORMANCE_EXCESSIVE_FRAME_TRACKER"];
diag_log text format["-------------------------------------------"];
{
- private["_delta"];
- _delta = _x select 1;
- //if(_delta > 0) then { _delta = _delta / 1000; };
- diag_log text format[" DELTA: %1s", _delta];
+ private["_delta"];
+ _delta = _x select 1;
+ //if(_delta > 0) then { _delta = _delta / 1000; };
+ diag_log text format[" DELTA: %1s", _delta];
} forEach ACE_PERFORMANCE_EXCESSIVE_FRAME_TRACKER;
//{
diff --git a/addons/common/functions/fnc_getAllGear.sqf b/addons/common/functions/fnc_getAllGear.sqf
index efb58a0b9d..1b1d7e03fa 100644
--- a/addons/common/functions/fnc_getAllGear.sqf
+++ b/addons/common/functions/fnc_getAllGear.sqf
@@ -1,5 +1,5 @@
/*
- * Author: bux578
+ * Author: bux578, commy2
*
* Returns an array containing all items of a given unit
*
@@ -7,32 +7,45 @@
* 0: Unit (Object)
*
* Return value:
- * Array with all the gear
+ * Array with all the gear, format:
+ * 0: headgear (String)
+ * 1: goggles (String)
+ * 2,3: uniform (String, Array)
+ * 4,5: vest (String, Array)
+ * 6,7: backpack (String, Array)
+ * 8-10: rifle (String, Array, Array)
+ * 11-13: launcher (String, Array, Array)
+ * 14-16: pistol (String, Array, Array)
+ * 17: map, compass, watch, etc. (Array)
+ * 18: binocluar (String)
+ *
*/
#include "script_component.hpp"
EXPLODE_1_PVT(_this,_unit);
-if (isNull _unit) exitWith {[]};
+if (isNull _unit) exitWith {[
+ "",
+ "",
+ "", [],
+ "", [],
+ "", [],
+ "", ["","","",""], [],
+ "", ["","","",""], [],
+ "", ["","","",""], [],
+ [],
+ ""
+]};
[
- (headgear _unit),
- (goggles _unit),
- (uniform _unit),
- (uniformItems _unit),
- (vest _unit),
- (vestItems _unit),
- (backpack _unit),
- (backpackItems _unit),
- (primaryWeapon _unit),
- (primaryWeaponItems _unit),
- (primaryWeaponMagazine _unit),
- (secondaryWeapon _unit),
- (secondaryWeaponItems _unit),
- (secondaryWeaponMagazine _unit),
- (handgunWeapon _unit),
- (handgunItems _unit),
- (handgunMagazine _unit),
- (assignedItems _unit),
- (binocular _unit)
-]
\ No newline at end of file
+ headgear _unit,
+ goggles _unit,
+ uniform _unit, uniformItems _unit,
+ vest _unit, vestItems _unit,
+ backpack _unit, backpackItems _unit,
+ primaryWeapon _unit, primaryWeaponItems _unit, primaryWeaponMagazine _unit,
+ secondaryWeapon _unit, secondaryWeaponItems _unit, secondaryWeaponMagazine _unit,
+ handgunWeapon _unit, handgunItems _unit, handgunMagazine _unit,
+ assignedItems _unit,
+ binocular _unit
+]
diff --git a/addons/common/functions/fnc_getGunner.sqf b/addons/common/functions/fnc_getGunner.sqf
index 2980246504..e832214601 100644
--- a/addons/common/functions/fnc_getGunner.sqf
+++ b/addons/common/functions/fnc_getGunner.sqf
@@ -16,8 +16,10 @@ private ["_vehicle", "_weapon"];
_vehicle = _this select 0;
_weapon = _this select 1;
-if (gunner _vehicle == _vehicle && {_weapon in weapons _vehicle}) exitWith {gunner _vehicle};
+// on foot
+if (gunner _vehicle == _vehicle && {_weapon in weapons _vehicle || {toLower _weapon in ["throw", "put"]}}) exitWith {gunner _vehicle};
+// inside vehicle
private "_gunner";
_gunner = objNull;
@@ -27,4 +29,9 @@ _gunner = objNull;
};
} forEach allTurrets [_vehicle, true];
+// ensure that at least the pilot is returned if there is no gunner
+if (isManualFire _vehicle && {isNull _gunner}) then {
+ _gunner = driver _vehicle;
+};
+
_gunner
diff --git a/addons/common/functions/fnc_getLightProperties.sqf b/addons/common/functions/fnc_getLightProperties.sqf
new file mode 100644
index 0000000000..ee1884ac1b
--- /dev/null
+++ b/addons/common/functions/fnc_getLightProperties.sqf
@@ -0,0 +1,63 @@
+/*
+ * Author: commy2
+ * Read properties of given vehicles light.
+ *
+ * Arguments:
+ * 0: Object with lights (Object)
+ * 1: Light classname (String)
+ *
+ * Return Value:
+ * Stuff from config (Array)
+ *
+ */
+#include "script_component.hpp"
+
+private ["_vehicle", "_light"];
+
+_vehicle = _this select 0;
+_light = _this select 1;
+
+private "_config";
+_config = configFile >> "CfgVehicles" >> typeOf _vehicle >> "Reflectors" >> _light;
+
+private ["_intensity", "_position", "_direction", "_innerAngle", "_outerAngle"];
+
+_intensity = getNumber (_config >> "intensity");
+_position = getText (_config >> "position");
+_direction = getText (_config >> "direction");
+_innerAngle = getNumber (_config >> "innerAngle");
+_outerAngle = getNumber (_config >> "outerAngle");
+
+[_intensity, _position, _direction, _innerAngle, _outerAngle]
+
+/*
+class Reflectors
+{
+ class Light_1
+ {
+ color[] = {1000,1000,1100};
+ ambient[] = {10,10,11};
+ intensity = 5;
+ size = 1;
+ innerAngle = 90;
+ outerAngle = 130;
+ coneFadeCoef = 2;
+ position = "Light_1_pos";
+ direction = "Light_1_dir";
+ hitpoint = "Light_1_hitpoint";
+ selection = "Light_1_hide";
+ useFlare = 1;
+ flareSize = 0.9;
+ flareMaxDistance = 85;
+ class Attenuation
+ {
+ start = 0;
+ constant = 0;
+ linear = 0;
+ quadratic = 0.9;
+ hardLimitStart = 40;
+ hardLimitEnd = 60;
+ };
+ };
+};
+*/
diff --git a/addons/common/functions/fnc_getLightPropertiesWeapon.sqf b/addons/common/functions/fnc_getLightPropertiesWeapon.sqf
new file mode 100644
index 0000000000..d444654b5f
--- /dev/null
+++ b/addons/common/functions/fnc_getLightPropertiesWeapon.sqf
@@ -0,0 +1,58 @@
+/*
+ * Author: commy2
+ * Read properties of given flashlight. @todo, Can weapons themselves still have flashlights (no attachment)?
+ *
+ * Arguments:
+ * 0: A flashlight (String)
+ *
+ * Return Value:
+ * Stuff from config (Array)
+ *
+ */
+#include "script_component.hpp"
+
+private "_weapon";
+
+_weapon = _this select 0;
+
+private "_config";
+_config = configFile >> "CfgWeapons" >> _weapon >> "ItemInfo" >> "FlashLight";
+
+private ["_intensity", "_position", "_direction", "_innerAngle", "_outerAngle"];
+
+_intensity = getNumber (_config >> "intensity");
+_position = getText (_config >> "position");
+_direction = getText (_config >> "direction");
+_innerAngle = getNumber (_config >> "innerAngle");
+_outerAngle = getNumber (_config >> "outerAngle");
+
+[_intensity, _position, _direction, _innerAngle, _outerAngle]
+
+/*
+class FlashLight
+{
+ color[] = {180,156,120};
+ ambient[] = {0.9,0.78,0.6};
+ intensity = 20;
+ size = 1;
+ innerAngle = 20;
+ outerAngle = 80;
+ coneFadeCoef = 5;
+ position = "flash dir";
+ direction = "flash";
+ useFlare = 1;
+ flareSize = 1.4;
+ flareMaxDistance = "100.0f";
+ dayLight = 0;
+ class Attenuation
+ {
+ start = 0.5;
+ constant = 0;
+ linear = 0;
+ quadratic = 1.1;
+ hardLimitStart = 20;
+ hardLimitEnd = 30;
+ };
+ scale[] = {0};
+};
+*/
diff --git a/addons/common/functions/fnc_getReflectorsWithSelections.sqf b/addons/common/functions/fnc_getReflectorsWithSelections.sqf
new file mode 100644
index 0000000000..6d47943155
--- /dev/null
+++ b/addons/common/functions/fnc_getReflectorsWithSelections.sqf
@@ -0,0 +1,45 @@
+/*
+ * Author: commy2
+ *
+ * Returns all lighting hitpoints of any vehicle.
+ * Note: These are actual selections that are affected by setHit and getHit, not getHitPointDamage or setHitpointDamage.
+ * They behave like having an armor value of 0.
+ *
+ * Arguments:
+ * 0: A vehicle, not the classname (Object)
+ *
+ * Return Value:
+ * The light names and selections (Array)
+ */
+#include "script_component.hpp"
+
+private ["_vehicle", "_config", "_hitpoints", "_selections"];
+
+_vehicle = _this select 0;
+
+_config = configFile >> "CfgVehicles" >> typeOf _vehicle;
+
+_hitpoints = [];
+_selections = [];
+
+// iterate through all parents
+while {isClass _config} do {
+ private "_class";
+ _class = _config >> "Reflectors";
+
+ for "_i" from 0 to (count _class - 1) do {
+ private ["_entry", "_selection"];
+
+ _entry = _class select _i;
+ _selection = getText (_entry >> "hitpoint");
+
+ if (!(_selection in _selections) && {!isNil {_vehicle getHit _selection}}) then {
+ _hitpoints pushBack configName _entry;
+ _selections pushBack _selection;
+ };
+ };
+
+ _config = inheritsFrom _config;
+};
+
+[_hitPoints, _selections]
diff --git a/addons/common/functions/fnc_getTurnedOnLights.sqf b/addons/common/functions/fnc_getTurnedOnLights.sqf
new file mode 100644
index 0000000000..e50c15f593
--- /dev/null
+++ b/addons/common/functions/fnc_getTurnedOnLights.sqf
@@ -0,0 +1,37 @@
+/*
+ * Author: commy2
+ *
+ * Returns all turned on lights of any vehicle or streetlamp.
+ *
+ * Arguments:
+ * 0: A vehicle, not the classname (Object)
+ *
+ * Return Value:
+ * All burning lights (Array)
+ */
+#include "script_component.hpp"
+
+private "_vehicle";
+
+_vehicle = _this select 0;
+
+if (!isLightOn _vehicle) exitWith {[]};
+
+private ["_reflectorsWithSelections", "_lights", "_hitpoints"];
+
+_reflectorsWithSelections = [[_vehicle], FUNC(getReflectorsWithSelections), uiNamespace, format [QEGVAR(cache,%1_%2), QUOTE(DFUNC(getReflectorsWithSelections)), typeOf _vehicle], 1E11] call FUNC(cachedCall);
+//_reflectorsWithSelections = [_vehicle] call FUNC(getReflectorsWithSelections);
+
+_lights = _reflectorsWithSelections select 0;
+_hitpoints = _reflectorsWithSelections select 1;
+
+private "_turnedOnLights";
+_turnedOnLights = [];
+{
+ if (_vehicle getHit _x <= 0.9) then {
+ _turnedOnLights pushBack (_lights select _forEachIndex);
+ };
+
+} forEach _hitpoints;
+
+_turnedOnLights
diff --git a/addons/common/functions/fnc_lightIntensityFromObject.sqf b/addons/common/functions/fnc_lightIntensityFromObject.sqf
new file mode 100644
index 0000000000..785ebf8212
--- /dev/null
+++ b/addons/common/functions/fnc_lightIntensityFromObject.sqf
@@ -0,0 +1,109 @@
+/*
+ * Author: commy2
+ * Calculate light intensity object 1 recieves from object 2
+ *
+ * Arguments:
+ * 0: Object that recieves light (Object)
+ * 1: Object that emits light (Object)
+ *
+ * Return Value:
+ * Brightest light level
+ *
+ */
+#include "script_component.hpp"
+
+private ["_unit", "_lightSource"];
+
+_unit = _this select 0;
+_lightSource = _this select 1;
+
+private "_unitPos";
+_unitPos = _unit modelToWorld (_unit selectionPosition "spine3");
+
+private "_lightLevel";
+_lightLevel = 0;
+
+if (_lightSource isKindOf "CAManBase") then {
+ // handle persons with flashlights
+
+ private "_weapon";
+ _weapon = currentWeapon _lightSource;
+
+ if !(_lightSource isFlashlightOn _weapon) exitWith {};
+
+ private ["_flashlight", "_properties", "_intensity", "_innerAngle", "_outerAngle", "_position", "_direction", "_directionToUnit", "_distance", "_angle"];
+
+ _flashlight = switch (_weapon) do {
+ case (primaryWeapon _lightSource): {
+ primaryWeaponItems _lightSource select 1
+ };
+ case (secondaryWeapon _lightSource): {
+ secondaryWeaponItems _lightSource select 1
+ };
+ case (handgunWeapon _lightSource): {
+ handgunItems _lightSource select 1
+ };
+ default {""};
+ };
+
+ _properties = [[_flashlight], FUNC(getLightPropertiesWeapon), uiNamespace, format [QEGVAR(cache,%1_%2), QUOTE(DFUNC(getLightPropertiesWeapon)), _flashlight], 1E11] call FUNC(cachedCall);
+ //_properties = [_flashlight] call FUNC(getLightPropertiesWeapon);
+
+ _innerAngle = (_properties select 3) / 2;
+ _outerAngle = (_properties select 4) / 2;
+
+ _position = _lightSource modelToWorld (_lightSource selectionPosition "rightHand");
+ _direction = _lightSource weaponDirection _weapon;
+
+ _directionToUnit = _position vectorFromTo _unitPos;
+
+ _distance = _unitPos distance _position;
+ _angle = acos (_direction vectorDotProduct _directionToUnit);
+
+ _lightLevel = (linearConversion [0, 30, _distance, 1, 0, true]) * (linearConversion [_innerAngle, _outerAngle, _angle, 1, 0, true]);
+
+} else {
+ // handle any object, strcutures, cars, tanks, etc. @todo campfires, burning vehicles
+
+ private "_lights";
+ _lights = [_lightSource] call FUNC(getTurnedOnLights);
+
+ {
+ private ["_properties", "_intensity", "_innerAngle", "_outerAngle", "_position", "_direction", "_directionToUnit", "_distance", "_angle"];
+
+ _properties = [[_lightSource, _x], FUNC(getLightProperties), uiNamespace, format [QEGVAR(cache,%1_%2_%3), QUOTE(DFUNC(getLightProperties)), typeOf _lightSource, _x], 1E11] call FUNC(cachedCall);
+ //_properties = [_lightSource, _x] call FUNC(getLightProperties);
+
+ // @todo intensity affects range?
+ //_intensity = _properties select 0;
+
+ _innerAngle = (_properties select 3) / 2;
+ _outerAngle = (_properties select 4) / 2;
+
+ // get world position and direction
+ _position = _lightSource modelToWorld (_lightSource selectionPosition (_properties select 1));
+ _direction = _lightSource modelToWorld (_lightSource selectionPosition (_properties select 2));
+
+ _direction = _position vectorFromTo _direction;
+ _directionToUnit = _position vectorFromTo _unitPos;
+
+ _distance = _unitPos distance _position;
+ _angle = acos (_direction vectorDotProduct _directionToUnit);
+
+ _lightLevel = _lightLevel max ((linearConversion [0, 30, _distance, 1, 0, true]) * (linearConversion [_innerAngle, _outerAngle, _angle, 1, 0, true]));
+
+ //systemChat format ["%1 %2", (linearConversion [0, 30, _distance, 1, 0, true]), (linearConversion [_innerAngle, _outerAngle, _angle, 1, 0, true])];
+
+ } forEach _lights;
+
+ // handle campfires
+ if (inflamed _lightSource) then {
+ private "_distance";
+ _distance = _unitPos distance position _lightSource;
+
+ _lightLevel = _lightLevel max linearConversion [0, 30, _distance, 0.5, 0, true];
+ };
+
+};
+
+_lightLevel
diff --git a/addons/common/functions/fnc_logModEntries.sqf b/addons/common/functions/fnc_logModEntries.sqf
index 827802ad3f..4b94c557bc 100644
--- a/addons/common/functions/fnc_logModEntries.sqf
+++ b/addons/common/functions/fnc_logModEntries.sqf
@@ -7,11 +7,11 @@ _configs = "true" configClasses (configFile >> _this);
_entries = [];
{
- {
- _name = toLower configName _x;
- if !(_name in _entries) then {
- diag_log text _name;
- _entries pushBack _name;
- };
- } forEach configProperties [_x, "toLower configName _x find 'ace' == 0", false];
+ {
+ _name = toLower configName _x;
+ if !(_name in _entries) then {
+ diag_log text _name;
+ _entries pushBack _name;
+ };
+ } forEach configProperties [_x, "toLower configName _x find 'ace' == 0", false];
} forEach _configs;
diff --git a/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf b/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf
deleted file mode 100644
index ae8113c1b8..0000000000
--- a/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Author: Pabst Mirror, commy2
- * When the RscDisplayChannel is loaded, this will constantly uiNamespace variable ace_common_currentChannel
- * with the raw localized text of CA_Channel (IDC=101). Only runs while the display is open.
- *
- * Arguments:
- * 0: The RscDisplayChannel Display
- *
- * Return Value:
- * Nothing
- *
- * Example:
- * onLoad = QUOTE(_this call FUNC(onLoadRscDisplayChannel));
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-uiNamespace setVariable [QGVAR(currentChannelControl), ((_this select 0) displayCtrl 101)];
-
-["ACE_currentChannel", "onEachFrame", {
- if (isNull (uiNamespace getVariable [QGVAR(currentChannelControl), controlNull])) then {
- ["ACE_currentChannel", "onEachFrame"] call BIS_fnc_removeStackedEventHandler;
- } else {
- private "_localizedChannelText";
- _localizedChannelText = ctrlText (uiNamespace getVariable [QGVAR(currentChannelControl), controlNull]);
- uiNamespace setVariable [QGVAR(currentChannel), _localizedChannelText];
- };
-}] call BIS_fnc_addStackedEventhandler;
diff --git a/addons/common/functions/fnc_sendDisplayInformationTo.sqf b/addons/common/functions/fnc_sendDisplayInformationTo.sqf
index f22894e057..33254fa81e 100644
--- a/addons/common/functions/fnc_sendDisplayInformationTo.sqf
+++ b/addons/common/functions/fnc_sendDisplayInformationTo.sqf
@@ -18,30 +18,30 @@ _type = [_this, 3, 0,[0]] call BIS_fnc_Param;
_parameters = [_this, 4, [], [[]]] call BIS_fnc_Param;
if (isPlayer _reciever) then {
- if (!local _reciever) then {
- [_this, QUOTE(FUNC(sendDisplayInformationTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
- } else {
- if (isLocalized _title) then {
- _title = localize _title;
- };
- _localizationArray = [_title];
- {
- _localizationArray pushback _x;
- }foreach _parameters;
- _title = format _localizationArray;
+ if (!local _reciever) then {
+ [_this, QUOTE(FUNC(sendDisplayInformationTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
+ } else {
+ if (isLocalized _title) then {
+ _title = localize _title;
+ };
+ _localizationArray = [_title];
+ {
+ _localizationArray pushback _x;
+ }foreach _parameters;
+ _title = format _localizationArray;
- {
- if (isLocalized _x) then {
- _localizationArray = [localize _x];
- {
- _localizationArray pushback _x;
- }foreach _parameters;
+ {
+ if (isLocalized _x) then {
+ _localizationArray = [localize _x];
+ {
+ _localizationArray pushback _x;
+ }foreach _parameters;
- _content set [_foreachIndex, format _localizationArray];
- };
+ _content set [_foreachIndex, format _localizationArray];
+ };
- }foreach _content;
+ }foreach _content;
- [_title,_content,_type] call EFUNC(common,displayInformation);
- };
+ [_title,_content,_type] call EFUNC(common,displayInformation);
+ };
};
\ No newline at end of file
diff --git a/addons/common/functions/fnc_sendDisplayMessageTo.sqf b/addons/common/functions/fnc_sendDisplayMessageTo.sqf
index 3c5b399659..e042f69939 100644
--- a/addons/common/functions/fnc_sendDisplayMessageTo.sqf
+++ b/addons/common/functions/fnc_sendDisplayMessageTo.sqf
@@ -18,29 +18,29 @@ _type = [_this, 3, 0,[0]] call BIS_fnc_Param;
_parameters = [_this, 4, [], [[]]] call BIS_fnc_Param;
if (isPlayer _reciever) then {
- if (!local _reciever) then {
- [_this, QUOTE(FUNC(sendDisplayMessageTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
- } else {
+ if (!local _reciever) then {
+ [_this, QUOTE(FUNC(sendDisplayMessageTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
+ } else {
- if (isLocalized _title) then {
- _title = localize _title;
- };
- if (isLocalized _content) then {
- _content = localize _content;
- };
+ if (isLocalized _title) then {
+ _title = localize _title;
+ };
+ if (isLocalized _content) then {
+ _content = localize _content;
+ };
- _localizationArray = [_title];
- {
- _localizationArray pushback _x;
- }foreach _parameters;
- _title = format _localizationArray;
+ _localizationArray = [_title];
+ {
+ _localizationArray pushback _x;
+ }foreach _parameters;
+ _title = format _localizationArray;
- _localizationArray = [_content];
- {
- _localizationArray pushback _x;
- }foreach _parameters;
- _content = format _localizationArray;
+ _localizationArray = [_content];
+ {
+ _localizationArray pushback _x;
+ }foreach _parameters;
+ _content = format _localizationArray;
- [_title,_content,_type] call EFUNC(common,displayMessage);
- };
+ [_title,_content,_type] call EFUNC(common,displayMessage);
+ };
};
\ No newline at end of file
diff --git a/addons/common/functions/script_component.hpp b/addons/common/functions/script_component.hpp
index d1032476b6..95b7e86461 100644
--- a/addons/common/functions/script_component.hpp
+++ b/addons/common/functions/script_component.hpp
@@ -1,13 +1,13 @@
#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 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;\
- };
\ No newline at end of file
+#define ERRORDATA(c) private ["_callFrom", "_lineNo"];\
+ _callFrom = "";\
+ _lineNo = -1;\
+ if((count _this) > c) then {\
+ _callFrom = _this select c;\
+ _lineNo = _this select c+1;\
+ };
\ No newline at end of file
diff --git a/addons/common/scripts/Version/checkVersionNumber.sqf b/addons/common/scripts/Version/checkVersionNumber.sqf
index 87b89a8b6b..e6509cd9c4 100644
--- a/addons/common/scripts/Version/checkVersionNumber.sqf
+++ b/addons/common/scripts/Version/checkVersionNumber.sqf
@@ -27,6 +27,9 @@ _versions = [];
_versions set [_forEachIndex, _version];
} forEach _files;
+_versionFull = getText (configFile >> "CfgPatches" >> QUOTE(ADDON) >> "versionStr");
+diag_log text format ["[ACE] Full Version Number: %1", _versionFull];
+
if (isServer) then {
diag_log text format ["[ACE] Server: ACE_Common is Version %1.", _versionMain];
@@ -81,7 +84,7 @@ if (!isServer) then {
_index = _files find _x;
if (_index == -1) then {
- _missingAddons pushBack _x;
+ if (_x != "ace_serverconfig") then {_missingAddons pushBack _x;};
} else {
_clientVersion = _versions select _index;
diff --git a/addons/disposable/script_component.hpp b/addons/disposable/script_component.hpp
index 6d26a5431c..375e44147d 100644
--- a/addons/disposable/script_component.hpp
+++ b/addons/disposable/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\Addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_ATTACH
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_ATTACH
- #define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH
+ #define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH
#endif
#include "\z\ace\Addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/addons/dragging/config.cpp b/addons/dragging/config.cpp
index 2d5854d86f..c58aab607e 100644
--- a/addons/dragging/config.cpp
+++ b/addons/dragging/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ace_common","ace_interaction","ace_interact_menu"};
+ requiredAddons[] = {"ace_interaction"};
author[] = {"Garth 'L-H' de Wet","commy2"};
authorUrl = "https://github.com/commy2/";
VERSION_CONFIG;
diff --git a/addons/dragging/functions/fnc_canCarry.sqf b/addons/dragging/functions/fnc_canCarry.sqf
index 24426d0e3a..4067b366d6 100644
--- a/addons/dragging/functions/fnc_canCarry.sqf
+++ b/addons/dragging/functions/fnc_canCarry.sqf
@@ -22,4 +22,4 @@ if !([_unit, _target, []] call EFUNC(common,canInteractWith)) exitWith {false};
// a static weapon has to be empty for dragging
if ((typeOf _target) isKindOf "StaticWeapon" && {count crew _target > 0}) exitWith {false};
-alive _target && {_target getVariable [QGVAR(canCarry), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false])}
+alive _target && {_target getVariable [QGVAR(canCarry), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false]) || (_target isKindOf "CAManBase" && {(_target getHitPointDamage "HitLeftLeg") + (_target getHitPointDamage "HitRightLeg") > 0.4})}
diff --git a/addons/dragging/functions/fnc_canDrag.sqf b/addons/dragging/functions/fnc_canDrag.sqf
index f0e269983a..dc2d64168b 100644
--- a/addons/dragging/functions/fnc_canDrag.sqf
+++ b/addons/dragging/functions/fnc_canDrag.sqf
@@ -22,4 +22,4 @@ if !([_unit, _target, []] call EFUNC(common,canInteractWith)) exitWith {false};
// a static weapon has to be empty for dragging
if ((typeOf _target) isKindOf "StaticWeapon" && {count crew _target > 0}) exitWith {false};
-alive _target && {_target getVariable [QGVAR(canDrag), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false])}
+alive _target && {_target getVariable [QGVAR(canDrag), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false]) || (_target isKindOf "CAManBase" && {(_target getHitPointDamage "HitLeftLeg") + (_target getHitPointDamage "HitRightLeg") > 0.4})};
\ No newline at end of file
diff --git a/addons/dragging/functions/fnc_getWeight.sqf b/addons/dragging/functions/fnc_getWeight.sqf
index 2b44bf90d9..871c49db89 100644
--- a/addons/dragging/functions/fnc_getWeight.sqf
+++ b/addons/dragging/functions/fnc_getWeight.sqf
@@ -1,20 +1,20 @@
/*
- Name: AGM_Drag_fnc_GetWeight
-
- Author(s):
- L-H, edited by commy2
+ Name: AGM_Drag_fnc_GetWeight
+
+ Author(s):
+ L-H, edited by commy2
- Description:
- Returns the weight of a crate.
-
- Parameters:
- 0: OBJECT - Crate to get weight of
-
- Returns:
- NUMBER - Weight
-
- Example:
- _weight = Crate1 call AGM_Drag_fnc_GetWeight;
+ Description:
+ Returns the weight of a crate.
+
+ Parameters:
+ 0: OBJECT - Crate to get weight of
+
+ Returns:
+ NUMBER - Weight
+
+ Example:
+ _weight = Crate1 call AGM_Drag_fnc_GetWeight;
*/
#include "script_component.hpp"
@@ -25,24 +25,24 @@ _object = _this select 0;
private ["_totalWeight", "_fnc","_fnc_Extra"];
_totalWeight = 0;
_fnc_Extra = {
- private ["_weight", "_items"];
- _items = _this select 0;
- _weight = 0;
- {
- _weight = _weight + (getNumber (ConfigFile >> (_this select 1) >> _x >> (_this select 2) >> "mass") * ((_items select 1) select _foreachIndex));
- } foreach (_items select 0);
-
- _weight
+ private ["_weight", "_items"];
+ _items = _this select 0;
+ _weight = 0;
+ {
+ _weight = _weight + (getNumber (ConfigFile >> (_this select 1) >> _x >> (_this select 2) >> "mass") * ((_items select 1) select _foreachIndex));
+ } foreach (_items select 0);
+
+ _weight
};
_fnc = {
- private ["_weight", "_items"];
- _items = _this select 0;
- _weight = 0;
- {
- _weight = _weight + (getNumber (ConfigFile >> (_this select 1) >> _x >> "mass") * ((_items select 1) select _foreachIndex));
- } foreach (_items select 0);
-
- _weight
+ private ["_weight", "_items"];
+ _items = _this select 0;
+ _weight = 0;
+ {
+ _weight = _weight + (getNumber (ConfigFile >> (_this select 1) >> _x >> "mass") * ((_items select 1) select _foreachIndex));
+ } foreach (_items select 0);
+
+ _weight
};
_totalWeight = ([getMagazineCargo _object, "CfgMagazines"] call _fnc);
_totalWeight = _totalWeight + ([getItemCargo _object, "CfgWeapons", "ItemInfo"] call _fnc_Extra);
diff --git a/addons/dragging/functions/fnc_handleUnconscious.sqf b/addons/dragging/functions/fnc_handleUnconscious.sqf
index 6ca9609b63..41562756a2 100644
--- a/addons/dragging/functions/fnc_handleUnconscious.sqf
+++ b/addons/dragging/functions/fnc_handleUnconscious.sqf
@@ -9,6 +9,8 @@ _isUnconscious = _this select 1;
private "_player";
_player = ACE_player;
+if ((_unit getHitPointDamage "HitLeftLeg") + (_unit getHitPointDamage "HitRightLeg") > 0.4) exitwith {};
+
if (_player getVariable [QGVAR(isDragging), false]) then {
private "_draggedObject";
diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml
index 1fca04fee1..9193d2712e 100644
--- a/addons/dragging/stringtable.xml
+++ b/addons/dragging/stringtable.xml
@@ -29,6 +29,7 @@
Item to heavyGegenstand zu schwer
+ Articulo demasiado pesado
-
-
-
- Inject Atropine
- Atropin
-
-
- Inject Epinephrine
- Epinephrine injizieren
- Inyectar Epinefrina
- Wtrzyknij adrenalinę
- Aplikovat Adrenalin
- Ввести андреналил
- Adrénaline
- Adrenalin
- Injetar Epinefrina
- Inietta Epinefrina
-
-
- Inject Morphine
- Morphin injizieren
- Inyectar Morfina
- Wstrzyknij morfinę
- Aplikovat Morfin
- Ввести морфин
- Morphine
- Morfium
- Injetar Morfina
- Inietta Morfina
-
-
- Transfuse Blood
- Bluttransfusion
- Transfundir sangre
- Przetocz krew
- Transfúze krve
- Перелить кровь
- Transfusion
- Infúzió
- Transfundir Sangue
- Effettua Trasfusione
-
-
- Transfuse Plasma
- Plasmatransfusion
-
-
- Transfuse Saline
- Salzlösungtransfusion
-
-
- Apply Tourniquet
- Aderpresse anwenden
-
-
- Bandage
- Verbinden
- Venda
- Bandaż
- Obvázat
- Pansement
- Benda
- Kötözés
- Atadura
- Перевязать
-
-
- Bandage Head
- Kopf verbinden
- Vendar la cabeza
- Bandażuj głowę
- Obvázat hlavu
- Перевязать голову
- Pansement Tête
- Fej kötözése
- Atar Cabeça
- Benda la testa
-
-
- Bandage Torso
- Torso verbinden
- Vendar el torso
- Bandażuj tors
- Obvázat hruď
- Перевязать торс
- Pansement Torse
- Felsőtest kötözése
- Atar Tronco
- Benda il torso
-
-
- Bandage Left Arm
- Arm links verbinden
- Vendar el brazo izquierdo
- Bandażuj lewe ramię
- Obvázat levou ruku
- Перевязать левую руку
- Pansement Bras Gauche
- Bal kar kötözése
- Atar Braço Esquerdo
- Benda il braccio sinistro
-
-
- Bandage Right Arm
- Arm rechts verbinden
- Vendar el brazo derecho
- Bandażuj prawe ramię
- Obvázat pravou ruku
- Перевязать правую руку
- Pansement Bras Droit
- Jobb kar kötözése
- Atar Braço Direito
- Benda il braccio destro
-
-
- Bandage Left Leg
- Bein links verbinden
- Vendar la pierna izquierda
- Bandażuj lewą nogę
- Obvázat levou nohu
- Перевязать левую ногу
- Pansement Jambe Gauche
- Bal láb kötözése
- Atar Perna Esquerda
- Benda la gamba sinistra
-
-
- Bandage Right Leg
- Bein rechts verbinden
- Vendar la pierna derecha
- Bandażuj prawą nogę
- Obvázat pravou nohu
- Перевязать правую ногу
- Pansement Jambe Droite
- Jobb láb kötözése
- Atar Perna Direita
- Benda la gamba destra
-
-
- Injecting Morphine ...
- Morphin injizieren ...
- Inyectando Morfina ...
- Wstrzykiwanie morfiny ...
- Aplikuju Morfin ...
- Введение морфина...
- Injection de Morphine...
- Morfium beadása...
- Injetando Morfina ...
- Inietto la morfina ...
-
-
- Injecting Epinephrine ...
- Epinephrin injizieren ...
- Inyectando Epinefrina ...
- Wstrzykiwanie adrenaliny ...
- Aplikuju Adrenalin ...
- Введение андреналина
- Injection d'Adrénaline ...
- Adrenalin beadása...
- Injetando Epinefrina ...
- Inietto l'epinefrina ...
-
-
- Injecting Atropine ...
- Atropin injizieren ...
-
-
- Transfusing Blood ...
- Bluttransfusion ...
- Realizando transfusión ...
- Przetaczanie krwi ...
- Probíhá transfúze krve ...
- Переливание крови...
- Transfusion Sanguine ...
- Infúzió...
- Transfundindo Sangue ...
- Effettuo la trasfusione ...
-
-
- Transfusing Saline ...
- Sallösungtransfusion ...
-
-
- Transfusing Plasma ...
- Plasmatransfusion ...
-
-
- Bandaging ...
- Verbinden ...
- Vendando ...
- Bandażowanie ...
- Obvazuji ...
- Pansement ...
- Sto applicando la benda ...
- Bekötözés...
- Atando ...
- Перевязывание....
-
-
- Applying Tourniquet ...
- Aderpresse ...
-
-
- Medical
- Zdravotní
- Médical
- Sanitäter
- Medico
- Medyczne
- Médico
- Медик
- Médico
-
-
- Field Dressing
-
-
- Packing Bandage
-
-
- Elastic Bandage
-
-
- QuikClot
-
-
- Check Pulse
- Plus überprüfen
-
-
- Check Blood Pressure
- Blutdruck messen
-
-
- Triage Card
- Triage Karte
-
-
- Tourniquet
- Tourniquet
-
-
- Remove Tourniquet
- Entferne Tourniquet
-
-
- Give Blood IV (1000ml)
-
-
- Give Blood IV (500ml)
-
-
- Give Blood IV (250ml)
-
-
- Give Plasma IV (1000ml)
-
-
- Give Plasma IV (500ml)
-
-
- Give Plasma IV (250ml)
-
-
- Give Saline IV (1000ml)
-
-
- Give Saline IV (500ml)
-
-
- Give Saline IV (250ml)
-
-
-
-
- Minor
- Gering
-
-
- Delayed
-
-
- Immediate
-
-
- Deceased
-
-
- None
-
-
- Normal breathing
- Дыхание в норме
- Respiración normal
- Respiration Normale
- Normalny oddech
-
-
- No breathing
- Дыхания нет
- No respira
- Apnée
- Brak oddechu
-
-
- Difficult breathing
- Дыхание затруднено
- Dificultad para respirar
- Difficultée Respiratoire
- Trudności z oddychaniem
-
-
- Almost no breathing
- Дыхания почти нет
- Casi sin respirar
- Respiration Faible
- Prawie brak oddechu
-
-
- Bleeding
- Кровотечение
- Sangrando
- Seignement
- Krwawienie zewnętrzne
-
-
- In Pain
- Испытывает боль
- Con Dolor
- A De La Douleur
- W bólu
-
-
- Lost a lot of Blood
- Большая кровопотеря
- Mucha Sangre perdida
- A Perdu Bcp de Sang
- Stracił dużo krwi
-
-
- Tourniquet [CAT]
- Жгут
- Torniquete [CAT]
- Garot [CAT]
- Opaska uciskowa [CAT]
-
-
- Receiving IV [%1ml]
-
-
-
-
- Bandage (Basic)
- Повязка (обычная)
- Vendaje (Básico)
- Bandage (Standard)
- Bandaż (jałowy)
-
-
- Used to cover a wound
- Для перевязки ран
- Utilizado para cubrir una herida
- Utilisé Pour Couvrir Une Blessure
- Używany w celu przykrycia i ochrony miejsca zranienia
-
-
- A dressing, that is a particular material used to cover a wound, which is applied over the wound once bleeding has been stemmed.
- Повязка, накладываемая поверх раны после остановки кровотечения.
- Un apósito, material específico utilizado para cubrir una herida, se aplica sobre la herida una vez ha dejado de sangrar.
- C'est un bandage, qui est fait d'un matériel spécial utiliser pour couvrir une blessure, qui peut etre appliquer des que le seignement as ete stopper.
- Opatrunek materiałowy, używany do przykrywania ran, zakładany na ranę po zatamowaniu krwawienia.
-
-
- Packing Bandage
- Тампонирующая повязка
- Vendaje Compresivo
- Bandage Mèche
- Bandaż (uciskowy)
-
-
- Used to pack medium to large wounds and stem the bleeding
- Для тампонирования ран среднего и большого размера и остановки кровотечения.
- Se utiliza para vendar heridas medianas y grandes y detener el sangrado
- Utiliser pour remplire la cavité créé dans une blessure moyenne et grande.
- Używany w celu opatrywania średnich i dużych ran oraz tamowania krwawienia.
-
-
- A bandage used to pack the wound to stem bleeding and facilitate wound healing. Packing a wound is an option in large polytrauma injuries.
- Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжелых сочетанных ранениях возможно тампонирование раны.
- Se utiliza para detener la hemorragia de una herida y favorecer su cicatrización. Se usa en grandes lesiones o politraumatismos.
- Un bandage servent a etre inseré dans les blessure pour éponger le seignement et faciliter la guerrison. Ce bandage est une option pour soigner les lession de politrauma.
- Opatrunek stosowany w celu zatrzymania krwawienia i osłony większych ran.
-
-
- Bandage (Elastic)
- Повязка (давящая)
- Vendaje (Elástico)
- Bandage (Élastique)
- Bandaż (elastyczny)
-
-
- Bandage kit, Elastic
- Давящая повязка
- Vendaje (Elástico)
- Bandage Compressif Élastique
- Zestaw bandaży elastycznych.
-
-
-
-
- Ce bandage peut etre utiliser pour compresser la plaie afin de ralentire le seignement et assurer la tenue du bandage lors de mouvment.
- Elastyczna opaska podtrzymująca opatrunek oraz usztywniająca okolice stawów.
- Brinda una compresión uniforme y ofrece soporte extra a una zona lesionada
-
-
- Tourniquet (CAT)
- Жгут
- Torniquete (CAT)
- Garot (CAT)
- Staza (typ. CAT)
-
-
- Slows down blood loss when bleeding
- Уменьшает кровопотерю при кровотечении.
- Reduce la velocidad de pérdida de sangre
- Ralentit le seignement
- Zmniejsza ubytek krwi z kończyn w przypadku krwawienia.
-
-
- A constricting device used to compress venous and arterial circulation in effect inhibiting or slowing blood flow and therefore decreasing loss of blood.
- Жгут используется для прижатия сосудов, приводящего к остановке или значительному уменьшению кровотечения и сокращению кровопотери.
- Dispositivo utilizado para eliminar el pulso distal y de ese modo controlar la pérdida de sangre
- Un appareil servent a compresser les artères et veines afin de reduire la perte de sang.
- Opaska zaciskowa CAT służy do tamowanie krwotoków w sytuacji zranienia kończyn z masywnym krwawieniem tętniczym lub żylnym.
-
-
- Morphine autoinjector
- Морфин в автоматическом шприце
- Morfina auto-inyectable
- Auto-injecteur de Morphine
- Autostrzykawka z morfiną
-
-
- Used to combat moderate to severe pain experiences
- Для снятия средних и сильных болевых ощущений.
- Usado para combatir los estados dolorosos moderados a severos
- Utiliser pour contrer les douleurs modéré à severes.
- Morfina. Ma silne działanie przeciwbólowe.
-
-
- An analgesic used to combat moderate to severe pain experiences.
- Анальгетик для снятия средних и сильных болевых ощущений.
- Analgésico usado para combatir los estados dolorosos de moderado a severo.
- Un Analgésique puissant servant a contrer les douleur modéré a severe.
- Organiczny związek chemiczny z grupy alkaloidów. Ma silne działanie przeciwbólowe.
-
-
- Atropin autoinjector
- Атропин в автоматическом шприце
- Atropina auto-inyectable
- Auto-injecteur d'Atropine
- Autostrzykawka AtroPen
-
-
- Used in NBC scenarios
- Применяется для защиты от ОМП
- Usado en escenarios NBQ
- Utiliser en cas d'attaque CBRN
- Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice.
-
-
- A drug used by the Military in NBC scenarios.
- Препарат, используемый в войсках для защиты от оружия массового поражения.
- Medicamento usado por Militares en escenarios NBQ
- Médicament utilisé par l'armée en cas d'attaque CBRN
- Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice. Środek stosowany w przypadku zagrożeń NBC.
-
-
- Epinephrine autoinjector
- Адреналин в автоматическом шприце
- Epinefrina auto-inyectable
- Auto-injecteur d'épinéphrine
- Autostrzykawka EpiPen
-
-
- Increase heart rate and counter effects given by allergic reactions
- Стимулирует работу сердца и купирует аллергические реакции.
- Aumenta la frecuencia cardiaca y contraresta los efectos de las reacciones alérgicas
- Augmente la Fréquance cadiaque et contré les effet d'une reaction Anaphylactique
- Adrenalina. Zwiększa puls i przeciwdziała efektom wywołanym przez reakcje alergiczne
-
-
- A drug that works on a sympathetic response to dilate the bronchi, increase heart rate and counter such effects given by allergic reactions (anaphylaxis). Used in sudden cardiac arrest scenarios with decreasing positive outcomes.
- Препарат, вызывающий симпатическую реакцию, приводящую к расширению бронхов, увеличению частоты сердечных сокращений и купированию аллергических реакций (анафилактического шока). Применяется при остановке сердца с уменьшением вероятности благоприятного исхода.
- Medicamento que dilata los bronquios, aumenta la frecuencia cardiaca y contrarresta los efectos de las reacciones alérgicas (anafilaxis). Se utiliza en caso de paros cardiacos repentinos.
- Un medicament qui fonctione sur le systeme sympatique créan une dilatation des bronches, augmente la fréquance cardiaque et contre les effet d'une reaction alergique (anaphylaxie). Utiliser lors d'arret cardio-respiratoire pour augmenté les chances retrouver un ryhtme.
- EpiPen z adrenaliną ma działanie sympatykomimetyczne, tj. pobudza receptory alfa- i beta-adrenergiczne. Pobudzenie układu współczulnego prowadzi do zwiększenia częstotliwości pracy serca, zwiększenia pojemności wyrzutowej serca i przyśpieszenia krążenia wieńcowego. Pobudzenie oskrzelowych receptorów beta-adrenergicznych wywołuje rozkurcz mięśni gładkich oskrzeli, co w efekcie zmniejsza towarzyszące oddychaniu świsty i duszności.
-
-
- Plasma IV (1000ml)
- Плазма для в/в вливания (1000 мл)
- Plasma Intravenoso (1000ml)
- Plasma Sanguin IV (1000ml)
- Osocze IV (1000ml)
-
-
- A volume-expanding blood supplement.
- Дополнительный препарат, применяемый при возмещении объема крови.
- Suplemento para expandir el volumen sanguíneo.
- Supplement visant a remplacer les volume sanguin
- Składnik krwi, używany do zwiększenia jej objętości.
-
-
- A volume-expanding blood supplement.
- Дополнительный препарат, применяемый при возмещении объема крови.
- Suplemento para expandir el volumen sanguíneo.
- Supplement visant a remplacer le volume sanguin et remplace les plaquettes.
- Składnik krwi, używany do zwiększenia jej objętości.
-
-
- Plasma IV (500ml)
- Плазма для в/в вливания (500 мл)
- Plasma Intravenoso (500ml)
- Plasma Sanguin IV (500ml)
- Osocze IV (500ml)
-
-
- Plasma IV (250ml)
- Плазма для в/в вливания (250 мл)
- Plasma Intravenoso (250ml)
- Plasma Sanguin (250ml)
- Osocze IV (250ml)
-
-
- Blood IV (1000ml)
- Кровь для переливания (1000 мл)
- Sangre Intravenosa (1000ml)
- Cullot Sanguin IV (1000ml)
- Krew IV (1000ml)
-
-
- Blood IV, for restoring a patients blood (keep cold)
- Пакет крови для возмещения объема потерянной крови (хранить в холодильнике)
- Sangre Intravenosa, para restarurar el volumen sanguíneo (mantener frío)
- Cullot Sanguin IV, pour remplacer le volume sanguin (garder Réfrigeré)
- Krew IV, używana do uzupełnienia krwi u pacjenta, trzymać w warunkach chłodniczych
-
-
- O Negative infusion blood used in strict and rare events to replenish blood supply usually conducted in the transport phase of medical care.
- Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема потерянной крови на догоспитальном этапе оказания медицинской помощи.
- Cullot Sanguin O- ,utiliser seulement lors de perte sanguine majeur afin de remplacer le volume sanguin perdu. Habituelment utiliser lors du transport ou dans un etablisement de soin.
- Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj w trakcie fazie transportu rannej osoby do szpitala.
- Utilice sólo durante gran pérdida de sangre para reemplazar el volumen de sangre perdido. Uso habitual durante el transporte de heridos.
-
-
- Blood IV (500ml)
- Кровь для переливания (500 мл)
- Sangre Intravenosa (500ml)
- Cullot Sanguin IV (500ml)
- Krew IV (500ml)
-
-
- Blood IV (250ml)
- Кровь для переливания (250 мл)
- Sangre Intravenosa (250ml)
- Cullot Sanguin IV (250ml)
- Krew IV (250ml)
-
-
- Saline IV (1000ml)
- Физраствор для в/в вливания (1000 мл)
- Solución Salina Intravenosa (1000ml)
- solution Saline 0.9% IV (1000ml)
- Solanka 0,9% IV (1000ml)
-
-
- Saline IV, for restoring a patients blood
- Пакет физраствора для возмещения объема потерянной крови
- Solución Salina Intravenosa, para restaurar el volumen sanguíneo
- Solution Saline 0.9% IV, pour retablir temporairement la tention arteriel
- Solanka 0,9%, podawana dożylnie (IV), używana w celu uzupełnienia krwi u pacjenta
-
-
- A medical volume-replenishing agent introduced into the blood system through an IV infusion.
- Пакет физиологического раствора для возмещения объема потерянной крови путем внутривенного вливания.
- Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa.
- Un remplacment temporaire pour rétablir la tention artériel lors de perte sanguine, étant ajouter par intraveineuse
- Używany w medycynie w formie płynu infuzyjnego jako środek nawadniający i uzupełniający niedobór elektrolitów, podawany dożylnie (IV).
-
-
- Saline IV (500ml)
- Физраствор для в/в вливания (500 мл)
- Solución Salina Intravenosa (500ml)
- Solution Saline 0.9% IV (500ml)
- Solanka 0,9% IV (500ml)
-
-
- Saline IV (250ml)
- Физраствор для в/в вливания (250 мл)
- Solución Salina Intravenosa (250ml)
- Solution Saline 0.9% IV (250ml)
- Solanka 0,9% IV (250ml)
-
-
- Basic Field Dressing (QuikClot)
- Первичный перевязочный пакет (QuikClot)
- Vendaje Básico (Coagulante)
- Bandage Regulier (Coagulant)
- Opatrunek QuikClot
-
-
- QuikClot bandage
- Гемостатический пакет QuikClot
- Venda Coagulante
- Bandage coagulant
- Podstawowy opatrunek stosowany na rany
-
-
-
-
- Un bandage servant a coaguler les seignements mineur à moyen.
- Proszkowy opatrunek adsorbcyjny przeznaczony do tamowania zagrażających życiu krwawień średniej i dużej intensywności.
- Vendaje Hemostático con coagulante que detiene el sangrado.
-
-
- Personal Aid Kit
- Аптечка
- Kit de Soporte Vital Avanzado
- Équipement de support Vitale
- Apteczka osobista
-
-
- Includes various treatment kit needed for stitching or advanced treatment
- Содержит различные материалы и инструменты для зашивания ран и оказания специальной медпомощи.
- Incluye material médico para tratamientos avanzados
- Inclue du matériel medical pour les traitement avancé, tel les point de suture.
- Zestaw środków medycznych do opatrywania ran i dodatkowego leczenia po-urazowego
-
-
-
-
-
-
-
-
- Surgical Kit
- Хирургический набор
- Kit Quirúrgico
-
-
- Surgical Kit for in field advanced medical treatment
- Набор для хирургической помощи в полевых условиях
- Kit Quirúrgico para el tratamiento avanzado en el campo de batalla
-
-
- Surgical Kit for in field advanced medical treatment
- Набор для хирургической помощи в полевых условиях
- Kit Quirúrgico para el tratamiento avanzado en el campo de batalla
-
-
- Bodybag
- Мешок для трупов
- Bolsa para cadáveres
-
-
- A bodybag for dead bodies
- Мешок для упаковки трупов
- Bolsa para cadáveres
-
-
- A bodybag for dead bodies
- Мешок для упаковки трупов
- Bolsa para cadáveres
-
-
-
-
- Blood Pressure
- Артериальное давление
- Presión Arterial
-
-
- Checking Blood Pressure..
- Проверка артериального давления...
- Comprobando Presión Arterial...
-
-
- You checked %1
- Вы осмотрели раненого %1
- Examinando a %1
-
-
- You find a blood pressure of %2/%3
- Артериальное давление %2/%3
- La Presión Arterial es %2/%3
-
-
- You find a low blood pressure
- Давление низкое
- La Presión Arterial es baja
-
-
- You find a normal blood pressure
- Давление нормальное
- La Presión Arterial es normal
-
-
- You find a high blood pressure
- Давление высокое
- La Presión Arterial es alta
-
-
- You find no blood pressure
- Давления нет
- No hay Presión Arterial
-
-
- You fail to find a blood pressure
- Артериальное давление не определяется
- No puedes encontrar Presión Arterial
-
-
- Pulse
- Пульс
- Pulso
-
-
- Checking Heart Rate..
- Проверка пульса...
- Comprobando Pulso...
-
-
- You checked %1
- Вы осмотрели раненого %1
- Examinando a %1
-
-
- You find a Heart Rate of %2
- Пульс %2 уд./мин.
- El Pulso es %2
-
-
- You find a weak Heart Rate
- Пульс слабый
- El Pulso es débil
-
-
- You find a strong Heart Rate
- Пульс учащенный
- El Pulso está acelerado
-
-
- You find a normal Heart Rate
- Пульс в норме
- El Pulso es bueno
-
-
- You find no Heart Rate
- Пульс не прощупывается
- No tiene Pulso
-
-
- Response
- Реакция
- Reacciona
-
-
- You check response of patient
- Вы проверяете реакцию раненого
- Compruebas si el paciente reacciona
-
-
- %1 is responsive
- %1 реагирует на раздражители
- %1 ha reaccionado
-
-
- %1 is not responsive
- %1 не реагирует
- %1 no reacciona
-
-
- You checked %1
- Вы осмотрели раненого %1
- Examinas a %1
-
-
- Bandaged
- Повязка наложена
- Vendado
-
-
- You bandage %1 (%2)
- Вы перевязали раненого %1 (%2)
- Aplicas vendaje a %1 en %2
-
-
- %1 is bandaging you
- %1 перевязывает вас
- %1 te está vendando
-
-
- You start stitching injures from %1 (%2)
- Вы зашиваете ранения от %1 (%2)
- Estás suturando heridas de %1 en %2
-
-
- Stitching
- Наложение швов
- Suturando
-
-
- You treat the airway of %1
- Вы интубируете раненого %1
- Estás intubando a %1
-
-
- Airway
- Дыхательные пути
- Vías Aéreas
-
-
- %1 is treating your airway
- %1 проводит вам интубацию
- %1 te está intubando
-
-
- Drag
- Ziehen
- Arrastrar
- Ciągnij
- Táhnout
- Тащить
- Tracter
- Húzás
- Arrastar
- Trascina
-
-
- Carry
- Tragen
- Cargar
- Nieś
- Nést
- Нести
- Porter
- Cipelés
- Carregar
- Trasporta
-
-
- Release
- Loslassen
- Soltar
- Połóż
- Položit
- Отпустить
- Déposer
- Elenged
- Largar
- Lascia
-
-
- Load Patient Into
- Patient Einladen
- Cargar el paciente en
- Załaduj pacjenta
- Naložit pacianta do
- Погрузить пациента в
- Embarquer le Patient
- Sebesült berakása
- Carregar Paciente Em
- Carica paziente nel
-
-
- Unload Patient
- Patient Ausladen
- Descargar el paciente
- Wyładuj pacjenta
- Vyložit pacienta
- Выгрузить пациента
- Débarquer le Patient
- Sebesült kihúzása
- Descarregar Paciente
- Scarica il paziente
-
-
- Unload patient
-
-
- Place body in bodybag
-
-
- Placing body in bodybag
-
-
-
-
- %1 has bandaged patient
-
-
- %1 used %2
-
-
- %1 has given an IV
-
-
- %1 applied a tourniquet
-
-
-
-
\ No newline at end of file
+
+
+ Inject Atropine
+ Atropin
+
+
+ Inject Epinephrine
+ Epinephrine injizieren
+ Inyectar Epinefrina
+ Wtrzyknij adrenalinę
+ Aplikovat Adrenalin
+ Ввести андреналил
+ Adrénaline
+ Adrenalin
+ Injetar Epinefrina
+ Inietta Epinefrina
+
+
+ Inject Morphine
+ Morphin injizieren
+ Inyectar Morfina
+ Wstrzyknij morfinę
+ Aplikovat Morfin
+ Ввести морфин
+ Morphine
+ Morfium
+ Injetar Morfina
+ Inietta Morfina
+
+
+ Transfuse Blood
+ Bluttransfusion
+ Transfundir sangre
+ Przetocz krew
+ Transfúze krve
+ Перелить кровь
+ Transfusion
+ Infúzió
+ Transfundir Sangue
+ Effettua Trasfusione
+
+
+ Transfuse Plasma
+ Plasmatransfusion
+
+
+ Transfuse Saline
+ Salzlösungtransfusion
+
+
+ Apply Tourniquet
+ Aderpresse anwenden
+
+
+ Bandage
+ Verbinden
+ Venda
+ Bandaż
+ Obvázat
+ Pansement
+ Benda
+ Kötözés
+ Atadura
+ Перевязать
+
+
+ Bandage Head
+ Kopf verbinden
+ Vendar la cabeza
+ Bandażuj głowę
+ Obvázat hlavu
+ Перевязать голову
+ Pansement Tête
+ Fej kötözése
+ Atar Cabeça
+ Benda la testa
+
+
+ Bandage Torso
+ Torso verbinden
+ Vendar el torso
+ Bandażuj tors
+ Obvázat hruď
+ Перевязать торс
+ Pansement Torse
+ Felsőtest kötözése
+ Atar Tronco
+ Benda il torso
+
+
+ Bandage Left Arm
+ Arm links verbinden
+ Vendar el brazo izquierdo
+ Bandażuj lewe ramię
+ Obvázat levou ruku
+ Перевязать левую руку
+ Pansement Bras Gauche
+ Bal kar kötözése
+ Atar Braço Esquerdo
+ Benda il braccio sinistro
+
+
+ Bandage Right Arm
+ Arm rechts verbinden
+ Vendar el brazo derecho
+ Bandażuj prawe ramię
+ Obvázat pravou ruku
+ Перевязать правую руку
+ Pansement Bras Droit
+ Jobb kar kötözése
+ Atar Braço Direito
+ Benda il braccio destro
+
+
+ Bandage Left Leg
+ Bein links verbinden
+ Vendar la pierna izquierda
+ Bandażuj lewą nogę
+ Obvázat levou nohu
+ Перевязать левую ногу
+ Pansement Jambe Gauche
+ Bal láb kötözése
+ Atar Perna Esquerda
+ Benda la gamba sinistra
+
+
+ Bandage Right Leg
+ Bein rechts verbinden
+ Vendar la pierna derecha
+ Bandażuj prawą nogę
+ Obvázat pravou nohu
+ Перевязать правую ногу
+ Pansement Jambe Droite
+ Jobb láb kötözése
+ Atar Perna Direita
+ Benda la gamba destra
+
+
+ Injecting Morphine ...
+ Morphin injizieren ...
+ Inyectando Morfina ...
+ Wstrzykiwanie morfiny ...
+ Aplikuju Morfin ...
+ Введение морфина...
+ Injection de Morphine...
+ Morfium beadása...
+ Injetando Morfina ...
+ Inietto la morfina ...
+
+
+ Injecting Epinephrine ...
+ Epinephrin injizieren ...
+ Inyectando Epinefrina ...
+ Wstrzykiwanie adrenaliny ...
+ Aplikuju Adrenalin ...
+ Введение андреналина
+ Injection d'Adrénaline ...
+ Adrenalin beadása...
+ Injetando Epinefrina ...
+ Inietto l'epinefrina ...
+
+
+ Injecting Atropine ...
+ Atropin injizieren ...
+
+
+ Transfusing Blood ...
+ Bluttransfusion ...
+ Realizando transfusión ...
+ Przetaczanie krwi ...
+ Probíhá transfúze krve ...
+ Переливание крови...
+ Transfusion Sanguine ...
+ Infúzió...
+ Transfundindo Sangue ...
+ Effettuo la trasfusione ...
+
+
+ Transfusing Saline ...
+ Sallösungtransfusion ...
+
+
+ Transfusing Plasma ...
+ Plasmatransfusion ...
+
+
+ Bandaging ...
+ Verbinden ...
+ Vendando ...
+ Bandażowanie ...
+ Obvazuji ...
+ Pansement ...
+ Sto applicando la benda ...
+ Bekötözés...
+ Atando ...
+ Перевязывание....
+
+
+ Applying Tourniquet ...
+ Aderpresse ...
+
+
+ Medical
+ Zdravotní
+ Médical
+ Sanitäter
+ Medico
+ Medyczne
+ Médico
+ Медик
+ Médico
+
+
+ Field Dressing
+
+
+ Packing Bandage
+
+
+ Elastic Bandage
+
+
+ QuikClot
+
+
+ Check Pulse
+ Plus überprüfen
+
+
+ Check Blood Pressure
+ Blutdruck messen
+
+
+ Triage Card
+ Triage Karte
+
+
+ Tourniquet
+ Tourniquet
+
+
+ Remove Tourniquet
+ Entferne Tourniquet
+
+
+ Give Blood IV (1000ml)
+
+
+ Give Blood IV (500ml)
+
+
+ Give Blood IV (250ml)
+
+
+ Give Plasma IV (1000ml)
+
+
+ Give Plasma IV (500ml)
+
+
+ Give Plasma IV (250ml)
+
+
+ Give Saline IV (1000ml)
+
+
+ Give Saline IV (500ml)
+
+
+ Give Saline IV (250ml)
+
+
+ Minor
+ Gering
+
+
+ Delayed
+
+
+ Immediate
+
+
+ Deceased
+
+
+ None
+
+
+ Normal breathing
+ Дыхание в норме
+ Respiración normal
+ Respiration Normale
+ Normalny oddech
+
+
+ No breathing
+ Дыхания нет
+ No respira
+ Apnée
+ Brak oddechu
+
+
+ Difficult breathing
+ Дыхание затруднено
+ Dificultad para respirar
+ Difficultée Respiratoire
+ Trudności z oddychaniem
+
+
+ Almost no breathing
+ Дыхания почти нет
+ Casi sin respirar
+ Respiration Faible
+ Prawie brak oddechu
+
+
+ Bleeding
+ Кровотечение
+ Sangrando
+ Seignement
+ Krwawienie zewnętrzne
+
+
+ In Pain
+ Испытывает боль
+ Con Dolor
+ A De La Douleur
+ W bólu
+
+
+ Lost a lot of Blood
+ Большая кровопотеря
+ Mucha Sangre perdida
+ A Perdu Bcp de Sang
+ Stracił dużo krwi
+
+
+ Tourniquet [CAT]
+ Жгут
+ Torniquete [CAT]
+ Garot [CAT]
+ Opaska uciskowa [CAT]
+
+
+ Receiving IV [%1ml]
+
+
+
+ Bandage (Basic)
+ Повязка (обычная)
+ Vendaje (Básico)
+ Bandage (Standard)
+ Bandaż (jałowy)
+
+
+ Used to cover a wound
+ Для перевязки ран
+ Utilizado para cubrir una herida
+ Utilisé Pour Couvrir Une Blessure
+ Używany w celu przykrycia i ochrony miejsca zranienia
+
+
+ A dressing, that is a particular material used to cover a wound, which is applied over the wound
+ once bleeding has been stemmed.
+
+ Повязка, накладываемая поверх раны после остановки кровотечения.
+ Un apósito, material específico utilizado para cubrir una herida, se aplica sobre la herida una vez
+ ha dejado de sangrar.
+
+ C'est un bandage, qui est fait d'un matériel spécial utiliser pour couvrir une blessure, qui peut
+ etre appliquer des que le seignement as ete stopper.
+
+ Opatrunek materiałowy, używany do przykrywania ran, zakładany na ranę po zatamowaniu krwawienia.
+
+
+
+ Packing Bandage
+ Тампонирующая повязка
+ Vendaje Compresivo
+ Bandage Mèche
+ Bandaż (uciskowy)
+
+
+ Used to pack medium to large wounds and stem the bleeding
+ Для тампонирования ран среднего и большого размера и остановки кровотечения.
+ Se utiliza para vendar heridas medianas y grandes y detener el sangrado
+ Utiliser pour remplire la cavité créé dans une blessure moyenne et grande.
+ Używany w celu opatrywania średnich i dużych ran oraz tamowania krwawienia.
+
+
+ A bandage used to pack the wound to stem bleeding and facilitate wound healing. Packing a wound is
+ an option in large polytrauma injuries.
+
+ Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжелых
+ сочетанных ранениях возможно тампонирование раны.
+
+ Se utiliza para detener la hemorragia de una herida y favorecer su cicatrización. Se usa en grandes
+ lesiones o politraumatismos.
+
+ Un bandage servent a etre inseré dans les blessure pour éponger le seignement et faciliter la
+ guerrison. Ce bandage est une option pour soigner les lession de politrauma.
+
+ Opatrunek stosowany w celu zatrzymania krwawienia i osłony większych ran.
+
+
+ Bandage (Elastic)
+ Повязка (давящая)
+ Vendaje (Elástico)
+ Bandage (Élastique)
+ Bandaż (elastyczny)
+
+
+ Bandage kit, Elastic
+ Давящая повязка
+ Vendaje (Elástico)
+ Bandage Compressif Élastique
+ Zestaw bandaży elastycznych.
+
+
+
+
+ Ce bandage peut etre utiliser pour compresser la plaie afin de ralentire le seignement et assurer la
+ tenue du bandage lors de mouvment.
+
+ Elastyczna opaska podtrzymująca opatrunek oraz usztywniająca okolice stawów.
+ Brinda una compresión uniforme y ofrece soporte extra a una zona lesionada
+
+
+ Tourniquet (CAT)
+ Жгут
+ Torniquete (CAT)
+ Garot (CAT)
+ Staza (typ. CAT)
+
+
+ Slows down blood loss when bleeding
+ Уменьшает кровопотерю при кровотечении.
+ Reduce la velocidad de pérdida de sangre
+ Ralentit le seignement
+ Zmniejsza ubytek krwi z kończyn w przypadku krwawienia.
+
+
+ A constricting device used to compress venous and arterial circulation in effect inhibiting or
+ slowing blood flow and therefore decreasing loss of blood.
+
+ Жгут используется для прижатия сосудов, приводящего к остановке или значительному уменьшению
+ кровотечения и сокращению кровопотери.
+
+ Dispositivo utilizado para eliminar el pulso distal y de ese modo controlar la pérdida de sangre
+
+ Un appareil servent a compresser les artères et veines afin de reduire la perte de sang.
+ Opaska zaciskowa CAT służy do tamowanie krwotoków w sytuacji zranienia kończyn z masywnym
+ krwawieniem tętniczym lub żylnym.
+
+
+
+ Morphine autoinjector
+ Морфин в автоматическом шприце
+ Morfina auto-inyectable
+ Auto-injecteur de Morphine
+ Autostrzykawka z morfiną
+
+
+ Used to combat moderate to severe pain experiences
+ Для снятия средних и сильных болевых ощущений.
+ Usado para combatir los estados dolorosos moderados a severos
+ Utiliser pour contrer les douleurs modéré à severes.
+ Morfina. Ma silne działanie przeciwbólowe.
+
+
+ An analgesic used to combat moderate to severe pain experiences.
+ Анальгетик для снятия средних и сильных болевых ощущений.
+ Analgésico usado para combatir los estados dolorosos de moderado a severo.
+ Un Analgésique puissant servant a contrer les douleur modéré a severe.
+ Organiczny związek chemiczny z grupy alkaloidów. Ma silne działanie przeciwbólowe.
+
+
+ Atropin autoinjector
+ Атропин в автоматическом шприце
+ Atropina auto-inyectable
+ Auto-injecteur d'Atropine
+ Autostrzykawka AtroPen
+
+
+ Used in NBC scenarios
+ Применяется для защиты от ОМП
+ Usado en escenarios NBQ
+ Utiliser en cas d'attaque CBRN
+ Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice.
+
+
+ A drug used by the Military in NBC scenarios.
+ Препарат, используемый в войсках для защиты от оружия массового поражения.
+ Medicamento usado por Militares en escenarios NBQ
+ Médicament utilisé par l'armée en cas d'attaque CBRN
+ Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice. Środek stosowany w
+ przypadku zagrożeń NBC.
+
+
+
+ Epinephrine autoinjector
+ Адреналин в автоматическом шприце
+ Epinefrina auto-inyectable
+ Auto-injecteur d'épinéphrine
+ Autostrzykawka EpiPen
+
+
+ Increase heart rate and counter effects given by allergic reactions
+ Стимулирует работу сердца и купирует аллергические реакции.
+ Aumenta la frecuencia cardiaca y contraresta los efectos de las reacciones alérgicas
+ Augmente la Fréquance cadiaque et contré les effet d'une reaction Anaphylactique
+ Adrenalina. Zwiększa puls i przeciwdziała efektom wywołanym przez reakcje alergiczne
+
+
+ A drug that works on a sympathetic response to dilate the bronchi, increase heart rate and counter
+ such effects given by allergic reactions (anaphylaxis). Used in sudden cardiac arrest scenarios with
+ decreasing positive outcomes.
+
+ Препарат, вызывающий симпатическую реакцию, приводящую к расширению бронхов, увеличению частоты
+ сердечных сокращений и купированию аллергических реакций (анафилактического шока). Применяется при
+ остановке сердца с уменьшением вероятности благоприятного исхода.
+
+ Medicamento que dilata los bronquios, aumenta la frecuencia cardiaca y contrarresta los efectos de
+ las reacciones alérgicas (anafilaxis). Se utiliza en caso de paros cardiacos repentinos.
+
+ Un medicament qui fonctione sur le systeme sympatique créan une dilatation des bronches, augmente la
+ fréquance cardiaque et contre les effet d'une reaction alergique (anaphylaxie). Utiliser lors d'arret
+ cardio-respiratoire pour augmenté les chances retrouver un ryhtme.
+
+ EpiPen z adrenaliną ma działanie sympatykomimetyczne, tj. pobudza receptory alfa- i
+ beta-adrenergiczne. Pobudzenie układu współczulnego prowadzi do zwiększenia częstotliwości pracy serca,
+ zwiększenia pojemności wyrzutowej serca i przyśpieszenia krążenia wieńcowego. Pobudzenie oskrzelowych
+ receptorów beta-adrenergicznych wywołuje rozkurcz mięśni gładkich oskrzeli, co w efekcie zmniejsza
+ towarzyszące oddychaniu świsty i duszności.
+
+
+
+ Plasma IV (1000ml)
+ Плазма для в/в вливания (1000 мл)
+ Plasma Intravenoso (1000ml)
+ Plasma Sanguin IV (1000ml)
+ Osocze IV (1000ml)
+
+
+ A volume-expanding blood supplement.
+ Дополнительный препарат, применяемый при возмещении объема крови.
+ Suplemento para expandir el volumen sanguíneo.
+ Supplement visant a remplacer les volume sanguin
+ Składnik krwi, używany do zwiększenia jej objętości.
+
+
+ A volume-expanding blood supplement.
+ Дополнительный препарат, применяемый при возмещении объема крови.
+ Suplemento para expandir el volumen sanguíneo.
+ Supplement visant a remplacer le volume sanguin et remplace les plaquettes.
+ Składnik krwi, używany do zwiększenia jej objętości.
+
+
+ Plasma IV (500ml)
+ Плазма для в/в вливания (500 мл)
+ Plasma Intravenoso (500ml)
+ Plasma Sanguin IV (500ml)
+ Osocze IV (500ml)
+
+
+ Plasma IV (250ml)
+ Плазма для в/в вливания (250 мл)
+ Plasma Intravenoso (250ml)
+ Plasma Sanguin (250ml)
+ Osocze IV (250ml)
+
+
+ Blood IV (1000ml)
+ Кровь для переливания (1000 мл)
+ Sangre Intravenosa (1000ml)
+ Cullot Sanguin IV (1000ml)
+ Krew IV (1000ml)
+
+
+ Blood IV, for restoring a patients blood (keep cold)
+ Пакет крови для возмещения объема потерянной крови (хранить в холодильнике)
+ Sangre Intravenosa, para restarurar el volumen sanguíneo (mantener frío)
+ Cullot Sanguin IV, pour remplacer le volume sanguin (garder Réfrigeré)
+ Krew IV, używana do uzupełnienia krwi u pacjenta, trzymać w warunkach chłodniczych
+
+
+ O Negative infusion blood used in strict and rare events to replenish blood supply usually
+ conducted in the transport phase of medical care.
+
+ Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема
+ потерянной крови на догоспитальном этапе оказания медицинской помощи.
+
+ Cullot Sanguin O- ,utiliser seulement lors de perte sanguine majeur afin de remplacer le volume
+ sanguin perdu. Habituelment utiliser lors du transport ou dans un etablisement de soin.
+
+ Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj
+ w trakcie fazie transportu rannej osoby do szpitala.
+
+ Utilice sólo durante gran pérdida de sangre para reemplazar el volumen de sangre perdido. Uso
+ habitual durante el transporte de heridos.
+
+
+
+ Blood IV (500ml)
+ Кровь для переливания (500 мл)
+ Sangre Intravenosa (500ml)
+ Cullot Sanguin IV (500ml)
+ Krew IV (500ml)
+
+
+ Blood IV (250ml)
+ Кровь для переливания (250 мл)
+ Sangre Intravenosa (250ml)
+ Cullot Sanguin IV (250ml)
+ Krew IV (250ml)
+
+
+ Saline IV (1000ml)
+ Физраствор для в/в вливания (1000 мл)
+ Solución Salina Intravenosa (1000ml)
+ solution Saline 0.9% IV (1000ml)
+ Solanka 0,9% IV (1000ml)
+
+
+ Saline IV, for restoring a patients blood
+ Пакет физраствора для возмещения объема потерянной крови
+ Solución Salina Intravenosa, para restaurar el volumen sanguíneo
+ Solution Saline 0.9% IV, pour retablir temporairement la tention arteriel
+ Solanka 0,9%, podawana dożylnie (IV), używana w celu uzupełnienia krwi u pacjenta
+
+
+ A medical volume-replenishing agent introduced into the blood system through an IV infusion.
+
+ Пакет физиологического раствора для возмещения объема потерянной крови путем внутривенного
+ вливания.
+
+ Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa.
+ Un remplacment temporaire pour rétablir la tention artériel lors de perte sanguine, étant ajouter
+ par intraveineuse
+
+ Używany w medycynie w formie płynu infuzyjnego jako środek nawadniający i uzupełniający niedobór
+ elektrolitów, podawany dożylnie (IV).
+
+
+
+ Saline IV (500ml)
+ Физраствор для в/в вливания (500 мл)
+ Solución Salina Intravenosa (500ml)
+ Solution Saline 0.9% IV (500ml)
+ Solanka 0,9% IV (500ml)
+
+
+ Saline IV (250ml)
+ Физраствор для в/в вливания (250 мл)
+ Solución Salina Intravenosa (250ml)
+ Solution Saline 0.9% IV (250ml)
+ Solanka 0,9% IV (250ml)
+
+
+ Basic Field Dressing (QuikClot)
+ Первичный перевязочный пакет (QuikClot)
+ Vendaje Básico (Coagulante)
+ Bandage Regulier (Coagulant)
+ Opatrunek QuikClot
+
+
+ QuikClot bandage
+ Гемостатический пакет QuikClot
+ Venda Coagulante
+ Bandage coagulant
+ Podstawowy opatrunek stosowany na rany
+
+
+
+
+ Un bandage servant a coaguler les seignements mineur à moyen.
+ Proszkowy opatrunek adsorbcyjny przeznaczony do tamowania zagrażających życiu krwawień średniej i
+ dużej intensywności.
+
+ Vendaje Hemostático con coagulante que detiene el sangrado.
+
+
+ Personal Aid Kit
+ Аптечка
+ Kit de Soporte Vital Avanzado
+ Équipement de support Vitale
+ Apteczka osobista
+
+
+ Includes various treatment kit needed for stitching or advanced treatment
+ Содержит различные материалы и инструменты для зашивания ран и оказания специальной медпомощи.
+
+ Incluye material médico para tratamientos avanzados
+ Inclue du matériel medical pour les traitement avancé, tel les point de suture.
+ Zestaw środków medycznych do opatrywania ran i dodatkowego leczenia po-urazowego
+
+
+
+
+
+
+
+
+ Surgical Kit
+ Хирургический набор
+ Kit Quirúrgico
+
+
+ Surgical Kit for in field advanced medical treatment
+ Набор для хирургической помощи в полевых условиях
+ Kit Quirúrgico para el tratamiento avanzado en el campo de batalla
+
+
+ Surgical Kit for in field advanced medical treatment
+ Набор для хирургической помощи в полевых условиях
+ Kit Quirúrgico para el tratamiento avanzado en el campo de batalla
+
+
+ Bodybag
+ Мешок для трупов
+ Bolsa para cadáveres
+
+
+ A bodybag for dead bodies
+ Мешок для упаковки трупов
+ Bolsa para cadáveres
+
+
+ A bodybag for dead bodies
+ Мешок для упаковки трупов
+ Bolsa para cadáveres
+
+
+
+ Blood Pressure
+ Артериальное давление
+ Presión Arterial
+
+
+ Checking Blood Pressure..
+ Проверка артериального давления...
+ Comprobando Presión Arterial...
+
+
+ You checked %1
+ Вы осмотрели раненого %1
+ Examinando a %1
+
+
+ You find a blood pressure of %2/%3
+ Артериальное давление %2/%3
+ La Presión Arterial es %2/%3
+
+
+ You find a low blood pressure
+ Давление низкое
+ La Presión Arterial es baja
+
+
+ You find a normal blood pressure
+ Давление нормальное
+ La Presión Arterial es normal
+
+
+ You find a high blood pressure
+ Давление высокое
+ La Presión Arterial es alta
+
+
+ You find no blood pressure
+ Давления нет
+ No hay Presión Arterial
+
+
+ You fail to find a blood pressure
+ Артериальное давление не определяется
+ No puedes encontrar Presión Arterial
+
+
+ Pulse
+ Пульс
+ Pulso
+
+
+ Checking Heart Rate..
+ Проверка пульса...
+ Comprobando Pulso...
+
+
+ You checked %1
+ Вы осмотрели раненого %1
+ Examinando a %1
+
+
+ You find a Heart Rate of %2
+ Пульс %2 уд./мин.
+ El Pulso es %2
+
+
+ You find a weak Heart Rate
+ Пульс слабый
+ El Pulso es débil
+
+
+ You find a strong Heart Rate
+ Пульс учащенный
+ El Pulso está acelerado
+
+
+ You find a normal Heart Rate
+ Пульс в норме
+ El Pulso es bueno
+
+
+ You find no Heart Rate
+ Пульс не прощупывается
+ No tiene Pulso
+
+
+ Response
+ Реакция
+ Reacciona
+
+
+ You check response of patient
+ Вы проверяете реакцию раненого
+ Compruebas si el paciente reacciona
+
+
+ %1 is responsive
+ %1 реагирует на раздражители
+ %1 ha reaccionado
+
+
+ %1 is not responsive
+ %1 не реагирует
+ %1 no reacciona
+
+
+ You checked %1
+ Вы осмотрели раненого %1
+ Examinas a %1
+
+
+ Bandaged
+ Повязка наложена
+ Vendado
+
+
+ You bandage %1 (%2)
+ Вы перевязали раненого %1 (%2)
+ Aplicas vendaje a %1 en %2
+
+
+ %1 is bandaging you
+ %1 перевязывает вас
+ %1 te está vendando
+
+
+ You start stitching injures from %1 (%2)
+ Вы зашиваете ранения от %1 (%2)
+ Estás suturando heridas de %1 en %2
+
+
+ Stitching
+ Наложение швов
+ Suturando
+
+
+ You treat the airway of %1
+ Вы интубируете раненого %1
+ Estás intubando a %1
+
+
+ Airway
+ Дыхательные пути
+ Vías Aéreas
+
+
+ %1 is treating your airway
+ %1 проводит вам интубацию
+ %1 te está intubando
+
+
+ Drag
+ Ziehen
+ Arrastrar
+ Ciągnij
+ Táhnout
+ Тащить
+ Tracter
+ Húzás
+ Arrastar
+ Trascina
+
+
+ Carry
+ Tragen
+ Cargar
+ Nieś
+ Nést
+ Нести
+ Porter
+ Cipelés
+ Carregar
+ Trasporta
+
+
+ Release
+ Loslassen
+ Soltar
+ Połóż
+ Položit
+ Отпустить
+ Déposer
+ Elenged
+ Largar
+ Lascia
+
+
+ Load Patient Into
+ Patient Einladen
+ Cargar el paciente en
+ Załaduj pacjenta
+ Naložit pacianta do
+ Погрузить пациента в
+ Embarquer le Patient
+ Sebesült berakása
+ Carregar Paciente Em
+ Carica paziente nel
+
+
+ Unload Patient
+ Patient Ausladen
+ Descargar el paciente
+ Wyładuj pacjenta
+ Vyložit pacienta
+ Выгрузить пациента
+ Débarquer le Patient
+ Sebesült kihúzása
+ Descarregar Paciente
+ Scarica il paziente
+
+
+ Unload patient
+
+
+ Load patient
+
+
+ Place body in bodybag
+
+
+ Placing body in bodybag
+
+
+
+ %1 has bandaged patient
+
+
+ %1 used %2
+
+
+ %1 has given an IV
+
+
+ %1 applied a tourniquet
+
+
+
+
diff --git a/addons/medical/ui/items/atropine.paa b/addons/medical/ui/items/atropine.paa
deleted file mode 100644
index 49b79e99e5..0000000000
Binary files a/addons/medical/ui/items/atropine.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/atropine.paa b/addons/medical/ui/items/atropine_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/atropine.paa
rename to addons/medical/ui/items/atropine_x_ca.paa
diff --git a/addons/medical/ui/items/bloodIV.paa b/addons/medical/ui/items/bloodIV.paa
deleted file mode 100644
index 489614bf44..0000000000
Binary files a/addons/medical/ui/items/bloodIV.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/bloodbag.paa b/addons/medical/ui/items/bloodIV_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/bloodbag.paa
rename to addons/medical/ui/items/bloodIV_x_ca.paa
diff --git a/addons/medical/ui/items/bodybag.paa b/addons/medical/ui/items/bodybag.paa
deleted file mode 100644
index a3a7257fc3..0000000000
Binary files a/addons/medical/ui/items/bodybag.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/bodybag.paa b/addons/medical/ui/items/bodybag_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/bodybag.paa
rename to addons/medical/ui/items/bodybag_x_ca.paa
diff --git a/addons/medical/ui/items/elasticBandage.paa b/addons/medical/ui/items/elasticBandage.paa
deleted file mode 100644
index bbf7901ceb..0000000000
Binary files a/addons/medical/ui/items/elasticBandage.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/bandageElastic.paa b/addons/medical/ui/items/elasticBandage_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/bandageElastic.paa
rename to addons/medical/ui/items/elasticBandage_x_ca.paa
diff --git a/addons/medical/ui/items/epinephrine.paa b/addons/medical/ui/items/epinephrine.paa
deleted file mode 100644
index d4c556281a..0000000000
Binary files a/addons/medical/ui/items/epinephrine.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/epinephrine.paa b/addons/medical/ui/items/epinephrine_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/epinephrine.paa
rename to addons/medical/ui/items/epinephrine_x_ca.paa
diff --git a/addons/medical/ui/items/fieldDressing.paa b/addons/medical/ui/items/fieldDressing.paa
deleted file mode 100644
index bfe11f2a07..0000000000
Binary files a/addons/medical/ui/items/fieldDressing.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/field_dressing.paa b/addons/medical/ui/items/fieldDressing_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/field_dressing.paa
rename to addons/medical/ui/items/fieldDressing_x_ca.paa
diff --git a/addons/medical/ui/items/morphine.paa b/addons/medical/ui/items/morphine.paa
deleted file mode 100644
index 16918da53f..0000000000
Binary files a/addons/medical/ui/items/morphine.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/morphine.paa b/addons/medical/ui/items/morphine_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/morphine.paa
rename to addons/medical/ui/items/morphine_x_ca.paa
diff --git a/addons/medical/ui/items/packingBandage.paa b/addons/medical/ui/items/packingBandage.paa
deleted file mode 100644
index 5825d17a77..0000000000
Binary files a/addons/medical/ui/items/packingBandage.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/packing_bandage.paa b/addons/medical/ui/items/packingBandage_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/packing_bandage.paa
rename to addons/medical/ui/items/packingBandage_x_ca.paa
diff --git a/addons/medical/ui/items/personal_aid_kit.paa b/addons/medical/ui/items/personal_aid_kit.paa
deleted file mode 100644
index 87d6a1612f..0000000000
Binary files a/addons/medical/ui/items/personal_aid_kit.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/personal_aid_kit.paa b/addons/medical/ui/items/personal_aid_kit_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/personal_aid_kit.paa
rename to addons/medical/ui/items/personal_aid_kit_x_ca.paa
diff --git a/addons/medical/ui/items/plasmaIV.paa b/addons/medical/ui/items/plasmaIV.paa
deleted file mode 100644
index 31eb3e34df..0000000000
Binary files a/addons/medical/ui/items/plasmaIV.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/plasma_iv.paa b/addons/medical/ui/items/plasmaIV_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/plasma_iv.paa
rename to addons/medical/ui/items/plasmaIV_x_ca.paa
diff --git a/addons/medical/ui/items/quickclot.paa b/addons/medical/ui/items/quickclot.paa
deleted file mode 100644
index 8727b7d1d0..0000000000
Binary files a/addons/medical/ui/items/quickclot.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/quickclot.paa b/addons/medical/ui/items/quickclot_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/quickclot.paa
rename to addons/medical/ui/items/quickclot_x_ca.paa
diff --git a/addons/medical/ui/items/salineIV.paa b/addons/medical/ui/items/salineIV.paa
deleted file mode 100644
index a957e36d7c..0000000000
Binary files a/addons/medical/ui/items/salineIV.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/saline_iv.paa b/addons/medical/ui/items/salineIV_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/saline_iv.paa
rename to addons/medical/ui/items/salineIV_x_ca.paa
diff --git a/addons/medical/ui/items/surgicalKit.paa b/addons/medical/ui/items/surgicalKit.paa
deleted file mode 100644
index e6b3533a12..0000000000
Binary files a/addons/medical/ui/items/surgicalKit.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/surgical_kit.paa b/addons/medical/ui/items/surgicalKit_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/surgical_kit.paa
rename to addons/medical/ui/items/surgicalKit_x_ca.paa
diff --git a/addons/medical/ui/items/tourniquet.paa b/addons/medical/ui/items/tourniquet.paa
deleted file mode 100644
index 1a0dace011..0000000000
Binary files a/addons/medical/ui/items/tourniquet.paa and /dev/null differ
diff --git a/TO_MERGE/cse/sys_medical/equipment/img/tourniquet.paa b/addons/medical/ui/items/tourniquet_x_ca.paa
similarity index 100%
rename from TO_MERGE/cse/sys_medical/equipment/img/tourniquet.paa
rename to addons/medical/ui/items/tourniquet_x_ca.paa
diff --git a/addons/missileguidance/config.cpp b/addons/missileguidance/config.cpp
index 9c5842a065..0341a56df6 100644
--- a/addons/missileguidance/config.cpp
+++ b/addons/missileguidance/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = { "ace_common", "ace_laser" };
+ requiredAddons[] = {"ace_laser"};
VERSION_CONFIG;
};
};
diff --git a/addons/missionmodules/CfgVehicles.hpp b/addons/missionmodules/CfgVehicles.hpp
index a38d651c75..6a1dc71705 100644
--- a/addons/missionmodules/CfgVehicles.hpp
+++ b/addons/missionmodules/CfgVehicles.hpp
@@ -1,68 +1,68 @@
class CfgVehicles {
- class Logic;
- class Module_F: Logic {
- class ArgumentsBaseUnits {
- };
- };
+ class Logic;
+ class Module_F: Logic {
+ class ArgumentsBaseUnits {
+ };
+ };
- // TODO make a curator variant for this
- class ACE_moduleAmbianceSound: Module_F {
- scope = 2;
- displayName = "Ambiance Sounds [ACE]";
- icon = QUOTE(PATHTOF(UI\Icon_Module_Ambient_Sounds_ca.paa));
- category = "ACE_missionModules";
- function = QUOTE(FUNC(moduleAmbianceSound));
- functionPriority = 1;
- isGlobal = 1;
- isTriggerActivated = 0;
- author = "$STR_ACE_Common_ACETeam";
- class Arguments {
- class soundFiles {
- displayName = "Sounds";
- description = "Classnames of the ambiance sounds played. Seperated by ','. ";
- typeName = "STRING";
- defaultValue = "";
- };
- class minimalDistance {
- displayName = "Minimal Distance";
- description = "Minimal Distance";
- typeName = "NUMBER";
- defaultValue = 400;
- };
- class maximalDistance {
- displayName = "Maximal Distance";
- description = "Maximal Distance";
- typeName = "NUMBER";
- defaultValue = 900;
- };
- class minimalDelay {
- displayName = "Minimal Delay";
- description = "Minimal Delay between sounds played";
- typeName = "NUMBER";
- defaultValue = 10;
- };
- class maximalDelay {
- displayName = "Maximal Delay";
- description = "Maximal Delay between sounds played";
- typeName = "NUMBER";
- defaultValue = 170;
- };
- class followPlayers {
- displayName = "Follow Players";
- description = "Follow players. If set to false, loop will play sounds only nearby logic position.";
- typeName = "BOOL";
- defaultValue = 0;
- };
- class soundVolume {
- displayName = "Volume";
- description = "The volume of the sounds played";
- typeName = "NUMBER";
- defaultValue = 1;
- };
- };
- class ModuleDescription {
- description = "Ambiance sounds loop (synced across MP)";
- sync[] = {};
- };
- };
+ // TODO make a curator variant for this
+ class ACE_moduleAmbianceSound: Module_F {
+ scope = 2;
+ displayName = "Ambiance Sounds [ACE]";
+ icon = QUOTE(PATHTOF(UI\Icon_Module_Ambient_Sounds_ca.paa));
+ category = "ACE_missionModules";
+ function = QUOTE(FUNC(moduleAmbianceSound));
+ functionPriority = 1;
+ isGlobal = 1;
+ isTriggerActivated = 0;
+ author = "$STR_ACE_Common_ACETeam";
+ class Arguments {
+ class soundFiles {
+ displayName = "Sounds";
+ description = "Classnames of the ambiance sounds played. Seperated by ','. ";
+ typeName = "STRING";
+ defaultValue = "";
+ };
+ class minimalDistance {
+ displayName = "Minimal Distance";
+ description = "Minimal Distance";
+ typeName = "NUMBER";
+ defaultValue = 400;
+ };
+ class maximalDistance {
+ displayName = "Maximal Distance";
+ description = "Maximal Distance";
+ typeName = "NUMBER";
+ defaultValue = 900;
+ };
+ class minimalDelay {
+ displayName = "Minimal Delay";
+ description = "Minimal Delay between sounds played";
+ typeName = "NUMBER";
+ defaultValue = 10;
+ };
+ class maximalDelay {
+ displayName = "Maximal Delay";
+ description = "Maximal Delay between sounds played";
+ typeName = "NUMBER";
+ defaultValue = 170;
+ };
+ class followPlayers {
+ displayName = "Follow Players";
+ description = "Follow players. If set to false, loop will play sounds only nearby logic position.";
+ typeName = "BOOL";
+ defaultValue = 0;
+ };
+ class soundVolume {
+ displayName = "Volume";
+ description = "The volume of the sounds played";
+ typeName = "NUMBER";
+ defaultValue = 1;
+ };
+ };
+ class ModuleDescription {
+ description = "Ambiance sounds loop (synced across MP)";
+ sync[] = {};
+ };
+ };
};
diff --git a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
index 943d795b7a..c02d19aa5f 100644
--- a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
+++ b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
@@ -25,99 +25,99 @@ _activated = [_this,2,true,[true]] call BIS_fnc_param;
// We only play this on the locality of the logic, since the sounds are broadcasted across the network
if (_activated && local _logic) then {
- _ambianceSounds = [];
- _unparsedSounds = _logic getvariable ["soundFiles", ""];
- _minimalDistance = (_logic getvariable ["minimalDistance", 400]) max 1;
- _maximalDistance = (_logic getvariable ["maximalDistance", 10]) max _minimalDistance;
- _minDelayBetweensounds = (_logic getvariable ["minimalDelay", 10]) max 1;
- _maxDelayBetweenSounds = (_logic getvariable ["maximalDelay", 170]) max _minDelayBetweensounds;
- _volume = (_logic getvariable ["soundVolume", 30]) max 1;
- _followPlayers = _logic getvariable ["followPlayers", false];
+ _ambianceSounds = [];
+ _unparsedSounds = _logic getvariable ["soundFiles", ""];
+ _minimalDistance = (_logic getvariable ["minimalDistance", 400]) max 1;
+ _maximalDistance = (_logic getvariable ["maximalDistance", 10]) max _minimalDistance;
+ _minDelayBetweensounds = (_logic getvariable ["minimalDelay", 10]) max 1;
+ _maxDelayBetweenSounds = (_logic getvariable ["maximalDelay", 170]) max _minDelayBetweensounds;
+ _volume = (_logic getvariable ["soundVolume", 30]) max 1;
+ _followPlayers = _logic getvariable ["followPlayers", false];
- _splittedList = [_unparsedSounds, ","] call BIS_fnc_splitString;
+ _splittedList = [_unparsedSounds, ","] call BIS_fnc_splitString;
- _nilCheckPassedList = "";
- {
- _x = [_x] call EFUNC(common,string_removeWhiteSpace);
- _splittedList set [_foreachIndex, _x];
- }foreach _splittedList;
+ _nilCheckPassedList = "";
+ {
+ _x = [_x] call EFUNC(common,string_removeWhiteSpace);
+ _splittedList set [_foreachIndex, _x];
+ }foreach _splittedList;
- _soundPath = [(str missionConfigFile), 0, -15] call BIS_fnc_trimString;
- {
- if (isclass (missionConfigFile >> "CfgSounds" >> _x)) then {
- _ambianceSounds pushback (_soundPath + (getArray(missionConfigFile >> "CfgSounds" >> _x >> "sound") select 0));
- } else {
- if (isclass (configFile >> "CfgSounds" >> _x)) then {
- _ambianceSounds pushback ((getArray(configFile >> "CfgSounds" >> _x >> "sound") select 0));
- };
- };
- }foreach _splittedList;
+ _soundPath = [(str missionConfigFile), 0, -15] call BIS_fnc_trimString;
+ {
+ if (isclass (missionConfigFile >> "CfgSounds" >> _x)) then {
+ _ambianceSounds pushback (_soundPath + (getArray(missionConfigFile >> "CfgSounds" >> _x >> "sound") select 0));
+ } else {
+ if (isclass (configFile >> "CfgSounds" >> _x)) then {
+ _ambianceSounds pushback ((getArray(configFile >> "CfgSounds" >> _x >> "sound") select 0));
+ };
+ };
+ }foreach _splittedList;
- if (count _ambianceSounds == 0) exitwith {};
- {
- if !([".", _x, true] call BIS_fnc_inString) then {
- _ambianceSounds set [_foreachIndex, _x + ".wss"];
- };
- }foreach _ambianceSounds;
+ if (count _ambianceSounds == 0) exitwith {};
+ {
+ if !([".", _x, true] call BIS_fnc_inString) then {
+ _ambianceSounds set [_foreachIndex, _x + ".wss"];
+ };
+ }foreach _ambianceSounds;
- [{
- private ["_args", "_logic", "_ambianceSounds", "_minimalDistance", "_maximalDistance", "_minDelayBetweensounds", "_maxDelayBetweenSounds", "_volume", "_followPlayers","_lastTimePlayed", "_newPos"];
- _args = _this select 0;
- _logic = _args select 0;
- _minDelayBetweensounds = _args select 4;
- _maxDelayBetweenSounds = _args select 5;
- _lastTimePlayed = _args select 8;
+ [{
+ private ["_args", "_logic", "_ambianceSounds", "_minimalDistance", "_maximalDistance", "_minDelayBetweensounds", "_maxDelayBetweenSounds", "_volume", "_followPlayers","_lastTimePlayed", "_newPos"];
+ _args = _this select 0;
+ _logic = _args select 0;
+ _minDelayBetweensounds = _args select 4;
+ _maxDelayBetweenSounds = _args select 5;
+ _lastTimePlayed = _args select 8;
- if (!alive _logic) exitwith {
- [(_this select 1)] call cba_fnc_removePerFrameHandler;
- };
+ if (!alive _logic) exitwith {
+ [(_this select 1)] call cba_fnc_removePerFrameHandler;
+ };
- if (time - _lastTimePlayed >= ((_minDelayBetweensounds + random(_maxDelayBetweenSounds)) min _maxDelayBetweenSounds)) then {
- _ambianceSounds = _args select 1;
- _minimalDistance = _args select 2;
- _maximalDistance = _args select 3;
+ if (time - _lastTimePlayed >= ((_minDelayBetweensounds + random(_maxDelayBetweenSounds)) min _maxDelayBetweenSounds)) then {
+ _ambianceSounds = _args select 1;
+ _minimalDistance = _args select 2;
+ _maximalDistance = _args select 3;
- _volume = _args select 6;
- _followPlayers = _args select 7;
+ _volume = _args select 6;
+ _followPlayers = _args select 7;
- // Find all players in session.
- _allUnits = if (isMultiplayer) then {playableUnits} else {[ACE_player]};
+ // Find all players in session.
+ _allUnits = if (isMultiplayer) then {playableUnits} else {[ACE_player]};
- // Check if there are enough players to even start playing this sound.
- if (count _allUnits > 0) then {
+ // Check if there are enough players to even start playing this sound.
+ if (count _allUnits > 0) then {
- // Select a target unit at random.
- _targetUnit = _allUnits select (round(random((count _allUnits)-1)));
+ // Select a target unit at random.
+ _targetUnit = _allUnits select (round(random((count _allUnits)-1)));
- // find the position from which we are going to play this sound from.
- _newPos = (getPos _targetUnit);
- if (!_followPlayers) then {
- _newPos = getPos _logic;
- };
+ // find the position from which we are going to play this sound from.
+ _newPos = (getPos _targetUnit);
+ if (!_followPlayers) then {
+ _newPos = getPos _logic;
+ };
- // Randomize this position.
- if (random(1) >= 0.5) then {
- if (random(1) >= 0.5) then {
- _newPos set [0, (_newPos select 0) + (_minimalDistance + random(_maximalDistance))];
- } else {
- _newPos set [0, (_newPos select 0) - (_minimalDistance + random(_maximalDistance))];
- };
- } else {
- if (random(1) >= 0.5) then {
- _newPos set [1, (_newPos select 1) + (_minimalDistance + random(_maximalDistance))];
- } else {
- _newPos set [1, (_newPos select 1) - (_minimalDistance + random(_maximalDistance))];
- };
- };
+ // Randomize this position.
+ if (random(1) >= 0.5) then {
+ if (random(1) >= 0.5) then {
+ _newPos set [0, (_newPos select 0) + (_minimalDistance + random(_maximalDistance))];
+ } else {
+ _newPos set [0, (_newPos select 0) - (_minimalDistance + random(_maximalDistance))];
+ };
+ } else {
+ if (random(1) >= 0.5) then {
+ _newPos set [1, (_newPos select 1) + (_minimalDistance + random(_maximalDistance))];
+ } else {
+ _newPos set [1, (_newPos select 1) - (_minimalDistance + random(_maximalDistance))];
+ };
+ };
- // If no unit is to close to this position, we will play the sound.
- if ({(_newPos distance _x < (_minimalDistance / 2))}count _allUnits == 0) then {
- playSound3D [_ambianceSounds select (round(random((count _ambianceSounds)-1))), ObjNull, false, _newPos, _volume, 1, 1000];
- _args set [8, time];
- };
- };
- };
- }, 0.1, [_logic, _ambianceSounds, _minimalDistance, _maximalDistance, _minDelayBetweensounds, _maxDelayBetweenSounds, _volume, _followPlayers, time] ] call cba_fnc_addPerFrameHandler;
+ // If no unit is to close to this position, we will play the sound.
+ if ({(_newPos distance _x < (_minimalDistance / 2))}count _allUnits == 0) then {
+ playSound3D [_ambianceSounds select (round(random((count _ambianceSounds)-1))), ObjNull, false, _newPos, _volume, 1, 1000];
+ _args set [8, time];
+ };
+ };
+ };
+ }, 0.1, [_logic, _ambianceSounds, _minimalDistance, _maximalDistance, _minDelayBetweensounds, _maxDelayBetweenSounds, _volume, _followPlayers, time] ] call cba_fnc_addPerFrameHandler;
};
true;
diff --git a/addons/nametags/config.cpp b/addons/nametags/config.cpp
index 42c970b1e9..e67703e147 100644
--- a/addons/nametags/config.cpp
+++ b/addons/nametags/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = { "ace_main", "ace_common", "ace_interaction" };
+ requiredAddons[] = {"ace_interaction"};
author[] = { "commy2", "esteldunedain" };
authorUrl = "https://github.com/commy2/";
VERSION_CONFIG;
diff --git a/addons/optics/$PBOPREFIX$ b/addons/optics/$PBOPREFIX$
new file mode 100644
index 0000000000..fd115a96a0
--- /dev/null
+++ b/addons/optics/$PBOPREFIX$
@@ -0,0 +1 @@
+z\ace\addons\optics
\ No newline at end of file
diff --git a/addons/optics/CfgEventHandlers.hpp b/addons/optics/CfgEventHandlers.hpp
new file mode 100644
index 0000000000..6c6e824b16
--- /dev/null
+++ b/addons/optics/CfgEventHandlers.hpp
@@ -0,0 +1,20 @@
+
+class Extended_PreInit_EventHandlers {
+ class ADDON {
+ init = QUOTE(call COMPILE_FILE(XEH_preInit));
+ };
+};
+
+class Extended_PostInit_EventHandlers {
+ class ADDON {
+ init = QUOTE(call COMPILE_FILE(XEH_postInit));
+ };
+};
+
+class Extended_FiredBIS_EventHandlers {
+ class CAManBase {
+ class AGM_Optics {
+ clientFiredBIS = QUOTE(if (_this select 0 == ACE_player) then {_this call DFUNC(handleFired)};);
+ };
+ };
+};
diff --git a/addons/optics/CfgOpticsEffect.hpp b/addons/optics/CfgOpticsEffect.hpp
new file mode 100644
index 0000000000..a1bf62d6e3
--- /dev/null
+++ b/addons/optics/CfgOpticsEffect.hpp
@@ -0,0 +1,8 @@
+
+class CfgOpticsEffect {
+ class ACE_OpticsRadBlur1 {
+ type = "radialblur";
+ params[] = {0.015,0,0.14,0.2};
+ priority = 950;
+ };
+};
diff --git a/addons/optics/CfgPreloadTextures.hpp b/addons/optics/CfgPreloadTextures.hpp
new file mode 100644
index 0000000000..57fa2cabf8
--- /dev/null
+++ b/addons/optics/CfgPreloadTextures.hpp
@@ -0,0 +1,50 @@
+
+#define MACRO_PRELOAD \
+ GVAR(BodyDay) = "*"; \
+ GVAR(BodyNight) = "*"; \
+ GVAR(ReticleDay) = "*"; \
+ GVAR(ReticleNight) = "*"
+
+class PreloadTextures {
+ class CfgWeapons {
+ class ACE_optic_Hamr_2D {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_Hamr_PIP {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_Arco_2D {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_Arco_PIP {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_MRCO_2D {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_MRCO_PIP {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_SOS_2D {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_SOS_PIP {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_LRPS_2D {
+ MACRO_PRELOAD;
+ };
+
+ class ACE_optic_LRPS_PIP {
+ MACRO_PRELOAD;
+ };
+ };
+};
diff --git a/addons/optics/CfgRscTitles.hpp b/addons/optics/CfgRscTitles.hpp
new file mode 100644
index 0000000000..956a2c76c0
--- /dev/null
+++ b/addons/optics/CfgRscTitles.hpp
@@ -0,0 +1,188 @@
+
+class RscOpticsValue;
+class RscMapControl;
+class RscText;
+
+class RscInGameUI {
+ class RscUnitInfo;
+ class RscWeaponZeroing: RscUnitInfo {
+ class CA_Zeroing;
+ };
+
+ class ACE_RscWeaponZeroing: RscWeaponZeroing {
+ controls[] = {"CA_Zeroing","CA_FOVMode","ACE_DrawReticleHelper","ACE_ScriptedReticle"};
+
+ class CA_FOVMode: RscOpticsValue { // idea by Taosenai. Apparently this can be used via isNil check to determine wheter the scope or the kolimator is used
+ idc = 154;
+ style = 2;
+ colorText[] = {0,0,0,0};
+ x = 0;
+ y = 0;
+ w = 0;
+ h = 0;
+ };
+
+ class ACE_DrawReticleHelper: RscMapControl {
+ onDraw = QUOTE([ctrlParent (_this select 0)] call DFUNC(onDrawScope));
+ idc = -1;
+ w = 0;
+ h = 0;
+ };
+
+ class ACE_ScriptedReticle: RscText {
+ idc = 1713154;
+ style = 48;
+ size = 1;
+ sizeEx = 0;
+ text = QUOTE(PATHTOF(reticles\ace_shortdot_reticle_1.paa));
+ w = 0;
+ h = 0;
+ };
+ };
+
+ class ACE_RscWeapon_base: RscWeaponZeroing {
+ controls[] = {"CA_Zeroing","CA_FOVMode","ACE_DrawReticleHelper","ReticleDay","ReticleNight","BodyNight","BodyDay"}; // don't change this order
+
+ class CA_FOVMode: RscOpticsValue { // idea by Taosenai. Apparently this can be used via isNil check to determine wheter the scope or the kolimator is used
+ idc = 154;
+ style = 2;
+ colorText[] = {0,0,0,0};
+ x = 0;
+ y = 0;
+ w = 0;
+ h = 0;
+ };
+
+ class ACE_DrawReticleHelper: RscMapControl {
+ onDraw = QUOTE([ctrlParent (_this select 0)] call DFUNC(onDrawScope2D));
+ idc = -1;
+ w = 0;
+ h = 0;
+ };
+
+ #define SIZEX 0.75/(getResolution select 5)
+ class ReticleDay: RscText {
+ idc = 1713001;
+ style = 48;
+ size = 0;
+ sizeEx = 1;
+ text = "";
+ 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;
+ w = SIZEX;
+ h = SIZEX*safezoneW/safezoneH;
+ };
+
+ class ReticleNight: ReticleDay {
+ idc = 1713002;
+ text = "";
+ };
+
+ #undef SIZEX
+ #define SIZEX 2*0.75/(getResolution select 5)
+ class BodyDay: ReticleDay {
+ idc = 1713005;
+ text = "";
+ x = safezoneX+0.5*safezoneW-0.5*SIZEX;
+ y = safezoneY+0.5*safezoneH-0.5*SIZEX*safezoneW/safezoneH;
+ w = SIZEX;
+ h = SIZEX*safezoneW/safezoneH;
+ };
+
+ class BodyNight: BodyDay {
+ idc = 1713006;
+ text = "";
+ };
+ };
+
+ class ACE_RscWeapon_Hamr: ACE_RscWeapon_base {
+ class ReticleDay: ReticleDay {
+ text = QUOTE(PATHTOF(reticles\hamr-reticle65_ca.paa));
+ };
+
+ class ReticleNight: ReticleNight {
+ text = QUOTE(PATHTOF(reticles\hamr-reticle65Illum_ca.paa));
+ };
+
+ class BodyDay: BodyDay {
+ text = QUOTE(PATHTOF(reticles\hamr-body_ca.paa));
+ };
+
+ class BodyNight: BodyNight {
+ text = QUOTE(PATHTOF(reticles\hamr-bodyNight_ca.paa));
+ };
+ };
+
+ class ACE_RscWeapon_Arco: ACE_RscWeapon_base {
+ class ReticleDay: ReticleDay {
+ text = QUOTE(PATHTOF(reticles\arco-reticle65_ca.paa));
+ };
+
+ class ReticleNight: ReticleNight {
+ text = QUOTE(PATHTOF(reticles\arco-reticle65Illum_ca.paa));
+ };
+
+ class BodyDay: BodyDay {
+ text = QUOTE(PATHTOF(reticles\arco-body_ca.paa));
+ };
+
+ class BodyNight: BodyNight {
+ text = QUOTE(PATHTOF(reticles\arco-bodyNight_ca.paa));
+ };
+ };
+
+ class ACE_RscWeapon_MRCO: ACE_RscWeapon_base {
+ class ReticleDay: ReticleDay {
+ text = QUOTE(PATHTOF(reticles\mrco-reticle556_ca.paa));
+ };
+
+ class ReticleNight: ReticleNight {
+ text = QUOTE(PATHTOF(reticles\mrco-reticle556Illum_ca.paa));
+ };
+
+ class BodyDay: BodyDay {
+ text = QUOTE(PATHTOF(reticles\mrco-body_ca.paa));
+ };
+
+ class BodyNight: BodyNight {
+ text = QUOTE(PATHTOF(reticles\mrco-bodyNight_ca.paa));
+ };
+ };
+
+ class ACE_RscWeapon_SOS: ACE_RscWeapon_base {
+ class ReticleDay: ReticleDay {
+ text = QUOTE(PATHTOF(reticles\sos-reticleMLR_ca.paa));
+ };
+
+ class ReticleNight: ReticleNight {
+ text = QUOTE(PATHTOF(reticles\sos-reticleMLRIllum_ca.paa));
+ };
+
+ class BodyDay: BodyDay {
+ text = QUOTE(PATHTOF(reticles\sos-body_ca.paa));
+ };
+
+ class BodyNight: BodyNight {
+ text = QUOTE(PATHTOF(reticles\sos-bodyNight_ca.paa));
+ };
+ };
+};
+
+/*
+
+_ctrl = (D displayCtrl 1713006);
+
+_sizeX = 1.54/(getResolution select 5);
+_sizeY = _sizeX*safezoneW/safezoneH;
+
+_ctrl ctrlSetPosition [
+ safezoneX+0.5*safezoneW-0.5*_sizeX,
+ safezoneY+0.5*safezoneH-0.5*_sizeY,
+ _sizeX,
+ _sizeY
+];
+_ctrl ctrlCommit 0
+
+*/
diff --git a/addons/optics/CfgVehicles.hpp b/addons/optics/CfgVehicles.hpp
new file mode 100644
index 0000000000..4ae648964e
--- /dev/null
+++ b/addons/optics/CfgVehicles.hpp
@@ -0,0 +1,19 @@
+
+class CfgVehicles {
+ class Box_NATO_Support_F;
+ class ACE_Box_Misc: Box_NATO_Support_F {
+ class TransportItems {
+ MACRO_ADDITEM(ACE_optic_Hamr_2D,2);
+ MACRO_ADDITEM(ACE_optic_Hamr_PIP,2);
+ MACRO_ADDITEM(ACE_optic_Arco_2D,2);
+ MACRO_ADDITEM(ACE_optic_Arco_PIP,2);
+ MACRO_ADDITEM(ACE_optic_MRCO_2D,2);
+ //MACRO_ADDITEM(ACE_optic_MRCO_PIP,2);
+ MACRO_ADDITEM(ACE_optic_SOS_2D,2);
+ MACRO_ADDITEM(ACE_optic_SOS_PIP,2);
+ MACRO_ADDITEM(ACE_optic_LRPS_2D,2);
+ MACRO_ADDITEM(ACE_optic_LRPS_PIP,2);
+ MACRO_ADDITEM(ACE_optic_DMS,2);
+ };
+ };
+};
diff --git a/addons/optics/CfgWeapons.hpp b/addons/optics/CfgWeapons.hpp
new file mode 100644
index 0000000000..e105a1eab9
--- /dev/null
+++ b/addons/optics/CfgWeapons.hpp
@@ -0,0 +1,303 @@
+
+class CfgWeapons {
+ class ItemCore;
+ class InventoryOpticsItem_Base_F;
+
+ // zooming reticle scopes
+ class optic_DMS: ItemCore {
+ class ItemInfo: InventoryOpticsItem_Base_F {
+ class OpticsModes {
+ class Snip;
+ class Iron;
+ };
+ };
+ };
+
+ class ACE_optic_DMS: optic_DMS {
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_DMS";
+ scope = 1;
+ displayName = "LOCALIZE ACE DMS";
+ //descriptionShort = "$STR_A3_CFGWEAPONS_ACC_DMS1";
+ weaponInfoType = "ACE_RscWeaponZeroing";
+
+ class ItemInfo: ItemInfo {
+ modelOptics = QUOTE(PATHTOF(models\ace_shortdot_optics.p3d));
+
+ class OpticsModes: OpticsModes {
+ class Snip: Snip {
+ opticsZoomMin = 0.05;
+ opticsZoomMax = 0.3;
+ opticsZoomInit = 0.3;
+ discretefov[] = {};
+ modelOptics[] = {};
+ };
+
+ class Iron: Iron {};
+ };
+ };
+ };
+
+ // PIP scopes
+ class optic_Hamr: ItemCore {
+ class ItemInfo: InventoryOpticsItem_Base_F {
+ class OpticsModes {
+ class Hamr2Collimator;
+ class Hamr2Scope;
+ };
+ };
+ };
+
+ class ACE_optic_Hamr_2D: optic_Hamr {
+ GVAR(BodyDay) = QUOTE(PATHTOF(reticles\hamr-body_ca.paa));
+ GVAR(BodyNight) = QUOTE(PATHTOF(reticles\hamr-bodyNight_ca.paa));
+ GVAR(ReticleDay) = QUOTE(PATHTOF(reticles\hamr-reticle65_ca.paa));
+ GVAR(ReticleNight) = QUOTE(PATHTOF(reticles\hamr-reticle65Illum_ca.paa));
+
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_Hamr_2D";
+ displayName = "$STR_ACE_optic_hamr";
+ weaponInfoType = "ACE_RscWeapon_Hamr";
+
+ class ItemInfo: ItemInfo {
+ modelOptics = QUOTE(PATHTOF(models\ace_optics_reticle90.p3d));
+
+ class OpticsModes: OpticsModes {
+ class Hamr2Collimator: Hamr2Collimator {};
+
+ class Hamr2Scope: Hamr2Scope {
+ useModelOptics = 1;
+ opticsZoomInit = 0.0872664626;
+ opticsZoomMax = 0.0872664626;
+ opticsZoomMin = 0.0872664626;
+ opticsPPEffects[] = {"OpticsCHAbera5","OpticsBlur5","ACE_OpticsRadBlur1"};
+ opticsDisablePeripherialVision = 0;
+ visionMode[] = {"Normal","NVG"};
+ };
+ };
+ };
+ };
+
+ class ACE_optic_Hamr_PIP: ACE_optic_Hamr_2D {
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_Hamr_PIP";
+ scopeArsenal = 1;
+ displayName = "$STR_ACE_optic_hamr_pip";
+
+ class ItemInfo: ItemInfo {
+ modelOptics = QUOTE(PATHTOF(models\ace_optics_pip.p3d));
+ };
+ };
+
+ class optic_Arco: ItemCore {
+ class ItemInfo: InventoryOpticsItem_Base_F {
+ class OpticsModes {
+ class ARCO2collimator;
+ class ARCO2scope: ARCO2collimator {};
+ };
+ };
+ };
+
+ class ACE_optic_Arco_2D: optic_Arco {
+ GVAR(BodyDay) = QUOTE(PATHTOF(reticles\arco-body_ca.paa));
+ GVAR(BodyNight) = QUOTE(PATHTOF(reticles\arco-bodyNight_ca.paa));
+ GVAR(ReticleDay) = QUOTE(PATHTOF(reticles\arco-reticle65_ca.paa));
+ GVAR(ReticleNight) = QUOTE(PATHTOF(reticles\arco-reticle65Illum_ca.paa));
+
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_Arco_2D";
+ displayName = "$STR_ACE_optic_arco";
+ weaponInfoType = "ACE_RscWeapon_Arco";
+
+ class ItemInfo: ItemInfo {
+ modelOptics = QUOTE(PATHTOF(models\ace_optics_reticle90.p3d));
+
+ class OpticsModes: OpticsModes {
+ class ARCO2collimator: ARCO2collimator {};
+ class ARCO2scope: ARCO2scope {
+ useModelOptics = 1;
+ opticsZoomInit = 0.0872664626;
+ opticsZoomMax = 0.0872664626;
+ opticsZoomMin = 0.0872664626;
+ opticsPPEffects[] = {"OpticsCHAbera5","OpticsBlur5","ACE_OpticsRadBlur1"};
+ opticsDisablePeripherialVision = 0;
+ visionMode[] = {"Normal"};
+ };
+ };
+ };
+ };
+
+ class ACE_optic_Arco_PIP: ACE_optic_Arco_2D {
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_Arco_PIP";
+ scopeArsenal = 1;
+ displayName = "$STR_ACE_optic_arco_pip";
+
+ class ItemInfo: ItemInfo {
+ modelOptics = QUOTE(PATHTOF(models\ace_optics_pip.p3d));
+ };
+ };
+
+ class optic_MRCO: ItemCore {
+ class ItemInfo: InventoryOpticsItem_Base_F {
+ class OpticsModes {
+ class MRCOcq;
+ class MRCOscope;
+ };
+ };
+ };
+
+ class ACE_optic_MRCO_2D: optic_MRCO {
+ GVAR(BodyDay) = QUOTE(PATHTOF(reticles\mrco-body_ca.paa));
+ GVAR(BodyNight) = QUOTE(PATHTOF(reticles\mrco-bodyNight_ca.paa));
+ GVAR(ReticleDay) = QUOTE(PATHTOF(reticles\mrco-reticle556_ca.paa));
+ GVAR(ReticleNight) = QUOTE(PATHTOF(reticles\mrco-reticle556Illum_ca.paa));
+
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_MRCO_2D";
+ displayName = "$STR_ACE_optic_valdada";
+ weaponInfoType = "ACE_RscWeapon_MRCO";
+
+ class ItemInfo: ItemInfo {
+ modelOptics = QUOTE(PATHTOF(models\ace_optics_reticle90.p3d));
+
+ class OpticsModes: OpticsModes {
+ class MRCOcq: MRCOcq {};
+ class MRCOscope: MRCOscope {
+ useModelOptics = 1;
+ opticsZoomInit = 0.0872664626;
+ opticsZoomMax = 0.0872664626;
+ opticsZoomMin = 0.0872664626;
+ opticsPPEffects[] = {"OpticsCHAbera5","OpticsBlur5","ACE_OpticsRadBlur1"};
+ opticsDisablePeripherialVision = 0;
+ visionMode[] = {"Normal"};
+ };
+ };
+ };
+ };
+
+ class ACE_optic_MRCO_PIP: ACE_optic_MRCO_2D {
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_MRCO_PIP";
+ scope = 1;
+ scopeArsenal = 1;
+ displayName = "$STR_ACE_optic_valdada_pip";
+
+ class ItemInfo: ItemInfo {
+ modelOptics = QUOTE(PATHTOF(models\ace_optics_pip.p3d));
+ };
+ };
+
+ class optic_SOS: ItemCore {
+ class ItemInfo: InventoryOpticsItem_Base_F {
+ class OpticsModes {
+ class Snip;
+ class Iron;
+ };
+ };
+ };
+
+ class ACE_optic_SOS_2D: optic_SOS {
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_SOS_2D";
+ displayName = "$STR_ACE_optic_sos";
+ weaponInfoType = "ACE_RscWeapon_SOS";
+
+ class ItemInfo: ItemInfo {
+ class OpticsModes: OpticsModes {
+ class Snip: Snip {
+ modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_reticle90.p3d)),QUOTE(PATHTOF(models\ace_optics_reticle90.p3d))};
+ opticsDisablePeripherialVision = 0;
+ };
+ class Iron: Iron {};
+ };
+ };
+ };
+
+ 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;
+ displayName = "$STR_ACE_optic_sos_pip";
+
+ class ItemInfo: ItemInfo {
+ class OpticsModes: OpticsModes {
+ class Snip: Snip {
+ modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_pip.p3d)),QUOTE(PATHTOF(models\ace_optics_pip.p3d))};
+ };
+ };
+ };
+ };
+
+ class optic_LRPS: ItemCore {
+ class ItemInfo: InventoryOpticsItem_Base_F {
+ class OpticsModes {
+ class Snip;
+ };
+ };
+ };
+
+ class ACE_optic_LRPS_2D: optic_LRPS {
+ 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_LRPS_2D";
+ displayName = "$STR_ACE_optic_lrps";
+ weaponInfoType = "ACE_RscWeapon_SOS";
+
+ class ItemInfo: ItemInfo {
+ class OpticsModes: OpticsModes {
+ class Snip: Snip {
+ modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_reticle90.p3d)),QUOTE(PATHTOF(models\ace_optics_reticle90.p3d))};
+ useModelOptics = 1;
+ opticsZoomInit = 0.01234;
+ opticsZoomMax = 0.04673;
+ opticsZoomMin = 0.01234;
+ discreteFOV[] = {};
+ opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1","ACE_OpticsRadBlur1"};
+ opticsDisablePeripherialVision = 0;
+ };
+ };
+ };
+ };
+
+ class ACE_optic_LRPS_PIP: ACE_optic_LRPS_2D {
+ author = "$STR_ACE_Common_ACETeam";
+ _generalMacro = "ACE_optic_LRPS_PIP";
+ scopeArsenal = 1;
+ displayName = "$STR_ACE_optic_lrps_pip";
+
+ class ItemInfo: ItemInfo {
+ class OpticsModes: OpticsModes {
+ class Snip: Snip {
+ modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_pip.p3d)),QUOTE(PATHTOF(models\ace_optics_pip.p3d))};
+ };
+ };
+ };
+ };
+};
+
+class SlotInfo;
+class CowsSlot: SlotInfo {
+ compatibleItems[] += {
+ "ACE_optic_Hamr_2D",
+ "ACE_optic_Hamr_PIP",
+ "ACE_optic_Arco_2D",
+ "ACE_optic_Arco_PIP",
+ "ACE_optic_MRCO_2D",
+ "ACE_optic_MRCO_PIP",
+ "ACE_optic_SOS_2D",
+ "ACE_optic_SOS_PIP",
+ "ACE_optic_LRPS_2D",
+ "ACE_optic_LRPS_PIP",
+ "ACE_optic_DMS"
+ };
+};
diff --git a/addons/optics/XEH_postInit.sqf b/addons/optics/XEH_postInit.sqf
new file mode 100644
index 0000000000..cb3918cbc3
--- /dev/null
+++ b/addons/optics/XEH_postInit.sqf
@@ -0,0 +1,24 @@
+// by commy2
+#include "script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+0 = 0 spawn {
+ waituntil {!isNull ACE_player};
+
+ // PiP technique by BadBenson
+ GVAR(camera) = "camera" camCreate positioncameratoworld [0,0,0];
+ GVAR(camera) camSetFov 0.7;
+ GVAR(camera) camSetTarget ACE_player;
+ GVAR(camera) camCommit 1;
+
+ "ace_optics_rendertarget0" setPiPEffect [2, 1.0, 1.0, 1.0, 0.0, [0.0, 1.0, 0.0, 0.25], [1.0, 0.0, 1.0, 1.0], [0.199, 0.587, 0.114, 0.0]];
+ GVAR(camera) cameraEffect ["INTERNAL", "BACK", "ace_optics_rendertarget0"];
+};
+
+// save control for fired EH
+["infoDisplayChanged", {
+ if (!isNull ((_this select 0) displayCtrl 1713001)) then {
+ uiNamespace setVariable [QGVAR(RscWeaponInfo2D), _this select 0];
+ };
+}] call EFUNC(common,addEventHandler);
diff --git a/addons/recoil/XEH_preInit.sqf b/addons/optics/XEH_preInit.sqf
similarity index 52%
rename from addons/recoil/XEH_preInit.sqf
rename to addons/optics/XEH_preInit.sqf
index 2df8a83ebd..9616b7158a 100644
--- a/addons/recoil/XEH_preInit.sqf
+++ b/addons/optics/XEH_preInit.sqf
@@ -2,7 +2,8 @@
ADDON = false;
-PREP(burstDispersion);
-PREP(camShake);
+PREP(handleFired);
+PREP(onDrawScope);
+PREP(onDrawScope2D);
ADDON = true;
diff --git a/addons/optics/config.cpp b/addons/optics/config.cpp
new file mode 100644
index 0000000000..bae1da314b
--- /dev/null
+++ b/addons/optics/config.cpp
@@ -0,0 +1,34 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class ADDON {
+ units[] = {};
+ weapons[] = {
+ "ACE_optic_Hamr_2D",
+ "ACE_optic_Hamr_PIP",
+ "ACE_optic_Arco_2D",
+ "ACE_optic_Arco_PIP",
+ "ACE_optic_MRCO_2D",
+ //"ACE_optic_MRCO_PIP",
+ "ACE_optic_SOS_2D",
+ "ACE_optic_SOS_PIP",
+ "ACE_optic_LRPS_2D",
+ "ACE_optic_LRPS_PIP",
+ "ACE_optic_DMS"
+ };
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {"ace_common"};
+ author[] = {"Taosenai","KoffeinFlummi","commy2"};
+ authorUrl = "http://www.ryanschultz.org/tmr/";
+ VERSION_CONFIG;
+ };
+};
+
+#include "CfgEventHandlers.hpp"
+
+#include "CfgOpticsEffect.hpp"
+#include "CfgRscTitles.hpp"
+#include "CfgVehicles.hpp"
+#include "CfgWeapons.hpp"
+
+#include "CfgPreloadTextures.hpp"
diff --git a/addons/optics/functions/fnc_handleFired.sqf b/addons/optics/functions/fnc_handleFired.sqf
new file mode 100644
index 0000000000..d1b7531928
--- /dev/null
+++ b/addons/optics/functions/fnc_handleFired.sqf
@@ -0,0 +1,111 @@
+/*
+ * Original Author: Taosenai
+ * Adapted By: KoffeinFlummi, commy2
+ *
+ * Animates the scope when firing.
+ *
+ * Arguments:
+ * 0: Unit (Object)
+ * 1: Weapon (String)
+ * 2: Muzzle (String)
+ * 3: Mode (String)
+ * 4: Ammo (Object)
+ * 5: Magazine (String)
+ * 6: Projectile (Object)
+ *
+ * Return Value:
+ * None
+ */
+#include "script_component.hpp"
+
+private ["_unit", "_weapon"];
+
+_unit = _this select 0;
+_weapon = _this select 1;
+
+// check if compatible scope is used
+private "_display";
+_display = uiNamespace getVariable [QGVAR(RscWeaponInfo2D), displayNull];
+
+if (isNull _display) exitWith {};
+
+// Reduce the reticle movement as the player drops into lower, supported stances.
+private "_recoilCoef";
+_recoilCoef = switch (true) do {
+ case (isWeaponDeployed _unit): {0.1};
+ case (isWeaponRested _unit): {0.4};
+ default {1};
+};
+
+// Constants which determine how the scope recoils
+private ["_recoilScope", "_reticleShiftX", "_reticleShiftY", "_scopeShiftX", "_scopeShiftY"];
+
+_recoilScope = _recoilCoef * linearConversion [0, 1, random 1, SCOPE_RECOIL_MIN, SCOPE_RECOIL_MAX, false];
+
+_reticleShiftX = _recoilCoef * linearConversion [0, 1, random 1, RETICLE_SHIFT_X_MIN, RETICLE_SHIFT_X_MAX, false];
+_reticleShiftY = _recoilCoef * linearConversion [0, 1, random 1, RETICLE_SHIFT_Y_MIN, RETICLE_SHIFT_Y_MAX, false];
+
+_scopeShiftX = _recoilCoef * linearConversion [0, 1, random 1, SCOPE_SHIFT_X_MIN, SCOPE_SHIFT_X_MAX, false];
+_scopeShiftY = _recoilCoef * linearConversion [0, 1, random 1, SCOPE_SHIFT_Y_MIN, SCOPE_SHIFT_Y_MAX, false];
+
+// Create and commit recoil effect
+private ["_sizeX", "_sizeY"];
+
+_sizeX = (0.75+_recoilScope)/(getResolution select 5);
+_sizeY = _sizeX*safezoneW/safezoneH;
+
+private "_positionReticle";
+_positionReticle = [
+ safezoneX+0.5*safezoneW-0.5*(_sizeX+_reticleShiftX),
+ safezoneY+0.5*safezoneH-0.5*(_sizeY+_reticleShiftY),
+ _sizeX,
+ _sizeY
+];
+
+(_display displayCtrl 1713001) ctrlSetPosition _positionReticle;
+(_display displayCtrl 1713002) ctrlSetPosition _positionReticle;
+
+private "_positionBody";
+_positionBody = [
+ safezoneX+0.5*safezoneW-0.5*(2*_sizeX+_scopeShiftX),
+ safezoneY+0.5*safezoneH-0.5*(2*_sizeY+_scopeShiftY),
+ 2*_sizeX,
+ 2*_sizeY
+];
+
+(_display displayCtrl 1713005) ctrlSetPosition _positionBody;
+(_display displayCtrl 1713006) ctrlSetPosition _positionBody;
+
+(_display displayCtrl 1713001) ctrlCommit 0;
+(_display displayCtrl 1713002) ctrlCommit 0;
+(_display displayCtrl 1713005) ctrlCommit 0;
+(_display displayCtrl 1713006) ctrlCommit 0;
+
+// Bring them all back
+_sizeX = 0.75/(getResolution select 5);
+_sizeY = _sizeX*safezoneW/safezoneH;
+
+_positionReticle = [
+ safezoneX+0.5*safezoneW-0.5*_sizeX,
+ safezoneY+0.5*safezoneH-0.5*_sizeY,
+ _sizeX,
+ _sizeY
+];
+
+(_display displayCtrl 1713001) ctrlSetPosition _positionReticle;
+(_display displayCtrl 1713002) ctrlSetPosition _positionReticle;
+
+_positionBody = [
+ safezoneX+0.5*safezoneW-0.5*2*_sizeX,
+ safezoneY+0.5*safezoneH-0.5*2*_sizeY,
+ 2*_sizeX,
+ 2*_sizeY
+];
+
+(_display displayCtrl 1713005) ctrlSetPosition _positionBody;
+(_display displayCtrl 1713006) ctrlSetPosition _positionBody;
+
+(_display displayCtrl 1713001) ctrlCommit RECENTER_TIME;
+(_display displayCtrl 1713002) ctrlCommit RECENTER_TIME;
+(_display displayCtrl 1713005) ctrlCommit RECENTER_TIME;
+(_display displayCtrl 1713006) ctrlCommit RECENTER_TIME;
diff --git a/addons/optics/functions/fnc_onDrawScope.sqf b/addons/optics/functions/fnc_onDrawScope.sqf
new file mode 100644
index 0000000000..26cbe235b2
--- /dev/null
+++ b/addons/optics/functions/fnc_onDrawScope.sqf
@@ -0,0 +1,29 @@
+// by commy2
+#include "script_component.hpp"
+
+disableSerialization;
+
+private ["_display", "_control"];
+
+_display = _this select 0;
+
+_control = _display displayCtrl 1713154;
+
+if (!ctrlShown (_display displayCtrl 154)) exitWith {
+ _control ctrlShow false;
+};
+
+private ["_sizeX", "_sizeY"];
+
+_sizeX = (call EFUNC(common,getZoom))/4;
+_sizeY = _sizeX*safezoneW/safezoneH;
+
+_control ctrlSetPosition [
+ safezoneX+0.5*safezoneW-0.5*_sizeX,
+ safezoneY+0.5*safezoneH-0.5*_sizeY,
+ _sizeX,
+ _sizeY
+];
+
+_control ctrlCommit 0;
+_control ctrlShow true;
diff --git a/addons/optics/functions/fnc_onDrawScope2D.sqf b/addons/optics/functions/fnc_onDrawScope2D.sqf
new file mode 100644
index 0000000000..10c6eeff40
--- /dev/null
+++ b/addons/optics/functions/fnc_onDrawScope2D.sqf
@@ -0,0 +1,56 @@
+// by commy2
+#include "script_component.hpp"
+
+disableSerialization;
+
+private "_display";
+
+_display = _this select 0;
+
+if (!ctrlShown (_display displayCtrl 154)) exitWith {
+ (_display displayCtrl 1713001) ctrlShow false;
+ (_display displayCtrl 1713002) ctrlShow false;
+ (_display displayCtrl 1713005) ctrlShow false;
+ (_display displayCtrl 1713006) ctrlShow false;
+};
+
+GVAR(camera) setposATL positioncameratoworld [0,0,0.4];
+GVAR(camera) camPrepareTarget positioncameratoworld [0,0,50];
+GVAR(camera) camCommitPrepared 0;
+
+// @todo, check if that needs to be done at all
+if (cameraView == "GUNNER") then {
+ GVAR(camera) camsetFOV 0.7;
+ GVAR(camera) camcommit 0;
+} else {
+ GVAR(camera) camsetFOV 0.01;
+ GVAR(camera) camcommit 0;
+};
+
+// @todo, all weapon types
+private "_optic";
+_optic = (primaryWeaponItems ACE_player) select 2;
+
+// calculate lighting
+private ["_dayOpacity", "_nightOpacity"];
+
+_dayOpacity = call EFUNC(common,ambientBrightness);
+_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 1713005) ctrlSetTextColor [1,1,1,_dayOpacity];
+(_display displayCtrl 1713006) ctrlSetTextColor [1,1,1,_nightOpacity];
+
+/*
+(_display displayCtrl 1713001) ctrlCommit 0;
+(_display displayCtrl 1713002) ctrlCommit 0;
+(_display displayCtrl 1713005) ctrlCommit 0;
+(_display displayCtrl 1713006) ctrlCommit 0;
+*/
+
+(_display displayCtrl 1713001) ctrlShow true;
+(_display displayCtrl 1713002) ctrlShow true;
+(_display displayCtrl 1713005) ctrlShow true;
+(_display displayCtrl 1713006) ctrlShow true;
diff --git a/addons/optics/functions/script_component.hpp b/addons/optics/functions/script_component.hpp
new file mode 100644
index 0000000000..5613c1aec3
--- /dev/null
+++ b/addons/optics/functions/script_component.hpp
@@ -0,0 +1 @@
+#include "\z\ace\addons\optics\script_component.hpp"
\ No newline at end of file
diff --git a/TO_MERGE/agm/Optics/data/tmr_reticle_clear.p3d b/addons/optics/models/ace_optics_empty.p3d
similarity index 100%
rename from TO_MERGE/agm/Optics/data/tmr_reticle_clear.p3d
rename to addons/optics/models/ace_optics_empty.p3d
diff --git a/addons/optics/models/ace_optics_pip.p3d b/addons/optics/models/ace_optics_pip.p3d
new file mode 100644
index 0000000000..9ec6765294
Binary files /dev/null and b/addons/optics/models/ace_optics_pip.p3d differ
diff --git a/TO_MERGE/agm/Optics/data/tmr_optics_reticle100.p3d b/addons/optics/models/ace_optics_reticle100.p3d
similarity index 79%
rename from TO_MERGE/agm/Optics/data/tmr_optics_reticle100.p3d
rename to addons/optics/models/ace_optics_reticle100.p3d
index 365c9d5555..b5f58cfd1c 100644
Binary files a/TO_MERGE/agm/Optics/data/tmr_optics_reticle100.p3d and b/addons/optics/models/ace_optics_reticle100.p3d differ
diff --git a/TO_MERGE/agm/Optics/data/tmr_optics_reticle80.p3d b/addons/optics/models/ace_optics_reticle70.p3d
similarity index 79%
rename from TO_MERGE/agm/Optics/data/tmr_optics_reticle80.p3d
rename to addons/optics/models/ace_optics_reticle70.p3d
index cbb0181a17..5aa9e8613a 100644
Binary files a/TO_MERGE/agm/Optics/data/tmr_optics_reticle80.p3d and b/addons/optics/models/ace_optics_reticle70.p3d differ
diff --git a/TO_MERGE/agm/Optics/data/tmr_optics_reticle70.p3d b/addons/optics/models/ace_optics_reticle80.p3d
similarity index 79%
rename from TO_MERGE/agm/Optics/data/tmr_optics_reticle70.p3d
rename to addons/optics/models/ace_optics_reticle80.p3d
index cbb0181a17..55cf233032 100644
Binary files a/TO_MERGE/agm/Optics/data/tmr_optics_reticle70.p3d and b/addons/optics/models/ace_optics_reticle80.p3d differ
diff --git a/TO_MERGE/agm/Optics/data/tmr_optics_reticle90.p3d b/addons/optics/models/ace_optics_reticle90.p3d
similarity index 79%
rename from TO_MERGE/agm/Optics/data/tmr_optics_reticle90.p3d
rename to addons/optics/models/ace_optics_reticle90.p3d
index c2f1ae5ceb..30dc511df9 100644
Binary files a/TO_MERGE/agm/Optics/data/tmr_optics_reticle90.p3d and b/addons/optics/models/ace_optics_reticle90.p3d differ
diff --git a/addons/scopes/ace_shortdot_optics.p3d b/addons/optics/models/ace_shortdot_optics.p3d
similarity index 75%
rename from addons/scopes/ace_shortdot_optics.p3d
rename to addons/optics/models/ace_shortdot_optics.p3d
index 3d0392346a..47b82be4b7 100644
Binary files a/addons/scopes/ace_shortdot_optics.p3d and b/addons/optics/models/ace_shortdot_optics.p3d differ
diff --git a/addons/scopes/data/reticles/ace_shortdot_reticle_1.paa b/addons/optics/reticles/ace_shortdot_reticle_1.paa
similarity index 100%
rename from addons/scopes/data/reticles/ace_shortdot_reticle_1.paa
rename to addons/optics/reticles/ace_shortdot_reticle_1.paa
diff --git a/addons/scopes/data/reticles/ace_shortdot_reticle_2.paa b/addons/optics/reticles/ace_shortdot_reticle_2.paa
similarity index 100%
rename from addons/scopes/data/reticles/ace_shortdot_reticle_2.paa
rename to addons/optics/reticles/ace_shortdot_reticle_2.paa
diff --git a/TO_MERGE/agm/Optics/data/arco/arco-bodyNight_ca.paa b/addons/optics/reticles/arco-bodyNight_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/arco/arco-bodyNight_ca.paa
rename to addons/optics/reticles/arco-bodyNight_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/arco/arco-body_ca.paa b/addons/optics/reticles/arco-body_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/arco/arco-body_ca.paa
rename to addons/optics/reticles/arco-body_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/arco/arco-reticle65Illum_ca.paa b/addons/optics/reticles/arco-reticle65Illum_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/arco/arco-reticle65Illum_ca.paa
rename to addons/optics/reticles/arco-reticle65Illum_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/arco/arco-reticle65_ca.paa b/addons/optics/reticles/arco-reticle65_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/arco/arco-reticle65_ca.paa
rename to addons/optics/reticles/arco-reticle65_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/black.rvmat b/addons/optics/reticles/black.rvmat
similarity index 100%
rename from TO_MERGE/agm/Optics/data/black.rvmat
rename to addons/optics/reticles/black.rvmat
diff --git a/TO_MERGE/agm/Optics/data/em.rvmat b/addons/optics/reticles/em.rvmat
similarity index 100%
rename from TO_MERGE/agm/Optics/data/em.rvmat
rename to addons/optics/reticles/em.rvmat
diff --git a/TO_MERGE/agm/Optics/data/hamr/hamr-bodyNight_ca.paa b/addons/optics/reticles/hamr-bodyNight_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/hamr/hamr-bodyNight_ca.paa
rename to addons/optics/reticles/hamr-bodyNight_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/hamr/hamr-body_ca.paa b/addons/optics/reticles/hamr-body_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/hamr/hamr-body_ca.paa
rename to addons/optics/reticles/hamr-body_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/hamr/hamr-reticle65Illum_ca.paa b/addons/optics/reticles/hamr-reticle65Illum_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/hamr/hamr-reticle65Illum_ca.paa
rename to addons/optics/reticles/hamr-reticle65Illum_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/hamr/hamr-reticle65_ca.paa b/addons/optics/reticles/hamr-reticle65_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/hamr/hamr-reticle65_ca.paa
rename to addons/optics/reticles/hamr-reticle65_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/mrco/mrco-bodyNight_ca.paa b/addons/optics/reticles/mrco-bodyNight_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/mrco/mrco-bodyNight_ca.paa
rename to addons/optics/reticles/mrco-bodyNight_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/mrco/mrco-body_ca.paa b/addons/optics/reticles/mrco-body_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/mrco/mrco-body_ca.paa
rename to addons/optics/reticles/mrco-body_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/mrco/mrco-reticle556Illum_ca.paa b/addons/optics/reticles/mrco-reticle556Illum_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/mrco/mrco-reticle556Illum_ca.paa
rename to addons/optics/reticles/mrco-reticle556Illum_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/mrco/mrco-reticle556_ca.paa b/addons/optics/reticles/mrco-reticle556_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/mrco/mrco-reticle556_ca.paa
rename to addons/optics/reticles/mrco-reticle556_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/scopeblack-100_ca.paa b/addons/optics/reticles/scopeblack-100_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/scopeblack-100_ca.paa
rename to addons/optics/reticles/scopeblack-100_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/scopeblack-70_ca.paa b/addons/optics/reticles/scopeblack-70_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/scopeblack-70_ca.paa
rename to addons/optics/reticles/scopeblack-70_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/scopeblack-80_ca.paa b/addons/optics/reticles/scopeblack-80_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/scopeblack-80_ca.paa
rename to addons/optics/reticles/scopeblack-80_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/scopeblack-90_ca.paa b/addons/optics/reticles/scopeblack-90_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/scopeblack-90_ca.paa
rename to addons/optics/reticles/scopeblack-90_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/sos/sos-bodyNight_ca.paa b/addons/optics/reticles/sos-bodyNight_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/sos/sos-bodyNight_ca.paa
rename to addons/optics/reticles/sos-bodyNight_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/sos/sos-body_ca.paa b/addons/optics/reticles/sos-body_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/sos/sos-body_ca.paa
rename to addons/optics/reticles/sos-body_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/sos/sos-reticleMLRIllum_ca.paa b/addons/optics/reticles/sos-reticleMLRIllum_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/sos/sos-reticleMLRIllum_ca.paa
rename to addons/optics/reticles/sos-reticleMLRIllum_ca.paa
diff --git a/TO_MERGE/agm/Optics/data/sos/sos-reticleMLR_ca.paa b/addons/optics/reticles/sos-reticleMLR_ca.paa
similarity index 100%
rename from TO_MERGE/agm/Optics/data/sos/sos-reticleMLR_ca.paa
rename to addons/optics/reticles/sos-reticleMLR_ca.paa
diff --git a/addons/optics/script_component.hpp b/addons/optics/script_component.hpp
new file mode 100644
index 0000000000..58b2d4756a
--- /dev/null
+++ b/addons/optics/script_component.hpp
@@ -0,0 +1,27 @@
+#define COMPONENT optics
+#include "\z\ace\addons\main\script_mod.hpp"
+
+#ifdef DEBUG_ENABLED_OPTICS
+ #define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_ENABLED_OPTICS
+ #define DEBUG_SETTINGS DEBUG_ENABLED_OPTICS
+#endif
+
+#include "\z\ace\addons\main\script_macros.hpp"
+
+#define SCOPE_RECOIL_MIN 0.03
+#define SCOPE_RECOIL_MAX 0.032
+
+#define SCOPE_SHIFT_X_MIN 0.04
+#define SCOPE_SHIFT_X_MAX 0.05
+#define SCOPE_SHIFT_Y_MIN -0.02
+#define SCOPE_SHIFT_Y_MAX -0.03
+
+#define RETICLE_SHIFT_X_MIN 0.006
+#define RETICLE_SHIFT_X_MAX 0.011
+#define RETICLE_SHIFT_Y_MIN -0.009
+#define RETICLE_SHIFT_Y_MAX -0.014
+
+#define RECENTER_TIME 0.09
diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml
new file mode 100644
index 0000000000..d34dd8b633
--- /dev/null
+++ b/addons/optics/stringtable.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+ RCO (2D)
+ RCO (2D)
+ RCO (2D)
+ RCO (2D)
+ RCO (2D)
+ RCO (2D)
+ RCO (2D)
+ RCO (2D)
+ RCO (2D)
+ RCO (2D)
+
+
+
+ RCO (PIP)
+ RCO (PIP)
+ RCO (PIP)
+ RCO (PIP)
+ RCO (PIP)
+ RCO (PIP)
+ RCO (PIP)
+ RCO (PIP)
+ RCO (PIP)
+ RCO (PIP)
+
+
+
+ ARCO (2D)
+ ARCO (2D)
+ ARCO (2D)
+ ARCO (2D)
+ ARCO (2D)
+ ARCO (2D)
+ ARCO (2D)
+ ARCO (2D)
+ ARCO (2D)
+ ARCO (2D)
+
+
+
+ ARCO (PIP)
+ ARCO (PIP)
+ ARCO (PIP)
+ ARCO (PIP)
+ ARCO (PIP)
+ ARCO (PIP)
+ ARCO (PIP)
+ ARCO (PIP)
+ ARCO (PIP)
+ ARCO (PIP)
+
+
+
+ MRCO (2D)
+ MRCO (2D)
+ MRCO (2D)
+ MRCO (2D)
+ MRCO (2D)
+ MRCO (2D)
+ MRCO (2D)
+ MRCO (2D)
+ Прицел MRCO (2D)
+ MRCO (2D)
+
+
+
+ MRCO (PIP)
+ MRCO (PIP)
+ MRCO (PIP)
+ MRCO (PIP)
+ MRCO (PIP)
+ MRCO (PIP)
+ MRCO (PIP)
+ MRCO (PIP)
+ Прицел MRCO (PIP)
+ MRCO (PIP)
+
+
+
+ MOS (2D)
+ MOS (2D)
+ MOS (2D)
+ MOS (2D)
+ MOS (2D)
+ MOS (2D)
+ MOS (2D)
+ MOS (2D)
+ MOS (2D)
+ MOS (2D)
+
+
+
+ MOS (PIP)
+ MOS (PIP)
+ MOS (PIP)
+ MOS (PIP)
+ MOS (PIP)
+ MOS (PIP)
+ MOS (PIP)
+ MOS (PIP)
+ MOS (PIP)
+ MOS (PIP)
+
+
+
+ LRPS (2D)
+ LRPS (2D)
+ LRPS (2D)
+ LRPS (2D)
+ LRPS (2D)
+ LRPS (2D)
+ LRPS (2D)
+ LRPS (2D)
+ LRPS (2D)
+ MPLD (2D)
+
+
+
+ LRPS (PIP)
+ LRPS (PIP)
+ LRPS (PIP)
+ LRPS (PIP)
+ LRPS (PIP)
+ LRPS (PIP)
+ LRPS (PIP)
+ LRPS (PIP)
+ LRPS (PIP)
+ MPLD (PIP)
+
+
+
diff --git a/addons/optionsmenu/gui/pauseMenu.hpp b/addons/optionsmenu/gui/pauseMenu.hpp
index 880f418a38..d6a831c2aa 100644
--- a/addons/optionsmenu/gui/pauseMenu.hpp
+++ b/addons/optionsmenu/gui/pauseMenu.hpp
@@ -94,4 +94,13 @@ class RscDisplayInterruptEditor3D: RscStandardDisplay {
class controls {
class ACE_Open_settingsMenu_Btn : ACE_Open_SettingsMenu_BtnBase {};
};
-};
\ No newline at end of file
+};
+class RscDisplayMain: RscStandardDisplay {
+ class controls {
+ class ACE_Open_settingsMenu_Btn : ACE_Open_SettingsMenu_BtnBase {
+ action = "if (missionName != '') then {createDialog 'ACE_settingsMenu';};";
+ y = "4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + safezoneY";
+ };
+ };
+};
+
diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp
index 1d932d1f51..3ccc8ee603 100644
--- a/addons/overheating/config.cpp
+++ b/addons/overheating/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {"ACE_SpareBarrel"};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ace_common", "ace_interaction"};
+ requiredAddons[] = {"ace_interaction"};
author[] = {"commy2", "KoffeinFlummi", "esteldunedain"};
authorUrl = "https://github.com/commy2/";
VERSION_CONFIG;
diff --git a/addons/overheating/script_component.hpp b/addons/overheating/script_component.hpp
index d7ce7d2d3b..46a31e6ea3 100644
--- a/addons/overheating/script_component.hpp
+++ b/addons/overheating/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\Addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_OVERHEATING
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_OVERHEATING
- #define DEBUG_SETTINGS DEBUG_SETTINGS_OVERHEATING
+ #define DEBUG_SETTINGS DEBUG_SETTINGS_OVERHEATING
#endif
#include "\z\ace\Addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/addons/overpressure/script_component.hpp b/addons/overpressure/script_component.hpp
index 8dac72cbbf..21f4cea704 100644
--- a/addons/overpressure/script_component.hpp
+++ b/addons/overpressure/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\Addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_OVERPRESSURE
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_ENABLED_OVERPRESSURE
- #define DEBUG_SETTINGS DEBUG_ENABLED_OVERPRESSURE
+ #define DEBUG_SETTINGS DEBUG_ENABLED_OVERPRESSURE
#endif
#include "\z\ace\Addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/addons/parachute/CfgVehicles.hpp b/addons/parachute/CfgVehicles.hpp
index 2d8545a607..04732d0506 100644
--- a/addons/parachute/CfgVehicles.hpp
+++ b/addons/parachute/CfgVehicles.hpp
@@ -20,9 +20,9 @@ class CfgVehicles {
author = "$STR_ACE_Common_ACETeam";
scope = 2;
displayName = "$STR_ACE_Parachute_NonSteerableParachute";
- //picture = "\A3\Characters_F\data\ui\icon_b_parachute_ca.paa"; // @todo
- //model = "\A3\Weapons_F\Ammoboxes\Bags\Backpack_Parachute"; // @todo
- // backpackSimulation = "ParachuteNonSteerable"; //ParachuteSteerable //Bis broke this in 1.40
+ //picture = "\A3\Characters_F\data\ui\icon_b_parachute_ca.paa"; // @todo
+ //model = "\A3\Weapons_F\Ammoboxes\Bags\Backpack_Parachute"; // @todo
+ // backpackSimulation = "ParachuteNonSteerable"; //ParachuteSteerable //Bis broke this in 1.40
ParachuteClass = "NonSteerable_Parachute_F";
maximumLoad = 0;
mass = 100;
diff --git a/addons/parachute/RscTitles.hpp b/addons/parachute/RscTitles.hpp
index d51bcad128..c6f41a7362 100644
--- a/addons/parachute/RscTitles.hpp
+++ b/addons/parachute/RscTitles.hpp
@@ -1,51 +1,51 @@
class RscText;
class RscPicture;
class RscTitles {
- class ACE_Altimeter {
- idd = 9935;
- enableSimulation = 1;
- movingEnable = 0;
- fadeIn=0;
- fadeOut=1;
- duration = 10e10;
- onLoad = "uiNamespace setVariable ['ACE_Altimeter', _this select 0];";
- class controls {
- class AltimeterImage: RscPicture {
- idc = 1200;
- text = PATHTOF(UI\watch_altimeter.paa);
- x = 0.118437 * safezoneW + safezoneX;
- y = 0.621 * safezoneH + safezoneY;
- w = 0.20625 * safezoneW;
- h = 0.341 * safezoneH;
- };
- class HeightText: RscText {
- idc = 1100;
- text = "----";
- x = 0.200937 * safezoneW + safezoneX;
- y = 0.764 * safezoneH + safezoneY;
- w = 0.04125 * safezoneW;
- h = 0.033 * safezoneH;
- colorBackground[] = {0,0,0,0};
- colorText[] = {0,0,0,1};
- };
- class DecendRate: RscText {
- idc = 1000;
- text = "--";
- x = 0.21125 * safezoneW + safezoneX;
- y = 0.742 * safezoneH + safezoneY;
- w = 0.020625 * safezoneW;
- h = 0.022 * safezoneH;
- colorText[] = {0,0,0,1};
- };
- class TimeText: RscText {
- idc = 1001;
- text = "00:00";
- x = 0.206094 * safezoneW + safezoneX;
- y = 0.819 * safezoneH + safezoneY;
- w = 0.0309375 * safezoneW;
- h = 0.022 * safezoneH;
- colorText[] = {0,0,0,1};
- };
- };
- };
+ class ACE_Altimeter {
+ idd = 9935;
+ enableSimulation = 1;
+ movingEnable = 0;
+ fadeIn=0;
+ fadeOut=1;
+ duration = 10e10;
+ onLoad = "uiNamespace setVariable ['ACE_Altimeter', _this select 0];";
+ class controls {
+ class AltimeterImage: RscPicture {
+ idc = 1200;
+ text = PATHTOF(UI\watch_altimeter.paa);
+ x = 0.118437 * safezoneW + safezoneX;
+ y = 0.621 * safezoneH + safezoneY;
+ w = 0.20625 * safezoneW;
+ h = 0.341 * safezoneH;
+ };
+ class HeightText: RscText {
+ idc = 1100;
+ text = "----";
+ x = 0.200937 * safezoneW + safezoneX;
+ y = 0.764 * safezoneH + safezoneY;
+ w = 0.04125 * safezoneW;
+ h = 0.033 * safezoneH;
+ colorBackground[] = {0,0,0,0};
+ colorText[] = {0,0,0,1};
+ };
+ class DecendRate: RscText {
+ idc = 1000;
+ text = "--";
+ x = 0.21125 * safezoneW + safezoneX;
+ y = 0.742 * safezoneH + safezoneY;
+ w = 0.020625 * safezoneW;
+ h = 0.022 * safezoneH;
+ colorText[] = {0,0,0,1};
+ };
+ class TimeText: RscText {
+ idc = 1001;
+ text = "00:00";
+ x = 0.206094 * safezoneW + safezoneX;
+ y = 0.819 * safezoneH + safezoneY;
+ w = 0.0309375 * safezoneW;
+ h = 0.022 * safezoneH;
+ colorText[] = {0,0,0,1};
+ };
+ };
+ };
};
diff --git a/addons/parachute/functions/fnc_doLanding.sqf b/addons/parachute/functions/fnc_doLanding.sqf
index 134ab8a3ea..126a3b0720 100644
--- a/addons/parachute/functions/fnc_doLanding.sqf
+++ b/addons/parachute/functions/fnc_doLanding.sqf
@@ -19,8 +19,8 @@ _unit = _this select 0;
GVAR(PFH) = false;
[_unit, "AmovPercMevaSrasWrflDf_AmovPknlMstpSrasWrflDnon", 2] call EFUNC(common,doAnimation);
[{
- if (time >= ((_this select 0) select 0) + 1) then {
- ((_this select 0) select 1) playActionNow "Crouch";
- [(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);
- };
+ if (time >= ((_this select 0) select 0) + 1) then {
+ ((_this select 0) select 1) playActionNow "Crouch";
+ [(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);
+ };
}, 1, [time,_unit]] call CALLSTACK(cba_fnc_addPerFrameHandler);
diff --git a/addons/parachute/functions/fnc_onEachFrame.sqf b/addons/parachute/functions/fnc_onEachFrame.sqf
index be9f0e000c..dbfab16452 100644
--- a/addons/parachute/functions/fnc_onEachFrame.sqf
+++ b/addons/parachute/functions/fnc_onEachFrame.sqf
@@ -25,9 +25,9 @@ private ["_pos"];
_pos = getPosASL (vehicle _player);
if ((lineIntersects [_pos, _pos vectorAdd [0,0,-0.5], vehicle _player, _player]) || {((ASLtoATL _pos) select 2) < 0.75}) then {
- [(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);
- GVAR(PFH) = false;
+ [(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);
+ GVAR(PFH) = false;
// I believe this will not work for Zeus units.
- deleteVehicle (vehicle _player);
- [_player] call FUNC(doLanding);
+ deleteVehicle (vehicle _player);
+ [_player] call FUNC(doLanding);
};
diff --git a/addons/parachute/functions/fnc_showAltimeter.sqf b/addons/parachute/functions/fnc_showAltimeter.sqf
index 8e3c3d83e3..a8200fb2ca 100644
--- a/addons/parachute/functions/fnc_showAltimeter.sqf
+++ b/addons/parachute/functions/fnc_showAltimeter.sqf
@@ -21,26 +21,26 @@ if (isNull (uiNamespace getVariable ["ACE_Altimeter", displayNull])) exitWith {}
GVAR(AltimeterActive) = true;
[{
- if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler);};
- disableSerialization;
- EXPLODE_4_PVT(_this select 0,_display,_unit,_oldHeight,_prevTime);
- if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler);call FUNC(hideAltimeter);};
+ if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler);};
+ disableSerialization;
+ EXPLODE_4_PVT(_this select 0,_display,_unit,_oldHeight,_prevTime);
+ if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler);call FUNC(hideAltimeter);};
- private ["_height", "_hour", "_minute", "_descentRate","_HeightText", "_DecendRate", "_TimeText", "_curTime"];
- _HeightText = _display displayCtrl 1100;
- _DecendRate = _display displayCtrl 1000;
- _TimeText = _display displayCtrl 1001;
- _hour = floor daytime;
- _minute = floor ((daytime - _hour) * 60);
+ private ["_height", "_hour", "_minute", "_descentRate","_HeightText", "_DecendRate", "_TimeText", "_curTime"];
+ _HeightText = _display displayCtrl 1100;
+ _DecendRate = _display displayCtrl 1000;
+ _TimeText = _display displayCtrl 1001;
+ _hour = floor daytime;
+ _minute = floor ((daytime - _hour) * 60);
- _height = (getPosASL _unit) select 2;
- _curTime = time;
- _descentRate = floor ((_oldHeight - _height) / (_curTime - _prevTime));
+ _height = (getPosASL _unit) select 2;
+ _curTime = time;
+ _descentRate = floor ((_oldHeight - _height) / (_curTime - _prevTime));
- _TimeText ctrlSetText (format ["%1:%2",[_hour, 2] call EFUNC(common,numberToDigitsString),[_minute, 2] call EFUNC(common,numberToDigitsString)]);
- _HeightText ctrlSetText (format ["%1", floor(_height)]);
- _DecendRate ctrlSetText (format ["%1", _descentRate max 0]);
+ _TimeText ctrlSetText (format ["%1:%2",[_hour, 2] call EFUNC(common,numberToDigitsString),[_minute, 2] call EFUNC(common,numberToDigitsString)]);
+ _HeightText ctrlSetText (format ["%1", floor(_height)]);
+ _DecendRate ctrlSetText (format ["%1", _descentRate max 0]);
- (_this select 0) set [2, _height];
- (_this select 0) set [3, _curTime];
+ (_this select 0) set [2, _height];
+ (_this select 0) set [3, _curTime];
}, 0.2, [uiNamespace getVariable ["ACE_Altimeter", displayNull], _unit,floor ((getPosASL _unit) select 2), time]] call CALLSTACK(cba_fnc_addPerFrameHandler);
diff --git a/addons/protection/FixVests.hpp b/addons/protection/FixVests.hpp
index f3d1ad2b3d..db00c1ea05 100644
--- a/addons/protection/FixVests.hpp
+++ b/addons/protection/FixVests.hpp
@@ -234,7 +234,7 @@ class V_PlateCarrierIA2_dgtl: V_PlateCarrierIA1_dgtl { // heavy
};
};
class V_PlateCarrierIAGL_dgtl: V_PlateCarrierIA2_dgtl { // heavy (gl)
- class ItemInfo: VestItem {
+ class ItemInfo: ItemInfo {
containerClass = "Supply140"; //"Supply120";
mass = 100; //80;
armor = 12; //100;
diff --git a/addons/recoil/$PBOPREFIX$ b/addons/recoil/$PBOPREFIX$
deleted file mode 100644
index efd38b75ed..0000000000
--- a/addons/recoil/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\ace\addons\recoil
diff --git a/addons/recoil/CfgEventHandlers.hpp b/addons/recoil/CfgEventHandlers.hpp
deleted file mode 100644
index 1bf256e028..0000000000
--- a/addons/recoil/CfgEventHandlers.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-class Extended_PreInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preInit) );
- };
-};
-
-class Extended_FiredBis_EventHandlers {
- class CAManBase {
- class ADDON {
- clientFiredBis = QUOTE(if (_this select 0 == ACE_player) then {_this call FUNC(camShake); _this call FUNC(burstDispersion);};);
- };
- };
- class Tank {
- class ADDON {
- clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};);
- };
- };
- class Car {
- class ADDON {
- clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};);
- };
- };
- class Helicopter {
- class ADDON {
- clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};);
- };
- };
- class Plane {
- class ADDON {
- clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};);
- };
- };
- class Ship_F {
- class ADDON {
- clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};);
- };
- };
- class StaticWeapon {
- class ADDON {
- clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};);
- };
- };
-};
diff --git a/addons/recoil/README.md b/addons/recoil/README.md
deleted file mode 100644
index 124f1a25ce..0000000000
--- a/addons/recoil/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-ace_recoil
-==========
-
-Overhauls the vanilla recoil, reducing muzzle climb while increasing kickback.
-
-
-## Maintainers
-
-The people responsible for merging changes to this component or answering potential questions.
-
-- [KoffeinFlummi](https://github.com/KoffeinFlummi)
-- [commy2](https://github.com/commy2)
diff --git a/addons/recoil/config.cpp b/addons/recoil/config.cpp
deleted file mode 100644
index db08a49143..0000000000
--- a/addons/recoil/config.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ace_common"};
- author[] = {"KoffeinFlummi", "TaoSensai", "commy2"};
- authorUrl = "https://github.com/Taosenai/tmr";
- VERSION_CONFIG;
- };
-};
-
-#include "CfgEventHandlers.hpp"
-
-// DOC: http://forums.bistudio.com/showthread.php?94464-explaining-the-cfgRecoils-array
-class CfgRecoils {
- #define KICKBACK 0.07
- #define KICKBACKPRONE 0.05
-
- #define MUZZLECLIMB 0.01
- #define MUZZLERECOVERY -0.004
-
- // BASE RECOILS
- pistolBase[] = {0,0.8*KICKBACK,0.9*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.9*MUZZLERECOVERY, 0.3,0,0};
- subMachineGunBase[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- assaultRifleBase[] = {0,1*KICKBACK,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- machinegunBase[] = {0,1*KICKBACK,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- launcherBase[] = {0,0,0};
-
- // PISTOLS
- recoil_pistol_light[] = {0,0.8*KICKBACK,0.9*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.9*MUZZLERECOVERY, 0.3,0,0};
- recoil_pistol_heavy[] = {0,1.1*KICKBACK,1.4*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.4*MUZZLERECOVERY, 0.3,0,0};
- recoil_prone_pistol_light[] = {0,0.8*KICKBACKPRONE,0.9*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.9*MUZZLERECOVERY, 0.3,0,0};
- recoil_prone_pistol_heavy[] = {0,1.1*KICKBACKPRONE,1.4*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.4*MUZZLERECOVERY, 0.3,0,0};
-
- // SUBMACHINE GUNS
- recoil_single_smg_01[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_burst_smg_01[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_smg_01[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_smg_01[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_burst_prone_smg_01[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_smg_01[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_smg_02[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_burst_smg_02[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_smg_02[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_smg_02[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_burst_prone_smg_02[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_smg_02[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_pdw[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_burst_pdw[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_pdw[] = {0,0.5*KICKBACK,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_pdw[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_burst_prone_pdw[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_pdw[] = {0,0.5*KICKBACKPRONE,0.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.5*MUZZLERECOVERY, 0.3,0,0};
-
- // ASSAULT RIFLES
- recoil_single_mx[] = {0,1*KICKBACK,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_mx[] = {0,1*KICKBACK,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_mx[] = {0,1*KICKBACKPRONE,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_mx[] = {0,1*KICKBACKPRONE,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_ktb[] = {0,1*KICKBACK,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_ktb[] = {0,1*KICKBACK,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_ktb[] = {0,1*KICKBACKPRONE,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_ktb[] = {0,1*KICKBACKPRONE,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_mk20[] = {0,0.8*KICKBACK,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_mk20[] = {0,0.8*KICKBACK,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_mk20[] = {0,0.8*KICKBACKPRONE,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_mk20[] = {0,0.8*KICKBACKPRONE,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_trg[] = {0,0.8*KICKBACK,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_trg[] = {0,0.8*KICKBACK,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_trg[] = {0,0.8*KICKBACKPRONE,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_trg[] = {0,0.8*KICKBACKPRONE,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_sdar[] = {0,0.8*KICKBACK,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_sdar[] = {0,0.8*KICKBACK,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_sdar[] = {0,0.8*KICKBACKPRONE,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_sdar[] = {0,0.8*KICKBACKPRONE,0.8*MUZZLECLIMB, 0.12,0,0, 0.15,0,0.8*MUZZLERECOVERY, 0.3,0,0};
-
- // MACHINE GUNS
- recoil_single_mk200[] = {0,1*KICKBACK,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_mk200[] = {0,1*KICKBACK,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_mk200[] = {0,1*KICKBACKPRONE,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_mk200[] = {0,1*KICKBACKPRONE,1*MUZZLECLIMB, 0.12,0,0, 0.15,0,1*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_zafir[] = {0,1.5*KICKBACK,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_zafir[] = {0,1.5*KICKBACK,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_zafir[] = {0,1.5*KICKBACKPRONE,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_zafir[] = {0,1.5*KICKBACKPRONE,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
-
- // PRECISION RIFLES
- recoil_single_dmr[] = {0,1.5*KICKBACK,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_dmr[] = {0,1.5*KICKBACK,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_dmr[] = {0,1.5*KICKBACKPRONE,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_dmr[] = {0,1.5*KICKBACKPRONE,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_ebr[] = {0,1.5*KICKBACK,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_ebr[] = {0,1.5*KICKBACK,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_ebr[] = {0,1.5*KICKBACKPRONE,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_auto_prone_ebr[] = {0,1.5*KICKBACKPRONE,1.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,1.5*MUZZLERECOVERY, 0.3,0,0};
-
- recoil_single_gm6[] = {0,2.5*KICKBACK,2.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,2.5*MUZZLERECOVERY, 0.3,0,0};
- recoil_single_prone_gm6[] = {0,2.5*KICKBACKPRONE,2.5*MUZZLECLIMB, 0.12,0,0, 0.15,0,2.5*MUZZLERECOVERY, 0.3,0,0};
-
- // LAUNCHERS
- recoil_single_law[] = {0,0,0};
- recoil_single_nlaw[] = {0,0,0};
- recoil_single_titan[] = {0,0,0};
-};
-
-class CfgCameraShake {
- // Seems to be ignored by Arma
- defaultCaliberCoefWeaponFire = 0;
-};
-
-// Completely disable BI's camshake on fire.
-class CfgMovesBasic {
- class Default {
- camShakeFire = 0;
- };
-};
-class CfgMovesMaleSdr : CfgMovesBasic {
- class States {
- class AmovPercMstpSlowWrflDnon;
- class AmovPknlMstpSlowWrflDnon : AmovPercMstpSlowWrflDnon {
- camShakeFire = 0;
- };
- class AmovPercMstpSrasWrflDnon;
- class AmovPpneMstpSrasWrflDnon : AmovPercMstpSrasWrflDnon {
- camShakeFire = 0;
- };
- class AmovPknlMstpSrasWlnrDnon : Default {
- camShakeFire = 0;
- };
- class AmovPknlMrunSlowWrflDf;
- class AmovPknlMtacSlowWrflDf : AmovPknlMrunSlowWrflDf {
- camShakeFire = 0;
- };
- class AmovPknlMrunSlowWrflDfl;
- class AmovPknlMtacSlowWrflDfl : AmovPknlMrunSlowWrflDfl {
- camShakeFire = 0;
- };
- class AmovPknlMrunSlowWrflDl;
- class AmovPknlMtacSlowWrflDl : AmovPknlMrunSlowWrflDl {
- camShakeFire = 0;
- };
- class AmovPknlMrunSlowWrflDbl;
- class AmovPknlMtacSlowWrflDbl : AmovPknlMrunSlowWrflDbl {
- camShakeFire = 0;
- };
- class AmovPknlMrunSlowWrflDb;
- class AmovPknlMtacSlowWrflDb : AmovPknlMrunSlowWrflDb {
- camShakeFire = 0;
- };
- class AmovPknlMrunSlowWrflDbr;
- class AmovPknlMtacSlowWrflDbr : AmovPknlMrunSlowWrflDbr {
- camShakeFire = 0;
- };
- class AmovPknlMrunSlowWrflDr;
- class AmovPknlMtacSlowWrflDr : AmovPknlMrunSlowWrflDr {
- camShakeFire = 0;
- };
- class AmovPknlMrunSlowWrflDfr;
- class AmovPknlMtacSlowWrflDfr : AmovPknlMrunSlowWrflDfr {
- camShakeFire = 0;
- };
- class AmovPknlMstpSrasWrflDnon;
- class AmovPknlMwlkSrasWrflDf : AmovPknlMstpSrasWrflDnon {
- camShakeFire = 0;
- };
- class AmovPknlMrunSrasWrflDf;
- class AmovPknlMtacSrasWrflDf : AmovPknlMrunSrasWrflDf {
- camShakeFire = 0;
- };
- class AmovPknlMwlkSrasWpstDf;
- class AmovPknlMtacSrasWpstDf : AmovPknlMwlkSrasWpstDf {
- camShakeFire = 0;
- };
- };
-};
-
-// Ammo
-class CfgAmmo {
- class MissileCore;
- class MissileBase: MissileCore {
- GVAR(shakeMultiplier) = 2;
- };
-
- class BombCore;
- class LaserBombCore: BombCore {
- GVAR(shakeMultiplier) = 2;
- };
- class Bo_Mk82: BombCore {
- GVAR(shakeMultiplier) = 2;
- };
-
- class RocketCore;
- class ArtilleryRocketCore: RocketCore {
- GVAR(shakeMultiplier) = 1.4;
- };
- class RocketBase: RocketCore {
- GVAR(shakeMultiplier) = 1.4;
- };
-
- class BulletCore;
- class BulletBase: BulletCore {
- GVAR(shakeMultiplier) = 1;
- };
-
- class ShotgunCore;
- class ShotgunBase: ShotgunCore {
- GVAR(shakeMultiplier) = 1.1;
- };
-
- class ShellCore;
- class ShellBase: ShellCore {
- GVAR(shakeMultiplier) = 3;
- };
-
- class SubmunitionCore;
- class SubmunitionBase: SubmunitionCore {
- GVAR(shakeMultiplier) = 3;
- };
-
- class ShotDeployCore;
- class ShotDeployBase: ShotDeployCore {
- GVAR(shakeMultiplier) = 3;
- };
-};
-
-// Weapons
-// 1. Set the recoil profiles for all fire modes.
-// 2. Set the shake multiplier. This determines the camshake for the weapon.
-// Ex: GVAR(shakeMultiplier) = 1; (disabled currently)
-
-class CfgWeapons {
- class CannonCore;
- class autocannon_Base_F: CannonCore {
- GVAR(shakeMultiplier) = 0;
- };
- class autocannon_35mm: CannonCore {
- GVAR(shakeMultiplier) = 0;
- };
- class cannon_120mm: CannonCore {
- GVAR(shakeMultiplier) = 0;
- };
- class mortar_155mm_AMOS: CannonCore {
- GVAR(shakeMultiplier) = 0;
- };
- class mortar_82mm: CannonCore {
- GVAR(shakeMultiplier) = 0;
- };
-
- // No camshake for gatlings
- class gatling_20mm: CannonCore {
- GVAR(shakeMultiplier) = 0;
- };
- class gatling_25mm: CannonCore {
- GVAR(shakeMultiplier) = 0;
- };
- class gatling_30mm: CannonCore {
- GVAR(shakeMultiplier) = 0;
- };
-
- class MGunCore;
- class MGun: MGunCore {
- GVAR(shakeMultiplier) = 0;
- };
- // No camshake for smoke launchers
- class SmokeLauncher: MGun {
- GVAR(shakeMultiplier) = 0;
- };
-
- // No camshake for coax machine guns
- class LMG_RCWS;
- class LMG_M200: LMG_RCWS {
- GVAR(shakeMultiplier) = 0;
- };
- class LMG_coax: LMG_RCWS {
- GVAR(shakeMultiplier) = 0;
- };
- class LMG_Minigun: LMG_RCWS {
- GVAR(shakeMultiplier) = 0;
- };
-};
-
-// Vehicles
-class CfgVehicles {
- class LandVehicle;
- class Tank: LandVehicle {
- GVAR(enableCamshake) = 1;
- };
- class Car: LandVehicle {
- GVAR(enableCamshake) = 1;
- };
- class StaticWeapon: LandVehicle {
- GVAR(enableCamshake) = 1;
- };
-
- class Allvehicles;
- class Air: Allvehicles {
- GVAR(enableCamshake) = 1;
- };
-};
diff --git a/addons/recoil/functions/fnc_burstDispersion.sqf b/addons/recoil/functions/fnc_burstDispersion.sqf
deleted file mode 100644
index 9467e922ff..0000000000
--- a/addons/recoil/functions/fnc_burstDispersion.sqf
+++ /dev/null
@@ -1,62 +0,0 @@
-// TMR: Small Arms - Recoil initialization and functions
-// (C) 2013 Ryan Schultz. See LICENSE.
-// Edited for compatability in ACE by KoffeinFlummi
-// Edited by commy2
-
-#include "script_component.hpp"
-
-private ["_unit", "_weapon", "_projectile"];
-
-_unit = _this select 0;
-_weapon = _this select 1;
-_projectile = _this select 6;
-
-if (_weapon in ["Throw", "Put"]) exitWith {};
-
-private ["_lastFired", "_burst"];
-
-_lastFired = _unit getVariable [QUOTE(GVAR(lastFired)), -1];
-_burst = _unit getVariable [QUOTE(GVAR(burst)), 0];
-
-if (time - _lastFired < 0.45) then {
- private "_startDisperse";
- _burst = _burst + 1;
- _unit setVariable [QUOTE(GVAR(burst)), _burst, false];
-
- _startDisperse = [1, 3] select (cameraView == "GUNNER");
-
- if (_burst > _startDisperse) then {
- // Reset burst size for calcs
- _burst = _burst - _startDisperse;
-
- // Increase dispersion cap if player is not using sights
- _sightsBurst = [30, 0] select (cameraView == "GUNNER");
-
- // Increase initial dispersion and cap if player is moving
- if (speed _unit > 0.5) then {
- _sightsBurst = 25;
- _burst = _burst + 15;
- };
-
- // Maximum possible dispersion (without _sightsBurst mod)
- _maxBurst = 50;
-
- if (_unit getVariable [QUOTE(EGVAR(resting,weaponRested)), false]) then {_maxBurst = 25};
- if (_unit getVariable [QUOTE(EGVAR(resting,bipodDeployed)), false]) then {_maxBurst = 18};
-
- // Cap the dispersion
- _burst = (_burst min _maxBurst) + _sightsBurst;
-
- // Add random variance
- _elevAngle = (_burst / 300) - random (_burst / 300) * 2;
- _travAngle = (_burst / 260) - random (_burst / 260) * 2;
-
- [_projectile, _travAngle, _elevAngle] call EFUNC(common,changeProjectileDirection);
- };
-} else {
-
- // Long enough delay, reset burst
- _unit setVariable [QUOTE(GVAR(burst)), 0, false];
-};
-
-_unit setVariable [QUOTE(GVAR(lastFired)), time, false];
diff --git a/addons/recoil/functions/fnc_camShake.sqf b/addons/recoil/functions/fnc_camShake.sqf
deleted file mode 100644
index cfe179d67b..0000000000
--- a/addons/recoil/functions/fnc_camShake.sqf
+++ /dev/null
@@ -1,61 +0,0 @@
-// TMR: Small Arms - Recoil initialization and functions
-// (C) 2013 Ryan Schultz. See LICENSE.
-// Edited for compatability in ACE by KoffeinFlummi
-// Edited by commy2
-
-#include "script_component.hpp"
-
-#define BASE_POWER 0.40
-#define BASE_TIME 0.19
-#define BASE_FREQ 13
-#define RECOIL_COEF 40
-
-private ["_unit", "_weapon", "_muzzle", "_ammo"];
-
-_unit = _this select 0;
-_weapon = _this select 1;
-_muzzle = _this select 2;
-_ammo = _this select 4;
-
-if (_weapon in [handgunWeapon _unit, "Throw", "Put"]) exitWith {};
-
-private ["_powerMod", "_timeMod", "_freqMod", "_powerCoef"];
-
-_powerMod = ([0, -0.1, -0.1, 0, -0.2] select (["STAND", "CROUCH", "PRONE", "UNDEFINED", ""] find stance _unit)) + ([0, -1, 0, -1] select (["INTERNAL", "EXTERNAL", "GUNNER", "GROUP"] find cameraView));
-_timeMod = 0;
-_freqMod = 0;
-
-_powerCoef = 0;
-if (_unit != vehicle _unit) then {
- _powerCoef = getNumber (configFile >> "CfgWeapons" >> _weapon >> QUOTE(GVAR(shakeMultiplier)));
- _powerCoef = _powerCoef * getNumber (configFile >> "CfgAmmo" >> _ammo >> QUOTE(GVAR(shakeMultiplier)));
-} else {
- private ["_type", "_config", "_recoil"];
-
- _type = ["recoil", "recoilProne"] select (stance _unit == "PRONE");
-
- _config = configFile >> "CfgWeapons" >> _weapon;
- _recoil = if (_muzzle == _weapon) then {
- getText (_config >> _type)
- } else {
- getText (_config >> _muzzle >> _type)
- };
-
- _recoil = getArray (configFile >> "CfgRecoils" >> _recoil);
- if (count _recoil < 2) exitWith {};
-
- _powerCoef = _recoil select 1;
- _powerCoef = (call compile format ["%1", _powerCoef]) * RECOIL_COEF;
-};
-
-if (_unit getVariable [QUOTE(EGVAR(resting,weaponRested)), false]) then {_powerMod = _powerMod - 0.07};
-if (_unit getVariable [QUOTE(EGVAR(resting,bipodDeployed)), false]) then {_powerMod = _powerMod - 0.11};
-
-private "_camshake";
-_camshake = [
- _powerCoef * (BASE_POWER + _powerMod) max 0,
- BASE_TIME + _timeMod max 0,
- BASE_FREQ + _freqMod max 0
-];
-
-addCamShake _camshake;
diff --git a/addons/recoil/functions/script_component.hpp b/addons/recoil/functions/script_component.hpp
deleted file mode 100644
index d104528384..0000000000
--- a/addons/recoil/functions/script_component.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#define COMPONENT recoil
-#include "\z\ace\Addons\main\script_mod.hpp"
-
-#ifdef DEBUG_ENABLED_RECOIL
- #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_RECOIL
- #define DEBUG_SETTINGS DEBUG_SETTINGS_RECOIL
-#endif
-
-#include "\z\ace\Addons\main\script_macros.hpp"
diff --git a/addons/recoil/script_component.hpp b/addons/recoil/script_component.hpp
deleted file mode 100644
index d104528384..0000000000
--- a/addons/recoil/script_component.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#define COMPONENT recoil
-#include "\z\ace\Addons\main\script_mod.hpp"
-
-#ifdef DEBUG_ENABLED_RECOIL
- #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_RECOIL
- #define DEBUG_SETTINGS DEBUG_SETTINGS_RECOIL
-#endif
-
-#include "\z\ace\Addons\main\script_macros.hpp"
diff --git a/addons/reloadlaunchers/config.cpp b/addons/reloadlaunchers/config.cpp
index a039ef87c4..3a66b39719 100644
--- a/addons/reloadlaunchers/config.cpp
+++ b/addons/reloadlaunchers/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ace_common","ace_interaction","ace_interact_menu"};
+ requiredAddons[] = {"ace_interaction"};
author[] = {""};
authorUrl = "";
VERSION_CONFIG;
diff --git a/addons/resting/$PBOPREFIX$ b/addons/resting/$PBOPREFIX$
deleted file mode 100644
index 94f2a89f81..0000000000
--- a/addons/resting/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\ace\addons\resting
\ No newline at end of file
diff --git a/addons/resting/CfgEventHandlers.hpp b/addons/resting/CfgEventHandlers.hpp
deleted file mode 100644
index beb3c4d419..0000000000
--- a/addons/resting/CfgEventHandlers.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-class Extended_PreInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preInit));
- };
-};
-
-class Extended_PostInit_EventHandlers {
- class ADDON {
- init = QUOTE( call COMPILE_FILE(XEH_postInit) );
- };
-};
diff --git a/addons/resting/CfgMoves.hpp b/addons/resting/CfgMoves.hpp
deleted file mode 100644
index 3c4ab85a5c..0000000000
--- a/addons/resting/CfgMoves.hpp
+++ /dev/null
@@ -1,1389 +0,0 @@
-// CODE BELOW TAKEN FROM TMR, PREFIXES EDITED FOR COMPATABILITY
-
-#define ACE_SWAY_DEPLOY 0.02
-#define ACE_SWAY_DEPLOYPRONE 0.01
-#define ACE_SWAY_RESTED 0.04 //0.08
-#define ACE_SWAY_RESTEDPRONE 0.02 //0.04
-#define ACE_DEPLOY_TURNSPEED 0.1
-
-// Arma 3 doesn't respect turnSpeed.
-
-class CfgMovesBasic {
- class Default;
-
- class Actions {
- class RifleStandActions;
- class RifleStandActions_ace_deploy : RifleStandActions {
- stop = "AmovPercMstpSrasWrflDnon_ace_deploy";
- default = "AmovPercMstpSrasWrflDnon_ace_deploy";
- turnL = "AmovPercMstpSrasWrflDnon_ace_deploy";
- turnR = "AmovPercMstpSrasWrflDnon_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLStandActions;
- class RifleAdjustLStandActions_ace_deploy : RifleAdjustLStandActions {
- stop = "AadjPercMstpSrasWrflDleft_ace_deploy";
- default = "AadjPercMstpSrasWrflDleft_ace_deploy";
- AdjustL = "AadjPercMstpSrasWrflDleft_ace_deploy";
- turnL = "AadjPercMstpSrasWrflDleft_ace_deploy";
- turnR = "AadjPercMstpSrasWrflDleft_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRStandActions;
- class RifleAdjustRStandActions_ace_deploy : RifleAdjustRStandActions {
- stop = "AadjPercMstpSrasWrflDright_ace_deploy";
- default = "AadjPercMstpSrasWrflDright_ace_deploy";
- AdjustRight = "AadjPercMstpSrasWrflDright_ace_deploy";
- turnL = "AadjPercMstpSrasWrflDright_ace_deploy";
- turnR = "AadjPercMstpSrasWrflDright_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFStandActions;
- class RifleAdjustFStandActions_ace_deploy : RifleAdjustFStandActions {
- stop = "AadjPercMstpSrasWrflDup_ace_deploy";
- default = "AadjPercMstpSrasWrflDup_ace_deploy";
- AdjustF = "AadjPercMstpSrasWrflDup_ace_deploy";
- turnL = "AadjPercMstpSrasWrflDup_ace_deploy";
- turnR = "AadjPercMstpSrasWrflDup_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBStandActions;
- class RifleAdjustBStandActions_ace_deploy : RifleAdjustBStandActions {
- stop = "AadjPercMstpSrasWrflDdown_ace_deploy";
- default = "AadjPercMstpSrasWrflDdown_ace_deploy";
- AdjustB = "AadjPercMstpSrasWrflDdown_ace_deploy";
- turnR = "AadjPercMstpSrasWrflDdown_ace_deploy";
- turnL = "AadjPercMstpSrasWrflDdown_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleKneelActions;
- class RifleKneelActions_ace_deploy : RifleKneelActions {
- stop = "AmovPknlMstpSrasWrflDnon_ace_deploy";
- default = "AmovPknlMstpSrasWrflDnon_ace_deploy";
- crouch = "AmovPknlMstpSrasWrflDnon_ace_deploy"; // TODO: this might cause issues
- turnL = "AmovPknlMstpSrasWrflDnon_ace_deploy";
- turnR = "AmovPknlMstpSrasWrflDnon_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLKneelActions;
- class RifleAdjustLKneelActions_ace_deploy : RifleAdjustLKneelActions {
- stop = "AadjPknlMstpSrasWrflDleft_ace_deploy";
- default = "AadjPknlMstpSrasWrflDleft_ace_deploy";
- turnL = "AadjPknlMstpSrasWrflDleft_ace_deploy";
- turnR = "AadjPknlMstpSrasWrflDleft_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRKneelActions;
- class RifleAdjustRKneelActions_ace_deploy : RifleAdjustRKneelActions {
- stop = "AadjPknlMstpSrasWrflDright_ace_deploy";
- default = "AadjPknlMstpSrasWrflDright_ace_deploy";
- turnL = "AadjPknlMstpSrasWrflDright_ace_deploy";
- turnR = "AadjPknlMstpSrasWrflDright_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFKneelActions;
- class RifleAdjustFKneelActions_ace_deploy : RifleAdjustFKneelActions {
- stop = "AadjPknlMstpSrasWrflDup_ace_deploy";
- default = "AadjPknlMstpSrasWrflDup_ace_deploy";
- turnL = "AadjPknlMstpSrasWrflDup_ace_deploy";
- turnR = "AadjPknlMstpSrasWrflDup_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBKneelActions;
- class RifleAdjustBKneelActions_ace_deploy : RifleAdjustBKneelActions {
- stop = "AadjPknlMstpSrasWrflDdown_ace_deploy";
- default = "AadjPknlMstpSrasWrflDdown_ace_deploy";
- turnL = "AadjPknlMstpSrasWrflDdown_ace_deploy";
- turnR = "AadjPknlMstpSrasWrflDdown_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleProneActions;
- class RifleProneActions_ace_deploy : RifleProneActions {
- stop = "AmovPpneMstpSrasWrflDnon_ace_deploy";
- default = "AmovPpneMstpSrasWrflDnon_ace_deploy";
- turnL = "AmovPpneMstpSrasWrflDnon_ace_deploy";
- turnR = "AmovPpneMstpSrasWrflDnon_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLProneActions;
- class RifleAdjustLProneActions_ace_deploy : RifleAdjustLProneActions {
- stop = "AadjPpneMstpSrasWrflDleft_ace_deploy";
- default = "AadjPpneMstpSrasWrflDleft_ace_deploy";
- turnL = "AadjPpneMstpSrasWrflDleft_ace_deploy";
- turnR = "AadjPpneMstpSrasWrflDleft_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRProneActions;
- class RifleAdjustRProneActions_ace_deploy : RifleAdjustRProneActions {
- stop = "AadjPpneMstpSrasWrflDright_ace_deploy";
- default = "AadjPpneMstpSrasWrflDright_ace_deploy";
- turnL = "AadjPpneMstpSrasWrflDright_ace_deploy";
- turnR = "AadjPpneMstpSrasWrflDright_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFProneActions;
- class RifleAdjustFProneActions_ace_deploy : RifleAdjustFProneActions {
- stop = "aadjppnemstpsraswrfldup_ace_deploy";
- default = "aadjppnemstpsraswrfldup_ace_deploy";
- turnL = "aadjppnemstpsraswrfldup_ace_deploy";
- turnR = "aadjppnemstpsraswrfldup_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBProneActions;
- class RifleAdjustBProneActions_ace_deploy : RifleAdjustBProneActions {
- stop = "AadjPpneMstpSrasWrflDdown_ace_deploy";
- default = "AadjPpneMstpSrasWrflDdown_ace_deploy";
- turnL = "AadjPpneMstpSrasWrflDdown_ace_deploy";
- turnR = "AadjPpneMstpSrasWrflDdown_ace_deploy";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- //////////////////////////////////////////////////////////////////////
-
- class RifleStandActions_ace_rested : RifleStandActions {
- stop = "AmovPercMstpSrasWrflDnon_ace_rested";
- default = "AmovPercMstpSrasWrflDnon_ace_rested";
- turnL = "AmovPercMstpSrasWrflDnon_ace_rested";
- turnR = "AmovPercMstpSrasWrflDnon_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLStandActions_ace_rested : RifleAdjustLStandActions {
- stop = "AadjPercMstpSrasWrflDleft_ace_rested";
- default = "AadjPercMstpSrasWrflDleft_ace_rested";
- AdjustL = "AadjPercMstpSrasWrflDleft_ace_rested";
- turnL = "AadjPercMstpSrasWrflDleft_ace_rested";
- turnR = "AadjPercMstpSrasWrflDleft_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRStandActions_ace_rested : RifleAdjustRStandActions {
- stop = "AadjPercMstpSrasWrflDright_ace_rested";
- default = "AadjPercMstpSrasWrflDright_ace_rested";
- AdjustRight = "AadjPercMstpSrasWrflDright_ace_rested";
- turnL = "AadjPercMstpSrasWrflDright_ace_rested";
- turnR = "AadjPercMstpSrasWrflDright_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFStandActions_ace_rested : RifleAdjustFStandActions {
- stop = "AadjPercMstpSrasWrflDup_ace_rested";
- default = "AadjPercMstpSrasWrflDup_ace_rested";
- AdjustF = "AadjPercMstpSrasWrflDup_ace_rested";
- turnL = "AadjPercMstpSrasWrflDup_ace_rested";
- turnR = "AadjPercMstpSrasWrflDup_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBStandActions_ace_rested : RifleAdjustBStandActions {
- stop = "AadjPercMstpSrasWrflDdown_ace_rested";
- default = "AadjPercMstpSrasWrflDdown_ace_rested";
- AdjustB = "AadjPercMstpSrasWrflDdown_ace_rested";
- turnR = "AadjPercMstpSrasWrflDdown_ace_rested";
- turnL = "AadjPercMstpSrasWrflDdown_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleKneelActions_ace_rested : RifleKneelActions {
- stop = "AmovPknlMstpSrasWrflDnon_ace_rested";
- default = "AmovPknlMstpSrasWrflDnon_ace_rested";
- crouch = "AmovPknlMstpSrasWrflDnon_ace_rested";
- turnL = "AmovPknlMstpSrasWrflDnon_ace_rested";
- turnR = "AmovPknlMstpSrasWrflDnon_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLKneelActions_ace_rested : RifleAdjustLKneelActions {
- stop = "AadjPknlMstpSrasWrflDleft_ace_rested";
- default = "AadjPknlMstpSrasWrflDleft_ace_rested";
- turnL = "AadjPknlMstpSrasWrflDleft_ace_rested";
- turnR = "AadjPknlMstpSrasWrflDleft_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRKneelActions_ace_rested : RifleAdjustRKneelActions {
- stop = "AadjPknlMstpSrasWrflDright_ace_rested";
- default = "AadjPknlMstpSrasWrflDright_ace_rested";
- turnL = "AadjPknlMstpSrasWrflDright_ace_rested";
- turnR = "AadjPknlMstpSrasWrflDright_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFKneelActions_ace_rested : RifleAdjustFKneelActions {
- stop = "AadjPknlMstpSrasWrflDup_ace_rested";
- default = "AadjPknlMstpSrasWrflDup_ace_rested";
- turnL = "AadjPknlMstpSrasWrflDup_ace_rested";
- turnR = "AadjPknlMstpSrasWrflDup_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBKneelActions_ace_rested : RifleAdjustBKneelActions {
- stop = "AadjPknlMstpSrasWrflDdown_ace_rested";
- default = "AadjPknlMstpSrasWrflDdown_ace_rested";
- turnL = "AadjPknlMstpSrasWrflDdown_ace_rested";
- turnR = "AadjPknlMstpSrasWrflDdown_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleProneActions_ace_rested : RifleProneActions {
- stop = "AmovPpneMstpSrasWrflDnon_ace_rested";
- default = "AmovPpneMstpSrasWrflDnon_ace_rested";
- turnL = "AmovPpneMstpSrasWrflDnon_ace_rested";
- turnR = "AmovPpneMstpSrasWrflDnon_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustLProneActions_ace_rested : RifleAdjustLProneActions {
- stop = "AadjPpneMstpSrasWrflDleft_ace_rested";
- default = "AadjPpneMstpSrasWrflDleft_ace_rested";
- turnL = "AadjPpneMstpSrasWrflDleft_ace_rested";
- turnR = "AadjPpneMstpSrasWrflDleft_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustRProneActions_ace_rested : RifleAdjustRProneActions {
- stop = "AadjPpneMstpSrasWrflDright_ace_rested";
- default = "AadjPpneMstpSrasWrflDright_ace_rested";
- turnL = "AadjPpneMstpSrasWrflDright_ace_rested";
- turnR = "AadjPpneMstpSrasWrflDright_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustFProneActions_ace_rested : RifleAdjustFProneActions {
- stop = "aadjppnemstpsraswrfldup_ace_rested";
- default = "aadjppnemstpsraswrfldup_ace_rested";
- turnL = "aadjppnemstpsraswrfldup_ace_rested";
- turnR = "aadjppnemstpsraswrfldup_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class RifleAdjustBProneActions_ace_rested : RifleAdjustBProneActions {
- stop = "AadjPpneMstpSrasWrflDdown_ace_rested";
- default = "AadjPpneMstpSrasWrflDdown_ace_rested";
- turnL = "AadjPpneMstpSrasWrflDdown_ace_rested";
- turnR = "AadjPpneMstpSrasWrflDdown_ace_rested";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- //////////////////////////////////////////////////////////////////////
- // FFV
- //////////////////////////////////////////////////////////////////////
-
- class passenger_inside_1Actions;
- class passenger_inside_1Actions_ace_deploy : passenger_inside_1Actions {
- stop = "passenger_inside_1_Aim_ace_deploy";
- default = "passenger_inside_1_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_inside_2Actions;
- class passenger_inside_2Actions_ace_deploy : passenger_inside_2Actions {
- stop = "passenger_inside_2_Aim_ace_deploy";
- default = "passenger_inside_2_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_inside_3Actions;
- class passenger_inside_3Actions_ace_deploy : passenger_inside_3Actions {
- stop = "passenger_inside_3_Aim_ace_deploy";
- default = "passenger_inside_3_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_inside_4Actions;
- class passenger_inside_4Actions_ace_deploy : passenger_inside_4Actions {
- stop = "passenger_inside_4_Aim_ace_deploy";
- default = "passenger_inside_4_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_bench_1Actions;
- class passenger_bench_1Actions_ace_deploy : passenger_bench_1Actions {
- stop = "passenger_bench_1_Aim_ace_deploy";
- default = "passenger_bench_1_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_boat_1Actions;
- class passenger_boat_1Actions_ace_deploy : passenger_boat_1Actions {
- stop = "passenger_boat_1_Aim_ace_deploy";
- default = "passenger_boat_1_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_boat_2Actions;
- class passenger_boat_2Actions_ace_deploy : passenger_boat_2Actions {
- stop = "passenger_boat_2_Aim_ace_deploy";
- default = "passenger_boat_2_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_boat_3Actions;
- class passenger_boat_3Actions_ace_deploy : passenger_boat_3Actions {
- stop = "passenger_boat_3_Aim_ace_deploy";
- default = "passenger_boat_3_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_boat_4Actions;
- class passenger_boat_4Actions_ace_deploy : passenger_boat_4Actions {
- stop = "passenger_boat_4_Aim_ace_deploy";
- default = "passenger_boat_4_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_flatground_1Actions;
- class passenger_flatground_1Actions_ace_deploy : passenger_flatground_1Actions {
- stop = "passenger_flatground_1_Aim_ace_deploy";
- default = "passenger_flatground_1_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_flatground_2Actions;
- class passenger_flatground_2Actions_ace_deploy : passenger_flatground_2Actions {
- stop = "passenger_flatground_2_Aim_ace_deploy";
- default = "passenger_flatground_2_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_flatground_3Actions;
- class passenger_flatground_3Actions_ace_deploy : passenger_flatground_3Actions {
- stop = "passenger_flatground_3_Aim_ace_deploy";
- default = "passenger_flatground_3_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_flatground_4Actions;
- class passenger_flatground_4Actions_ace_deploy : passenger_flatground_4Actions {
- stop = "passenger_flatground_4_Aim_ace_deploy";
- default = "passenger_flatground_4_Aim_ace_deploy";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- //////////////////////////////////////////////////////////////////////
-
- class passenger_inside_1Actions_ace_rested : passenger_inside_1Actions {
- stop = "passenger_inside_1_Aim_ace_rested";
- default = "passenger_inside_1_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_inside_2Actions_ace_rested : passenger_inside_2Actions {
- stop = "passenger_inside_2_Aim_ace_rested";
- default = "passenger_inside_2_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_inside_3Actions_ace_rested : passenger_inside_3Actions {
- stop = "passenger_inside_3_Aim_ace_rested";
- default = "passenger_inside_3_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_inside_4Actions_ace_rested : passenger_inside_4Actions {
- stop = "passenger_inside_4_Aim_ace_rested";
- default = "passenger_inside_4_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_bench_1Actions_ace_rested : passenger_bench_1Actions {
- stop = "passenger_bench_1_Aim_ace_rested";
- default = "passenger_bench_1_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_boat_1Actions_ace_rested : passenger_boat_1Actions {
- stop = "passenger_boat_1_Aim_ace_rested";
- default = "passenger_boat_1_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_boat_2Actions_ace_rested : passenger_boat_2Actions {
- stop = "passenger_boat_2_Aim_ace_rested";
- default = "passenger_boat_2_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_boat_3Actions_ace_rested : passenger_boat_3Actions {
- stop = "passenger_boat_3_Aim_ace_rested";
- default = "passenger_boat_3_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_boat_4Actions_ace_rested : passenger_boat_4Actions {
- stop = "passenger_boat_4_Aim_ace_rested";
- default = "passenger_boat_4_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_flatground_1Actions_ace_rested : passenger_flatground_1Actions {
- stop = "passenger_flatground_1_Aim_ace_rested";
- default = "passenger_flatground_1_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_flatground_2Actions_ace_rested : passenger_flatground_2Actions {
- stop = "passenger_flatground_2_Aim_ace_rested";
- default = "passenger_flatground_2_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_flatground_3Actions_ace_rested : passenger_flatground_3Actions {
- stop = "passenger_flatground_3_Aim_ace_rested";
- default = "passenger_flatground_3_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
-
- class passenger_flatground_4Actions_ace_rested : passenger_flatground_4Actions {
- stop = "passenger_flatground_4_Aim_ace_rested";
- default = "passenger_flatground_4_Aim_ace_rested";
- turnL = "";
- turnR = "";
- turnSpeed = ACE_DEPLOY_TURNSPEED;
- limitFast = 1;
- };
- };
-};
-
-class CfgMovesMaleSdr : CfgMovesBasic {
- class States {
- class AmovPercMstpSrasWrflDnon;
- class AmovPercMstpSrasWrflDnon_ace_deploy : AmovPercMstpSrasWrflDnon {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleStandActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"AmovPercMstpSrasWrflDnon_ace_deploy", 0.02};
- ConnectFrom[] = {"AmovPercMstpSrasWrflDnon_ace_deploy", 0.02};
- InterpolateFrom[] = {"AmovPercMstpSrasWrflDnon", 0.02};
- InterpolateTo[] = {"AmovPercMstpSrasWrflDnon", 0.02};
- };
-
- class aadjpercmstpsraswrfldup;
- class aadjpercmstpsraswrfldup_ace_deploy : aadjpercmstpsraswrfldup {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleAdjustFStandActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldup_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldup_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldup", 0.02};
- };
-
- class aadjpercmstpsraswrflddown;
- class aadjpercmstpsraswrflddown_ace_deploy : aadjpercmstpsraswrflddown {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleAdjustBStandActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrflddown_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrflddown_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrflddown", 0.02};
- };
-
- class aadjpercmstpsraswrfldright;
- class aadjpercmstpsraswrfldright_ace_deploy : aadjpercmstpsraswrfldright {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleAdjustRStandActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldright_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldright_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldright", 0.02};
- };
-
- class aadjpercmstpsraswrfldleft;
- class aadjpercmstpsraswrfldleft_ace_deploy : aadjpercmstpsraswrfldleft {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleAdjustLStandActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldleft_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldleft_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldleft", 0.02};
- };
-
- class aadjpknlmstpsraswrfldup;
- class aadjpknlmstpsraswrfldup_ace_deploy : aadjpknlmstpsraswrfldup {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleAdjustFKneelActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldup_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldup_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldup", 0.02};
- };
-
- class amovpknlmstpsraswrfldnon;
- class amovpknlmstpsraswrfldnon_ace_deploy : amovpknlmstpsraswrfldnon {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleKneelActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"amovpknlmstpsraswrfldnon_ace_deploy", 0.02};
- ConnectFrom[] = {"amovpknlmstpsraswrfldnon_ace_deploy", 0.02};
- InterpolateFrom[] = {"amovpknlmstpsraswrfldnon", 0.02};
- InterpolateTo[] = {"amovpknlmstpsraswrfldnon", 0.02};
- };
-
- class aadjpknlmstpsraswrflddown;
- class aadjpknlmstpsraswrflddown_ace_deploy : aadjpknlmstpsraswrflddown {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleAdjustBKneelActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrflddown_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrflddown_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrflddown", 0.02};
- };
-
- class aadjpknlmstpsraswrfldleft;
- class aadjpknlmstpsraswrfldleft_ace_deploy : aadjpknlmstpsraswrfldleft {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleAdjustLKneelActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldleft_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldleft_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldleft", 0.02};
- };
-
- class aadjpknlmstpsraswrfldright;
- class aadjpknlmstpsraswrfldright_ace_deploy : aadjpknlmstpsraswrfldright {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "RifleAdjustRKneelActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldright_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldright_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldright", 0.02};
- };
-
- class aadjppnemstpsraswrfldup;
- class aadjppnemstpsraswrfldup_ace_deploy : aadjppnemstpsraswrfldup {
- aimPrecision = ACE_SWAY_DEPLOYPRONE;
- actions = "RifleAdjustFProneActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldup_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldup_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldup", 0.02};
- };
-
- class amovppnemstpsraswrfldnon;
- class amovppnemstpsraswrfldnon_ace_deploy : amovppnemstpsraswrfldnon {
- aimPrecision = ACE_SWAY_DEPLOYPRONE;
- actions = "RifleProneActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"amovppnemstpsraswrfldnon_ace_deploy", 0.02};
- ConnectFrom[] = {"amovppnemstpsraswrfldnon_ace_deploy", 0.02};
- InterpolateFrom[] = {"amovppnemstpsraswrfldnon", 0.02};
- InterpolateTo[] = {"amovppnemstpsraswrfldnon", 0.02};
- };
-
- class aadjppnemstpsraswrflddown;
- class aadjppnemstpsraswrflddown_ace_deploy : aadjppnemstpsraswrflddown {
- aimPrecision = ACE_SWAY_DEPLOYPRONE;
- actions = "RifleAdjustBKneelActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrflddown_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrflddown_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrflddown", 0.02};
- };
-
- class aadjppnemstpsraswrfldleft;
- class aadjppnemstpsraswrfldleft_ace_deploy : aadjppnemstpsraswrfldleft {
- aimPrecision = ACE_SWAY_DEPLOYPRONE;
- actions = "RifleAdjustLKneelActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldleft_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldleft_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldleft", 0.02};
- };
-
- class aadjppnemstpsraswrfldright;
- class aadjppnemstpsraswrfldright_ace_deploy : aadjppnemstpsraswrfldright {
- aimPrecision = ACE_SWAY_DEPLOYPRONE;
- actions = "RifleAdjustRKneelActions_ace_deploy";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldright_ace_deploy", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldright_ace_deploy", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldright", 0.02};
- };
-
- /////////////////////////////////////////////////////////////////////////////
-
- class AmovPercMstpSrasWrflDnon_ace_rested : AmovPercMstpSrasWrflDnon {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleStandActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"AmovPercMstpSrasWrflDnon_ace_rested", 0.02};
- ConnectFrom[] = {"AmovPercMstpSrasWrflDnon_ace_rested", 0.02};
- InterpolateFrom[] = {"AmovPercMstpSrasWrflDnon", 0.02};
- InterpolateTo[] = {"AmovPercMstpSrasWrflDnon", 0.02};
- };
-
- class aadjpercmstpsraswrfldup_ace_rested : aadjpercmstpsraswrfldup {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleAdjustFStandActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldup_ace_rested", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldup_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldup", 0.02};
- };
-
- class aadjpercmstpsraswrflddown_ace_rested : aadjpercmstpsraswrflddown {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleAdjustBStandActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrflddown_ace_rested", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrflddown_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrflddown", 0.02};
- };
-
- class aadjpercmstpsraswrfldright_ace_rested : aadjpercmstpsraswrfldright {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleAdjustRStandActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldright_ace_rested", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldright_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldright", 0.02};
- };
-
- class aadjpercmstpsraswrfldleft_ace_rested : aadjpercmstpsraswrfldleft {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleAdjustLStandActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpercmstpsraswrfldleft_ace_rested", 0.02};
- ConnectFrom[] = {"aadjpercmstpsraswrfldleft_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjpercmstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjpercmstpsraswrfldleft", 0.02};
- };
-
- class aadjpknlmstpsraswrfldup_ace_rested : aadjpknlmstpsraswrfldup {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleAdjustFKneelActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldup_ace_rested", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldup_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldup", 0.02};
- };
-
- class amovpknlmstpsraswrfldnon_ace_rested : amovpknlmstpsraswrfldnon {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleKneelActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"amovpknlmstpsraswrfldnon_ace_rested", 0.02};
- ConnectFrom[] = {"amovpknlmstpsraswrfldnon_ace_rested", 0.02};
- InterpolateFrom[] = {"amovpknlmstpsraswrfldnon", 0.02};
- InterpolateTo[] = {"amovpknlmstpsraswrfldnon", 0.02};
- };
-
- class aadjpknlmstpsraswrflddown_ace_rested : aadjpknlmstpsraswrflddown {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleAdjustBKneelActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrflddown_ace_rested", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrflddown_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrflddown", 0.02};
- };
-
- class aadjpknlmstpsraswrfldleft_ace_rested : aadjpknlmstpsraswrfldleft {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleAdjustLKneelActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldleft_ace_rested", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldleft_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldleft", 0.02};
- };
-
- class aadjpknlmstpsraswrfldright_ace_rested : aadjpknlmstpsraswrfldright {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "RifleAdjustRKneelActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjpknlmstpsraswrfldright_ace_rested", 0.02};
- ConnectFrom[] = {"aadjpknlmstpsraswrfldright_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjpknlmstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjpknlmstpsraswrfldright", 0.02};
- };
-
- class aadjppnemstpsraswrfldup_ace_rested : aadjppnemstpsraswrfldup {
- aimPrecision = ACE_SWAY_RESTEDPRONE;
- actions = "RifleAdjustFProneActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldup_ace_rested", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldup_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldup", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldup", 0.02};
- };
-
- class amovppnemstpsraswrfldnon_ace_rested : amovppnemstpsraswrfldnon {
- aimPrecision = ACE_SWAY_RESTEDPRONE;
- actions = "RifleProneActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"amovppnemstpsraswrfldnon_ace_rested", 0.02};
- ConnectFrom[] = {"amovppnemstpsraswrfldnon_ace_rested", 0.02};
- InterpolateFrom[] = {"amovppnemstpsraswrfldnon", 0.02};
- InterpolateTo[] = {"amovppnemstpsraswrfldnon", 0.02};
- };
-
- class aadjppnemstpsraswrflddown_ace_rested : aadjppnemstpsraswrflddown {
- aimPrecision = ACE_SWAY_RESTEDPRONE;
- actions = "RifleAdjustBKneelActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrflddown_ace_rested", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrflddown_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrflddown", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrflddown", 0.02};
- };
-
- class aadjppnemstpsraswrfldleft_ace_rested : aadjppnemstpsraswrfldleft {
- aimPrecision = ACE_SWAY_RESTEDPRONE;
- actions = "RifleAdjustLKneelActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldleft_ace_rested", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldleft_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldleft", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldleft", 0.02};
- };
-
- class aadjppnemstpsraswrfldright_ace_rested : aadjppnemstpsraswrfldright {
- aimPrecision = ACE_SWAY_RESTEDPRONE;
- actions = "RifleAdjustRKneelActions_ace_rested";
- aiming = "aimingLying";
- speed = 0.01;
- onLandEnd = true;
- onLandBeg = true;
-
- ConnectTo[] = {"aadjppnemstpsraswrfldright_ace_rested", 0.02};
- ConnectFrom[] = {"aadjppnemstpsraswrfldright_ace_rested", 0.02};
- InterpolateFrom[] = {"aadjppnemstpsraswrfldright", 0.02};
- InterpolateTo[] = {"aadjppnemstpsraswrfldright", 0.02};
- };
-
- //////////////////////////////////////////////////////////////////////
- // FFV
- //////////////////////////////////////////////////////////////////////
-
- class passenger_bench_1_Aim;
- class passenger_bench_1_Aim_ace_deploy : passenger_bench_1_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_bench_1Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_bench_1_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_bench_1_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_bench_1_Aim", 0.02};
- InterpolateTo[] = {"passenger_bench_1_Aim", 0.02};
- };
-
- class passenger_inside_1_Aim;
- class passenger_inside_1_Aim_ace_deploy : passenger_inside_1_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_inside_1Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_inside_1_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_inside_1_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_inside_1_Aim", 0.02};
- InterpolateTo[] = {"passenger_inside_1_Aim", 0.02};
- };
-
- class passenger_inside_2_Aim;
- class passenger_inside_2_Aim_ace_deploy : passenger_inside_2_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_inside_2Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_inside_2_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_inside_2_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_inside_2_Aim", 0.02};
- InterpolateTo[] = {"passenger_inside_2_Aim", 0.02};
- };
-
- class passenger_inside_3_Aim;
- class passenger_inside_3_Aim_ace_deploy : passenger_inside_3_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_inside_3Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_inside_3_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_inside_3_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_inside_3_Aim", 0.02};
- InterpolateTo[] = {"passenger_inside_3_Aim", 0.02};
- };
-
- class passenger_inside_4_Aim;
- class passenger_inside_4_Aim_ace_deploy : passenger_inside_4_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_inside_4Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_inside_4_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_inside_4_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_inside_4_Aim", 0.02};
- InterpolateTo[] = {"passenger_inside_4_Aim", 0.02};
- };
-
- class passenger_boat_1_Aim;
- class passenger_boat_1_Aim_ace_deploy : passenger_boat_1_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_boat_1Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_boat_1_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_boat_1_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_boat_1_Aim", 0.02};
- InterpolateTo[] = {"passenger_boat_1_Aim", 0.02};
- };
-
- class passenger_boat_2_Aim;
- class passenger_boat_2_Aim_ace_deploy : passenger_boat_2_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_boat_2Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_boat_2_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_boat_2_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_boat_2_Aim", 0.02};
- InterpolateTo[] = {"passenger_boat_2_Aim", 0.02};
- };
-
- class passenger_boat_3_Aim;
- class passenger_boat_3_Aim_ace_deploy : passenger_boat_3_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_boat_3Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_boat_3_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_boat_3_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_boat_3_Aim", 0.02};
- InterpolateTo[] = {"passenger_boat_3_Aim", 0.02};
- };
-
- class passenger_boat_4_Aim;
- class passenger_boat_4_Aim_ace_deploy : passenger_boat_4_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_boat_4Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_boat_4_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_boat_4_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_boat_4_Aim", 0.02};
- InterpolateTo[] = {"passenger_boat_4_Aim", 0.02};
- };
-
- class passenger_flatground_1_Aim;
- class passenger_flatground_1_Aim_ace_deploy : passenger_flatground_1_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_flatground_1Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_flatground_1_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_flatground_1_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_flatground_1_Aim", 0.02};
- InterpolateTo[] = {"passenger_flatground_1_Aim", 0.02};
- };
-
- class passenger_flatground_2_Aim;
- class passenger_flatground_2_Aim_ace_deploy : passenger_flatground_2_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_flatground_2Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_flatground_2_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_flatground_2_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_flatground_2_Aim", 0.02};
- InterpolateTo[] = {"passenger_flatground_2_Aim", 0.02};
- };
-
- class passenger_flatground_3_Aim;
- class passenger_flatground_3_Aim_ace_deploy : passenger_flatground_3_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_flatground_3Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_flatground_3_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_flatground_3_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_flatground_3_Aim", 0.02};
- InterpolateTo[] = {"passenger_flatground_3_Aim", 0.02};
- };
-
- class passenger_flatground_4_Aim;
- class passenger_flatground_4_Aim_ace_deploy : passenger_flatground_4_Aim {
- aimPrecision = ACE_SWAY_DEPLOY;
- actions = "passenger_flatground_4Actions_ace_deploy";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_flatground_4_Aim_ace_deploy", 0.02};
- ConnectFrom[] = {"passenger_flatground_4_Aim_ace_deploy", 0.02};
- InterpolateFrom[] = {"passenger_flatground_4_Aim", 0.02};
- InterpolateTo[] = {"passenger_flatground_4_Aim", 0.02};
- };
-
- //////////////////////////////////////////////////////////////////////
-
- class passenger_bench_1_Aim_ace_rested : passenger_bench_1_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_bench_1Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_bench_1_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_bench_1_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_bench_1_Aim", 0.02};
- InterpolateTo[] = {"passenger_bench_1_Aim", 0.02};
- };
-
- class passenger_inside_1_Aim_ace_rested : passenger_inside_1_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_inside_1Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_inside_1_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_inside_1_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_inside_1_Aim", 0.02};
- InterpolateTo[] = {"passenger_inside_1_Aim", 0.02};
- };
-
- class passenger_inside_2_Aim_ace_rested : passenger_inside_2_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_inside_2Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_inside_2_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_inside_2_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_inside_2_Aim", 0.02};
- InterpolateTo[] = {"passenger_inside_2_Aim", 0.02};
- };
-
- class passenger_inside_3_Aim_ace_rested : passenger_inside_3_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_inside_3Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_inside_3_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_inside_3_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_inside_3_Aim", 0.02};
- InterpolateTo[] = {"passenger_inside_3_Aim", 0.02};
- };
-
- class passenger_inside_4_Aim_ace_rested : passenger_inside_4_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_inside_4Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_inside_4_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_inside_4_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_inside_4_Aim", 0.02};
- InterpolateTo[] = {"passenger_inside_4_Aim", 0.02};
- };
-
- class passenger_boat_1_Aim_ace_rested : passenger_boat_1_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_boat_1Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_boat_1_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_boat_1_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_boat_1_Aim", 0.02};
- InterpolateTo[] = {"passenger_boat_1_Aim", 0.02};
- };
-
- class passenger_boat_2_Aim_ace_rested : passenger_boat_2_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_boat_2Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_boat_2_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_boat_2_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_boat_2_Aim", 0.02};
- InterpolateTo[] = {"passenger_boat_2_Aim", 0.02};
- };
-
- class passenger_boat_3_Aim_ace_rested : passenger_boat_3_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_boat_3Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_boat_3_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_boat_3_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_boat_3_Aim", 0.02};
- InterpolateTo[] = {"passenger_boat_3_Aim", 0.02};
- };
-
- class passenger_boat_4_Aim_ace_rested : passenger_boat_4_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_boat_4Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_boat_4_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_boat_4_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_boat_4_Aim", 0.02};
- InterpolateTo[] = {"passenger_boat_4_Aim", 0.02};
- };
-
- class passenger_flatground_1_Aim_ace_rested : passenger_flatground_1_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_flatground_1Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_flatground_1_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_flatground_1_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_flatground_1_Aim", 0.02};
- InterpolateTo[] = {"passenger_flatground_1_Aim", 0.02};
- };
-
- class passenger_flatground_2_Aim_ace_rested : passenger_flatground_2_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_flatground_2Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_flatground_2_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_flatground_2_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_flatground_2_Aim", 0.02};
- InterpolateTo[] = {"passenger_flatground_2_Aim", 0.02};
- };
-
- class passenger_flatground_3_Aim_ace_rested : passenger_flatground_3_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_flatground_3Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_flatground_3_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_flatground_3_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_flatground_3_Aim", 0.02};
- InterpolateTo[] = {"passenger_flatground_3_Aim", 0.02};
- };
-
- class passenger_flatground_4_Aim_ace_rested : passenger_flatground_4_Aim {
- aimPrecision = ACE_SWAY_RESTED;
- actions = "passenger_flatground_4Actions_ace_rested";
- aiming = "aimingDefault";
- speed = 0.01;
- onLandEnd = false;
- onLandBeg = false;
-
- ConnectTo[] = {"passenger_flatground_4_Aim_ace_rested", 0.02};
- ConnectFrom[] = {"passenger_flatground_4_Aim_ace_rested", 0.02};
- InterpolateFrom[] = {"passenger_flatground_4_Aim", 0.02};
- InterpolateTo[] = {"passenger_flatground_4_Aim", 0.02};
- };
- };
-};
diff --git a/addons/resting/CfgSounds.hpp b/addons/resting/CfgSounds.hpp
deleted file mode 100644
index b55d4d9ae8..0000000000
--- a/addons/resting/CfgSounds.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class CfgSounds {
- class GVAR(rest)
- {
- name=QGVAR(rest);
- sound[]={QUOTE(PATHTOF(sounds\weaponrest_rest.wav)),1,1};
- titles[]={};
- };
- class GVAR(unrest)
- {
- name=QGVAR(unrest);
- sound[]={QUOTE(PATHTOF(sounds\weaponrest_unrest.wav)),1,1};
- titles[]={};
- };
-};
\ No newline at end of file
diff --git a/addons/resting/CfgWeapons.hpp b/addons/resting/CfgWeapons.hpp
deleted file mode 100644
index 56bef2c033..0000000000
--- a/addons/resting/CfgWeapons.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-class CfgWeapons {
- class Rifle_Long_Base_F;
- class arifle_MX_Base_F;
-
- class arifle_MX_SW_F : arifle_MX_Base_F {
- ACE_Bipod = 1;
- };
-
- class LMG_Mk200_F : Rifle_Long_Base_F {
- ACE_Bipod = 1;
- };
- class LMG_Zafir_F: Rifle_Long_Base_F {
- ACE_Bipod = 1;
- };
-
- class LRR_base_F : Rifle_Long_Base_F {
- ACE_Bipod = 1;
- };
- class GM6_base_F : Rifle_Long_Base_F {
- ACE_Bipod = 1;
- };
-};
diff --git a/addons/resting/README.md b/addons/resting/README.md
deleted file mode 100644
index 477ced17b5..0000000000
--- a/addons/resting/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-ace_resting
-===========
-
-Introduces weapon resting and bipod deployment, allowing the player to increase the stability of his weapon.
-
-
-## Maintainers
-
-The people responsible for merging changes to this component or answering potential questions.
-
-- [KoffeinFlummi](https://github.com/KoffeinFlummi)
-- [commy2](https://github.com/commy2)
diff --git a/addons/resting/XEH_postInit.sqf b/addons/resting/XEH_postInit.sqf
deleted file mode 100644
index bd78ae0044..0000000000
--- a/addons/resting/XEH_postInit.sqf
+++ /dev/null
@@ -1,23 +0,0 @@
-// by esteldunedain
-#include "script_component.hpp"
-
-if !(hasInterface) exitWith {};
-
-// Add keybinds
-["ACE3", QGVAR(RestWeapon), localize "STR_ACE_Resting_RestWeapon",
-{
- // Conditions: canInteract
- if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
- // Conditions: specific
- if !([ACE_player] call EFUNC(common,canUseWeapon) &&
- {inputAction 'reloadMagazine' == 0} &&
- {!weaponLowered ACE_player} &&
- {speed ACE_player < 1}) exitWith {false};
-
- // Statement
- [ACE_player, vehicle ACE_player, currentWeapon ACE_player] call FUNC(restWeapon);
- // Return false so it doesn't block other actions
- false
-},
-{false},
-[15, [false, false, false]], false] call cba_fnc_addKeybind;
diff --git a/addons/resting/XEH_preInit.sqf b/addons/resting/XEH_preInit.sqf
deleted file mode 100644
index 6a2a2040b7..0000000000
--- a/addons/resting/XEH_preInit.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "script_component.hpp"
-
-ADDON = false;
-
-PREP(getIntersection);
-PREP(hasBipod);
-PREP(pfhCheckRest);
-PREP(restWeapon);
-PREP(unRestWeapon);
-
-ADDON = true;
diff --git a/addons/resting/config.cpp b/addons/resting/config.cpp
deleted file mode 100644
index f1cc20c6e2..0000000000
--- a/addons/resting/config.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ace_common"};
- author[] = {"KoffeinFlummi", "TaoSensai", "esteldunedain"};
- authorUrl = "https://github.com/KoffeinFlummi/";
- VERSION_CONFIG;
- };
-};
-
-#include "CfgEventHandlers.hpp"
-
-#include "CfgWeapons.hpp"
-
-#include "CfgMoves.hpp"
-
-#include "CfgSounds.hpp"
\ No newline at end of file
diff --git a/addons/resting/data/icons/icon_bipod.paa b/addons/resting/data/icons/icon_bipod.paa
deleted file mode 100644
index c2b6a2fb3e..0000000000
Binary files a/addons/resting/data/icons/icon_bipod.paa and /dev/null differ
diff --git a/addons/resting/functions/fnc_getIntersection.sqf b/addons/resting/functions/fnc_getIntersection.sqf
deleted file mode 100644
index 0527a7c514..0000000000
--- a/addons/resting/functions/fnc_getIntersection.sqf
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Author: KoffeinFlummi, edited by commy2 and esteldunedain
- *
- * Prepares intersects
- *
- * Arguments:
- * 0: unit
- * 1: vehicle
- * 2: weapon
- *
- * Return Values:
- * [_intersectsMiddle, _intersectsLeft, _intersectsRight, _intersectsDown]
- *
- */
-#include "script_component.hpp"
-
-EXPLODE_3_PVT(_this,_unit,_vehicle,_weapon);
-
-private ["_weaponPos", "_weaponDir", "_weaponPosDown"];
-
-_weaponPos = ATLtoASL (_unit modelToWorldVisual (_unit selectionPosition "RightHand"));
-_weaponDir = _unit weaponDirection _weapon;
-_weaponPosDown = _weaponPos vectorAdd [0,0,-MAXHEIGHT];
-
-private ["_checkPosMiddle", "_checkPosLeft", "_checkPosRight", "_checkPosDown"];
-
-_checkPosMiddle = [
- (_weaponPos select 0) + MAXDISTANCE * (_weaponDir select 0),
- (_weaponPos select 1) + MAXDISTANCE * (_weaponDir select 1),
- (_weaponPos select 2) + MAXDISTANCE * (_weaponDir select 2)
-];
-_checkPosLeft = [
- (_weaponPos select 0) + MAXDISTANCE * sin (((_weaponDir select 0) atan2 (_weaponDir select 1)) + 360 - MAXANGLE),
- (_weaponPos select 1) + MAXDISTANCE * cos (((_weaponDir select 0) atan2 (_weaponDir select 1)) + 360 - MAXANGLE),
- (_weaponPos select 2) + MAXDISTANCE * (_weaponDir select 2)
-];
-_checkPosRight = [
- (_weaponPos select 0) + MAXDISTANCE * sin (((_weaponDir select 0) atan2 (_weaponDir select 1)) + MAXANGLE),
- (_weaponPos select 1) + MAXDISTANCE * cos (((_weaponDir select 0) atan2 (_weaponDir select 1)) + MAXANGLE),
- (_weaponPos select 2) + MAXDISTANCE * (_weaponDir select 2)
-];
-_checkPosDown = [
- (_weaponPos select 0) + MAXDISTANCE * (_weaponDir select 0),
- (_weaponPos select 1) + MAXDISTANCE * (_weaponDir select 1),
- (_weaponPos select 2) + MAXDISTANCE * (_weaponDir select 2) - MAXHEIGHT
-];
-
-/* UNCOMMENT THIS FOR DEBUGGING
-weaponPos = ASLtoATL _weaponPos;
-weaponPosDown = ASLtoATL _weaponPosDown;
-checkPosMiddle = ASLtoATL _checkPosMiddle;
-checkPosLeft = ASLtoATL _checkPosLeft;
-checkPosRight = ASLtoATL _checkPosRight;
-checkPosDown = ASLtoATL _checkPosDown;
-
-onEachFrame {
- drawLine3D [weaponPos, checkPosMiddle, [1,0,0,1]];
- drawLine3D [weaponPos, checkPosLeft, [1,0,0,1]];
- drawLine3D [weaponPos, checkPosRight, [1,0,0,1]];
- drawLine3D [weaponPosDown, checkPosDown, [1,0,0,1]];
-};*/
-
-private ["_intersectsMiddle", "_intersectsLeft", "_intersectsRight", "_intersectsDown"];
-
-_intersectsMiddle = lineIntersects [_weaponPos, _checkPosMiddle];
-_intersectsLeft = lineIntersects [_weaponPos, _checkPosLeft];
-_intersectsRight = lineIntersects [_weaponPos, _checkPosRight];
-_intersectsDown = lineIntersects [_weaponPos, _checkPosDown] || {terrainIntersectASL [_weaponPosDown, _checkPosDown]};
-
-[_intersectsMiddle, _intersectsLeft, _intersectsRight, _intersectsDown]
diff --git a/addons/resting/functions/fnc_hasBipod.sqf b/addons/resting/functions/fnc_hasBipod.sqf
deleted file mode 100644
index 2170710db1..0000000000
--- a/addons/resting/functions/fnc_hasBipod.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Author: Commy2
- *
- * Check if the weapon has a bipod
- *
- * Arguments:
- * 0: weapon
- *
- * Return Values:
- * Boolean
- *
- */
-#include "script_component.hpp"
-
-EXPLODE_1_PVT(_this,_weapon);
-
-private ["_config"];
-_config = configFile >> "CfgWeapons" >> _weapon;
-
-getNumber (_config >> "ACE_Bipod") == 1 ||
-getNumber (_config >> "AGM_Bipod") == 1 ||
-{getNumber (_config >> "tmr_autorest_deployable") == 1}
diff --git a/addons/resting/functions/fnc_pfhCheckRest.sqf b/addons/resting/functions/fnc_pfhCheckRest.sqf
deleted file mode 100644
index 0f6fea300b..0000000000
--- a/addons/resting/functions/fnc_pfhCheckRest.sqf
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Author: KoffeinFlummi, edited by commy2 and esteldunedain
- *
- * PFH that check for player moving away, changing weapon, etc
- * and unrests the weapon if necessary
- *
- * Arguments:
- * 0: unit
- * 1: vehicle
- * 2: weapon
- * 3: rested position
- *
- * Return Values:
- * None
- *
- */
-#include "script_component.hpp"
-
-EXPLODE_2_PVT(_this,_params,_pfhId);
-EXPLODE_4_PVT(_params,_unit,_vehicle,_weapon,_restedPosition);
-
-if !(_unit getVariable ["ACE_weaponRested", false]) exitWith {
- [_pfhId] call cba_fnc_removePerFrameHandler;
-};
-
-private ["_intersects"];
-_intersects = _params call FUNC(getIntersection);
-
-if (
- _unit != ACE_player
- || {_vehicle != vehicle _unit}
- || {inputAction "reloadMagazine" != 0}
- || {weaponLowered _unit}
- || {speed _unit > 1}
- || {currentWeapon _unit != _weapon}
- || {getPosASL _unit distanceSqr _restedPosition > 1}
- || {!(true in _intersects)}
-) exitWith {
- [_pfhId] call cba_fnc_removePerFrameHandler;
- [_unit, _vehicle, _weapon] call FUNC(unRestWeapon);
-};
diff --git a/addons/resting/functions/fnc_restWeapon.sqf b/addons/resting/functions/fnc_restWeapon.sqf
deleted file mode 100644
index 75d16a62be..0000000000
--- a/addons/resting/functions/fnc_restWeapon.sqf
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Author: KoffeinFlummi, edited by commy2 and esteldunedain
- *
- * Rests the player's weapon if possible.
- *
- * Arguments:
- * None
- *
- * Return Values:
- * None
- *
- */
-#include "script_component.hpp"
-
-EXPLODE_3_PVT(_this,_unit,_vehicle,_weapon);
-
-if (_weapon != primaryWeapon _unit) exitWith {};
-
-if (_unit getVariable ["ACE_weaponRested", false]) exitWith {_this call FUNC(unRestWeapon)};
-
-// exit if this is not an available animation
-if (!isClass (configFile >> "CfgMovesMaleSdr" >> "States" >> format ["%1_ace_deploy", animationState _unit])) exitWith {};
-
-// CHECK FOR APPROPRIATE SURFACE
-private "_intersects";
-_intersects = _this call FUNC(getIntersection);
-
-if (true in _intersects) then {
- _unit setVariable ["ACE_weaponRested", true];
- if (_unit == ACE_PLAYER) then {
- [QGVAR(bipodDeployed), true, QUOTE(PATHTOF(data\icons\icon_bipod.paa)), [1,1,1,1], -1] call EFUNC(common,displayIcon);
- };
-
- private "_restedPosition";
- _restedPosition = getPosASL _unit;
-
- // REST THE WEAPON
- addCamShake CAMSHAKE;
- playSound QGVAR(rest);
-
- if ([_weapon] call FUNC(hasBipod) && {_intersects select 3}) then {
- _unit setVariable ["ACE_bipodDeployed", true];
-
- _unit setUnitRecoilCoefficient (BIPODRECOIL * unitRecoilCoefficient _unit);
- //[_unit, format ["%1_ace_deploy", animationState _unit], 2] call EFUNC(common,doAnimation);
- _unit switchMove format ["%1_ace_deploy", animationState _unit];
-
- private "_picture";
- _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
- [localize "STR_ACE_Resting_BipodDeployed", _picture] call EFUNC(common,displayTextPicture);
-
- } else {
- _unit setVariable ["ACE_bipodDeployed", false];
-
- _unit setUnitRecoilCoefficient (RESTEDRECOIL * unitRecoilCoefficient _unit);
- //[_unit, format ["%1_ace_rested", animationState _unit], 2] call EFUNC(common,doAnimation);
- _unit switchMove format ["%1_ace_rested", animationState _unit];
-
- private "_picture";
- _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
- [localize "STR_ACE_Resting_WeaponRested", _picture] call EFUNC(common,displayTextPicture);
- };
-
- // Launch a PFH to check for player moving away, changing weapon, etc
- [FUNC(pfhCheckRest), 0.2, [_unit, _vehicle, _weapon, _restedPosition] ] call CBA_fnc_addPerFrameHandler;
-};
diff --git a/addons/resting/functions/fnc_unRestWeapon.sqf b/addons/resting/functions/fnc_unRestWeapon.sqf
deleted file mode 100644
index ef5a52b824..0000000000
--- a/addons/resting/functions/fnc_unRestWeapon.sqf
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Author: KoffeinFlummi, edited by commy2 and esteldunedain
- *
- * Un Rests the player's weapon
- *
- * Arguments:
- * 0: unit
- * 1: vehicle
- * 2: weapon
- *
- * Return Values:
- * None
- *
- */
-#include "script_component.hpp"
-
-EXPLODE_3_PVT(_this,_unit,_vehicle,_weapon);
-
-addCamShake CAMSHAKE;
-
-private "_animation";
-_animation = animationState _unit;
-
-if (_unit getVariable ["ACE_bipodDeployed", false]) then {
- _unit setUnitRecoilCoefficient (unitRecoilCoefficient _unit / BIPODRECOIL);
- if (_animation find "_ace_deploy" != -1) then {
- //[_unit, [_animation, "_ace_deploy", ""] call CBA_fnc_replace, 2] call EFUNC(common,doAnimation);
- _unit switchMove ([_animation, "_ace_deploy", ""] call CBA_fnc_replace);
- };
-
- private "_picture";
- _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
- [localize "STR_ACE_Resting_BipodUndeployed", _picture] call EFUNC(common,displayTextPicture);
-
-} else {
- _unit setUnitRecoilCoefficient (unitRecoilCoefficient _unit / RESTEDRECOIL);
- if (_animation find "_ace_rested" != -1) then {
- //[_unit, [_animation, "_ace_rested", ""] call CBA_fnc_replace, 2] call EFUNC(common,doAnimation);
- _unit switchMove ([_animation, "_ace_rested", ""] call CBA_fnc_replace);
- };
-
- private "_picture";
- _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
- [localize "STR_ACE_Resting_WeaponLifted", _picture] call EFUNC(common,displayTextPicture);
-};
-playSound QGVAR(unrest);
-
-_unit setVariable ["ACE_weaponRested", false];
-_unit setVariable ["ACE_bipodDeployed", false];
-
-if (_unit == ACE_PLAYER) then {
- [QGVAR(bipodDeployed), false, "", [1,1,1,1], -1] call EFUNC(common,displayIcon);
-};
\ No newline at end of file
diff --git a/addons/resting/functions/script_component.hpp b/addons/resting/functions/script_component.hpp
deleted file mode 100644
index 9a1f2912f9..0000000000
--- a/addons/resting/functions/script_component.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "\z\ace\addons\resting\script_component.hpp"
\ No newline at end of file
diff --git a/addons/resting/script_component.hpp b/addons/resting/script_component.hpp
deleted file mode 100644
index f6d28bc482..0000000000
--- a/addons/resting/script_component.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#define COMPONENT resting
-#include "\z\ace\Addons\main\script_mod.hpp"
-
-#ifdef DEBUG_ENABLED_RESTING
- #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_RESTING
- #define DEBUG_SETTINGS DEBUG_SETTINGS_RESTING
-#endif
-
-#include "\z\ace\Addons\main\script_macros.hpp"
-
-#define RESTEDRECOIL 0.6
-#define BIPODRECOIL 0.3
-#define MAXDISTANCE 1
-#define MAXANGLE 15
-#define MAXHEIGHT 0.45
-#define CAMSHAKE [1,0.5,5]
diff --git a/addons/resting/sounds/weaponrest_rest.wav b/addons/resting/sounds/weaponrest_rest.wav
deleted file mode 100644
index fce6386425..0000000000
Binary files a/addons/resting/sounds/weaponrest_rest.wav and /dev/null differ
diff --git a/addons/resting/sounds/weaponrest_unrest.wav b/addons/resting/sounds/weaponrest_unrest.wav
deleted file mode 100644
index 72518ddbbf..0000000000
Binary files a/addons/resting/sounds/weaponrest_unrest.wav and /dev/null differ
diff --git a/addons/resting/stringtable.xml b/addons/resting/stringtable.xml
deleted file mode 100644
index e74892f6eb..0000000000
--- a/addons/resting/stringtable.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
- Rest Weapon
- Waffe auflegen
- Apoyar el arma
- Oprzyj broń
- Zapřít zbraň
- Appuyer l'arme
- Зафиксировать оружие
- Fegyver kitámasztása
- Apoiar Arma
- Appoggia l'arma
-
-
-
- Bipod deployed
- Zweibein ausgeklappt
- Bípode desplegado
- Dwójnóg rozstawiony
- Dvojnožka rozložena
- Bipied déployé
- Сошки установлены
- Állványon
- Bipé apoiado
- Bipiede appoggiato
-
-
- Weapon rested
- Waffe aufgelegt
- Arma apoyada
- Broń oparta
- Zbraň zapřena
- Arme appuyée
- Оружие зафиксировано
- Fegyver kitámasztva
- Arma apoiada
- Arma appoggiata
-
-
-
- Bipod undeployed
- Zweibein eingeklappt
- Bípode plegado
- Dwójnóg złożony
- Dvojnožka rozložena
- Bipied replié
- Сошки убраны
- Állvány csukva
- Bipé recolhido
- Bipiede richiuso
-
-
- Weapon lifted
- Waffe gehoben
- Arma levantada
- Broń podniesiona
- Zbraň zdvihnuta
- Arme relevée
- Оружие не зафиксировано
- Fegyver nincs támasztva
- Arma levantada
- Arma sollevata
-
-
-
-
diff --git a/addons/safemode/script_component.hpp b/addons/safemode/script_component.hpp
index f76396afdf..c68b265489 100644
--- a/addons/safemode/script_component.hpp
+++ b/addons/safemode/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\Addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_SAFEMODE
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_SAFEMODE
- #define DEBUG_SETTINGS DEBUG_SETTINGS_SAFEMODE
+ #define DEBUG_SETTINGS DEBUG_SETTINGS_SAFEMODE
#endif
#include "\z\ace\Addons\main\script_macros.hpp"
diff --git a/addons/scopes/CfgWeapons.hpp b/addons/scopes/CfgWeapons.hpp
index 87b5a4073f..67898fb449 100644
--- a/addons/scopes/CfgWeapons.hpp
+++ b/addons/scopes/CfgWeapons.hpp
@@ -40,29 +40,4 @@ class CfgWeapons {
};
};
};
-
- class ACE_optic_DMS: optic_DMS {
- author = "$STR_ACE_Common_ACETeam";
- _generalMacro = "ACE_optic_DMS";
- displayName = "LOCALIZE ACE DMR";
- //descriptionShort = "$STR_A3_CFGWEAPONS_ACC_DMS1";
- class ItemInfo: ItemInfo {
- modelOptics = QUOTE(PATHTOF(ace_shortdot_optics.p3d));
-
- class OpticsModes: OpticsModes {
- class Snip: Snip {
- opticsZoomMin = 0.05;
- opticsZoomMax = 0.3;
- opticsZoomInit = 0.3;
- discretefov[] = {};
- modelOptics[] = {};
- };
- };
- };
- };
-};
-
-class SlotInfo;
-class CowsSlot: SlotInfo {
- compatibleItems[] += {"ACE_optic_DMS"};
};
diff --git a/addons/scopes/RscTitles.hpp b/addons/scopes/RscTitles.hpp
index 189ff3613f..3b83022dcb 100644
--- a/addons/scopes/RscTitles.hpp
+++ b/addons/scopes/RscTitles.hpp
@@ -68,32 +68,9 @@ class RscTitles {
};
};
};
-
- class ACE_Shortdot_Reticle {
- idd = -1;
- onLoad = "uiNamespace setVariable ['ACE_ctrlShortdotReticle', (_this select 0) displayCtrl 1];";
- duration = 999999;
- fadeIn = 0;
- fadeOut = 0;
- name = "ACE_Shortdot_Reticle";
-
- class controlsBackground {
- class Debug_RscElement: RscText {
- idc = 1;
- style = 48;
- size = 1;
- sizeEx = 0;
- font = "TahomaB";
- text = "";
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- };
- };
- };
};
+/*
class RscInGameUI {
class RscUnitInfo;
class RscWeaponZeroing : RscUnitInfo {
@@ -101,3 +78,4 @@ class RscInGameUI {
//onLoad = "[""onLoad"",_this,""RscUnitInfo"",'IGUI'] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable ['ACE_dlgWeaponZeroing', _this select 0];";
};
};
+*/
diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf
index 559a21a772..1084a41181 100644
--- a/addons/scopes/XEH_postInit.sqf
+++ b/addons/scopes/XEH_postInit.sqf
@@ -46,7 +46,7 @@ if !(hasInterface) exitWith {};
true
},
{false},
-[201, [false, false, false]], false] call cba_fnc_addKeybind;
+[201, [false, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustDown), localize "STR_ACE_Scopes_AdjustDown",
{
@@ -61,7 +61,7 @@ if !(hasInterface) exitWith {};
true
},
{false},
-[209, [false, false, false]], false] call cba_fnc_addKeybind;
+[209, [false, false, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustLeft), localize "STR_ACE_Scopes_AdjustLeft",
{
@@ -76,7 +76,7 @@ if !(hasInterface) exitWith {};
true
},
{false},
-[209, [false, true, false]], false] call cba_fnc_addKeybind;
+[209, [false, true, false]], true] call cba_fnc_addKeybind;
["ACE3", QGVAR(AdjustRight), localize "STR_ACE_Scopes_AdjustRight",
{
@@ -91,7 +91,7 @@ if !(hasInterface) exitWith {};
true
},
{false},
-[201, [false, true, false]], false] call cba_fnc_addKeybind;
+[201, [false, true, false]], true] call cba_fnc_addKeybind;
// init shortdot
GVAR(showShortdot) = false;
diff --git a/addons/scopes/XEH_preInit.sqf b/addons/scopes/XEH_preInit.sqf
index d33801a510..e574cc72d4 100644
--- a/addons/scopes/XEH_preInit.sqf
+++ b/addons/scopes/XEH_preInit.sqf
@@ -7,7 +7,6 @@ PREP(canAdjustScope);
PREP(firedEH);
PREP(getOptics);
PREP(inventoryCheck);
-PREP(onDrawShortdot);
PREP(showZeroing);
GVAR(fadeScript) = scriptNull;
diff --git a/addons/scopes/functions/fnc_onDrawShortdot.sqf b/addons/scopes/functions/fnc_onDrawShortdot.sqf
deleted file mode 100644
index 78ff0b0f50..0000000000
--- a/addons/scopes/functions/fnc_onDrawShortdot.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-// by commy2
-#include "script_component.hpp"
-
-private "_control";
-_control = uiNamespace getVariable ["ACE_ctrlShortdotReticle", controlNull];
-
-if (cameraView != "GUNNER" || {currentWeapon ACE_player != primaryWeapon ACE_player}) exitWith {
- _control ctrlShow false;
-};
-
-private ["_size", "_sizeX", "_sizeY"];
-
-_size = call EFUNC(common,getZoom);
-
-_sizeX = _size/4;
-_sizeY = _sizeX*safezoneW/safezoneH;
-
-_control ctrlSetPosition [
- safezoneX+0.5*safezoneW-0.5*_sizeX,
- safezoneY+0.5*safezoneH-0.5*_sizeY,
- _sizeX,
- _sizeY
-];
-_control ctrlCommit 0;
-_control ctrlShow true;
diff --git a/addons/smallarms/script_component.hpp b/addons/smallarms/script_component.hpp
index d9c70ca5e6..589e59433f 100644
--- a/addons/smallarms/script_component.hpp
+++ b/addons/smallarms/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_SMALLARMS
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_SMALLARMS
- #define DEBUG_SETTINGS DEBUG_SETTINGS_SMALLARMS
+ #define DEBUG_SETTINGS DEBUG_SETTINGS_SMALLARMS
#endif
#include "\z\ace\addons\main\script_macros.hpp"
diff --git a/addons/switchunits/config.cpp b/addons/switchunits/config.cpp
index c400be855c..cda974d17e 100644
--- a/addons/switchunits/config.cpp
+++ b/addons/switchunits/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ace_main", "ace_common"};
+ requiredAddons[] = {"ace_common"};
author[] = {"bux578"};
authorUrl = "https://github.com/bux578/";
VERSION_CONFIG;
diff --git a/addons/switchunits/script_component.hpp b/addons/switchunits/script_component.hpp
index 4e76fb1495..5955e1220f 100644
--- a/addons/switchunits/script_component.hpp
+++ b/addons/switchunits/script_component.hpp
@@ -1,4 +1,4 @@
-#define COMPONENT SwitchUnits
+#define COMPONENT switchunits
#include "\z\ace\addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_SWITCHUNITS
diff --git a/addons/testmissions/script_component.hpp b/addons/testmissions/script_component.hpp
index c6c629ff91..da17bfb7e2 100644
--- a/addons/testmissions/script_component.hpp
+++ b/addons/testmissions/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\Addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_TESTMISSIONS
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_ENABLED_TESTMISSIONS
- #define DEBUG_SETTINGS DEBUG_ENABLED_TESTMISSIONS
+ #define DEBUG_SETTINGS DEBUG_ENABLED_TESTMISSIONS
#endif
#include "\z\ace\Addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/addons/vector/config.cpp b/addons/vector/config.cpp
index 926bfda58d..e2a52b47ef 100644
--- a/addons/vector/config.cpp
+++ b/addons/vector/config.cpp
@@ -13,6 +13,8 @@ class CfgPatches {
};
#include "CfgEventHandlers.hpp"
+
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
+
#include "RscInGameUI.hpp"
diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp
index 700e27b3cb..248a1e7ca0 100644
--- a/addons/vehiclelock/config.cpp
+++ b/addons/vehiclelock/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ace_common", "ace_interaction"};
+ requiredAddons[] = {"ace_interaction"};
author[] = {"PabstMirror"};
authorUrl = "https://github.com/PabstMirror/";
VERSION_CONFIG;
diff --git a/addons/weather/XEH_preClientInit.sqf b/addons/weather/XEH_preClientInit.sqf
index 81b6f09fe6..b979521cdd 100644
--- a/addons/weather/XEH_preClientInit.sqf
+++ b/addons/weather/XEH_preClientInit.sqf
@@ -2,16 +2,16 @@
FUNC(KEEPTIME) = {
- if((count GVAR(WINDSPEED)) > 0) then {
- private ["_wind", "_p", "_str"];
- _wind = ACE_wind;
+ if((count GVAR(WINDSPEED)) > 0) then {
+ private ["_wind", "_p", "_str"];
+ _wind = ACE_wind;
- _p = _wind call CBA_fnc_vect2polar;
- _str = format["Wind: %1 at %2m/s (%3MPH)\n%4", floor(_p select 1), floor(_p select 0), floor((_p select 0)*2.23693629), GVAR(WINDSPEED)];
- TRACE_2("Wind",_wind,_str);
- };
+ _p = _wind call CBA_fnc_vect2polar;
+ _str = format["Wind: %1 at %2m/s (%3MPH)\n%4", floor(_p select 1), floor(_p select 0), floor((_p select 0)*2.23693629), GVAR(WINDSPEED)];
+ TRACE_2("Wind",_wind,_str);
+ };
};
#ifdef DEBUG_MODE_FULL
- [FUNC(KEEPTIME), 0.0, []] call CBA_fnc_addPerFrameHandler;
+ [FUNC(KEEPTIME), 0.0, []] call CBA_fnc_addPerFrameHandler;
#endif
diff --git a/addons/weather/script_component.hpp b/addons/weather/script_component.hpp
index abfe607257..a21d8245fd 100644
--- a/addons/weather/script_component.hpp
+++ b/addons/weather/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\addons\main\script_mod.hpp"
//#define DEBUG_ENABLED_WEATHER
#ifdef DEBUG_ENABLED_WEATHER
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_WEATHER
- #define DEBUG_SETTINGS DEBUG_SETTINGS_WEATHER
+ #define DEBUG_SETTINGS DEBUG_SETTINGS_WEATHER
#endif
#include "\z\ace\addons\main\script_macros.hpp"
diff --git a/addons/wep_javelin/CfgSounds.hpp b/addons/wep_javelin/CfgSounds.hpp
index 0af40b9485..a5002409ff 100644
--- a/addons/wep_javelin/CfgSounds.hpp
+++ b/addons/wep_javelin/CfgSounds.hpp
@@ -1,13 +1,13 @@
class CfgSounds {
class ACE_Javelin_Locking {
- name = "ACE_Javelin_Locking";
- sound[] = {PATHTOF(data\sounds\javelin_locking.ogg), db+0, 1.0};
- titles[] = {};
+ name = "ACE_Javelin_Locking";
+ sound[] = {PATHTOF(data\sounds\javelin_locking.ogg), db+0, 1.0};
+ titles[] = {};
};
class ACE_Javelin_Locked {
- name = "ACE_Javelin_Locked";
- sound[] = {PATHTOF(data\sounds\javelin_locked.ogg), db+0, 1.0};
- titles[] = {};
+ name = "ACE_Javelin_Locked";
+ sound[] = {PATHTOF(data\sounds\javelin_locked.ogg), db+0, 1.0};
+ titles[] = {};
};
};
diff --git a/addons/wep_javelin/RscInGameUI.hpp b/addons/wep_javelin/RscInGameUI.hpp
index e94e4c58fd..811548a9d2 100644
--- a/addons/wep_javelin/RscInGameUI.hpp
+++ b/addons/wep_javelin/RscInGameUI.hpp
@@ -17,34 +17,34 @@ class RscInGameUI {
onUnload = "uiNameSpace setVariable ['ACE_RscOptics_javelin',nil];";
class CA_Distance: RscOpticsValue {
- idc = 151;
- sizeEx = "0";
- colorText[] = {0,0,0,0};
- x = 0;
- y = 0;
- w = 0;
- h = 0;
- };
+ idc = 151;
+ sizeEx = "0";
+ colorText[] = {0,0,0,0};
+ x = 0;
+ y = 0;
+ w = 0;
+ h = 0;
+ };
class ACE_javelin_elements_group: RscControlsGroup
- {
- x = "SafezoneX";
- y = "SafezoneY";
- w = "SafezoneW";
- h = "SafezoneH";
- idc = 170;
- class VScrollbar {
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- color[] = {1,1,1,0};
- width = 0.001;
- };
- class HScrollbar {
- color[] = {1,1,1,0};
- height = 0.001;
- };
- class Controls {
+ {
+ x = "SafezoneX";
+ y = "SafezoneY";
+ w = "SafezoneW";
+ h = "SafezoneH";
+ idc = 170;
+ class VScrollbar {
+ autoScrollSpeed = -1;
+ autoScrollDelay = 5;
+ autoScrollRewind = 0;
+ color[] = {1,1,1,0};
+ width = 0.001;
+ };
+ class HScrollbar {
+ color[] = {1,1,1,0};
+ height = 0.001;
+ };
+ class Controls {
class JavelinLocking : RscMapControl {
onDraw = QUOTE(_this call FUNC(onOpticDraw));
idc = -1;
@@ -52,385 +52,385 @@ class RscInGameUI {
h = 0;
};
- class ACE_javelin_Day_mode_off: RscPicture {
- idc = 1001;
- x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.03/4)*3*SafezoneH - SafezoneX";
- y = "SafezoneY+SafezoneH*0.031 - SafezoneY";
- w = "0.1045752* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
- h = "SafezoneH*0.1045752";
- colorText[] = {0.2941,0.2941,0.2941,1};
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\day_co.paa";
- };
- class ACE_javelin_Day_mode: ACE_javelin_Day_mode_off {
- idc = 160;
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class ACE_javelin_WFOV_mode_off: ACE_javelin_Day_mode_off {
- idc = 1004;
- x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.307/4)*3*SafezoneH - SafezoneX";
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\wfov_co.paa";
- };
- class ACE_javelin_WFOV_mode_group: RscControlsGroup {
- x = "SafezoneX";
- y = "SafezoneY";
- w = "SafezoneW";
- h = "SafezoneH";
- idc = 163;
- class VScrollbar {
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- color[] = {1,1,1,0};
- width = 0.001;
- };
- class HScrollbar {
- color[] = {1,1,1,0};
- height = 0.001;
- };
- class Controls {
- class ACE_javelin_WFOV_mode: ACE_javelin_WFOV_mode_off {
- idc = -1;
- y = "0.031*SafezoneH - SafezoneY";
- x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.307/4)*3*SafezoneH - SafezoneX";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class StadiaL: RscLine {
- x = "0.4899*SafezoneW - SafezoneX";
- y = "0.171*SafezoneH - SafezoneY";
- w = 0;
- h = "0.049*SafezoneH";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class StadiaR: RscLine {
- x = "0.5109*SafezoneW- SafezoneX";
- y = "0.171*SafezoneH - SafezoneY";
- w = 0;
- h = "0.049*SafezoneH";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class BracketL: RscLine {
- x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.293/4)*3*SafezoneH - SafezoneX";
- y = "0.4677*SafezoneH - SafezoneY";
- w = 0;
- h = "0.0646*SafezoneH";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class BracketR: RscLine {
- x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.70/4)*3*SafezoneH - SafezoneX";
- y = "0.4677*SafezoneH - SafezoneY";
- w = 0;
- h = "0.0646*SafezoneH";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class BracketT: RscLine {
- x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.467/4)*3*SafezoneH - SafezoneX";
- y = "0.3535*SafezoneH - SafezoneY";
- w = "0.065* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
- h = 0;
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class BracketB: RscLine {
- x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.467/4)*3*SafezoneH - SafezoneX";
- y = "0.6465*SafezoneH - SafezoneY";
- w = "0.065* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
- h = 0;
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- };
- };
- class ACE_javelin_NFOV_mode_off: ACE_javelin_Day_mode_off {
- idc = 1003;
- x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.586/4)*3*SafezoneH - SafezoneX";
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\nfov_co.paa";
- };
- class ACE_javelin_NFOV_mode_group: RscControlsGroup {
- x = "SafezoneX";
- y = "SafezoneY";
- w = "SafezoneW-SafezoneX";
- h = "SafezoneH-SafezoneY";
- idc = 162;
- class VScrollbar {
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- color[] = {1,1,1,0};
- width = 0.001;
- };
- class HScrollbar {
- color[] = {1,1,1,0};
- height = 0.001;
- };
- class Controls {
- class ACE_javelin_NFOV_mode: ACE_javelin_NFOV_mode_off {
- idc = 699003;
- x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.586/4)*3*SafezoneH - SafezoneX";
- y = "0.031*SafezoneH - SafezoneY";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class StadiaL: RscLine {
- x = "0.4788*SafezoneW - SafezoneX";
- y = "0.171*SafezoneH - SafezoneY";
- w = 0;
- h = "0.049*SafezoneH";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class StadiaR: RscLine {
- x = "0.5212*SafezoneW - SafezoneX";
- y = "0.171*SafezoneH - SafezoneY";
- w = 0;
- h = "0.049*SafezoneH";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class LineHL: RscLine {
- x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.01/4)*3*SafezoneH - SafezoneX";
- y = "SafezoneH*0.5 - SafezoneY";
- w = "0.29* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
- h = "SafezoneH*0.0";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class LineHR: RscLine {
- x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.695/4)*3*SafezoneH - SafezoneX";
- y = "SafezoneH*0.5 - SafezoneY";
- w = "0.29* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
- h = "SafezoneH*0.0";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class LineVT: RscLine {
- x = "0.5*SafezoneW - SafezoneX";
- y = "0.171*SafezoneH - SafezoneY";
- w = 0;
- h = "0.1825*SafezoneH";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class LineVB: RscLine {
- x = "0.5*SafezoneW - SafezoneX";
- y = "0.6465*SafezoneH - SafezoneY";
- w = 0;
- h = "0.1895*SafezoneH";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- };
- };
+ class ACE_javelin_Day_mode_off: RscPicture {
+ idc = 1001;
+ x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.03/4)*3*SafezoneH - SafezoneX";
+ y = "SafezoneY+SafezoneH*0.031 - SafezoneY";
+ w = "0.1045752* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
+ h = "SafezoneH*0.1045752";
+ colorText[] = {0.2941,0.2941,0.2941,1};
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\day_co.paa";
+ };
+ class ACE_javelin_Day_mode: ACE_javelin_Day_mode_off {
+ idc = 160;
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class ACE_javelin_WFOV_mode_off: ACE_javelin_Day_mode_off {
+ idc = 1004;
+ x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.307/4)*3*SafezoneH - SafezoneX";
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\wfov_co.paa";
+ };
+ class ACE_javelin_WFOV_mode_group: RscControlsGroup {
+ x = "SafezoneX";
+ y = "SafezoneY";
+ w = "SafezoneW";
+ h = "SafezoneH";
+ idc = 163;
+ class VScrollbar {
+ autoScrollSpeed = -1;
+ autoScrollDelay = 5;
+ autoScrollRewind = 0;
+ color[] = {1,1,1,0};
+ width = 0.001;
+ };
+ class HScrollbar {
+ color[] = {1,1,1,0};
+ height = 0.001;
+ };
+ class Controls {
+ class ACE_javelin_WFOV_mode: ACE_javelin_WFOV_mode_off {
+ idc = -1;
+ y = "0.031*SafezoneH - SafezoneY";
+ x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.307/4)*3*SafezoneH - SafezoneX";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class StadiaL: RscLine {
+ x = "0.4899*SafezoneW - SafezoneX";
+ y = "0.171*SafezoneH - SafezoneY";
+ w = 0;
+ h = "0.049*SafezoneH";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class StadiaR: RscLine {
+ x = "0.5109*SafezoneW- SafezoneX";
+ y = "0.171*SafezoneH - SafezoneY";
+ w = 0;
+ h = "0.049*SafezoneH";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class BracketL: RscLine {
+ x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.293/4)*3*SafezoneH - SafezoneX";
+ y = "0.4677*SafezoneH - SafezoneY";
+ w = 0;
+ h = "0.0646*SafezoneH";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class BracketR: RscLine {
+ x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.70/4)*3*SafezoneH - SafezoneX";
+ y = "0.4677*SafezoneH - SafezoneY";
+ w = 0;
+ h = "0.0646*SafezoneH";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class BracketT: RscLine {
+ x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.467/4)*3*SafezoneH - SafezoneX";
+ y = "0.3535*SafezoneH - SafezoneY";
+ w = "0.065* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
+ h = 0;
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class BracketB: RscLine {
+ x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.467/4)*3*SafezoneH - SafezoneX";
+ y = "0.6465*SafezoneH - SafezoneY";
+ w = "0.065* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
+ h = 0;
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ };
+ };
+ class ACE_javelin_NFOV_mode_off: ACE_javelin_Day_mode_off {
+ idc = 1003;
+ x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.586/4)*3*SafezoneH - SafezoneX";
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\nfov_co.paa";
+ };
+ class ACE_javelin_NFOV_mode_group: RscControlsGroup {
+ x = "SafezoneX";
+ y = "SafezoneY";
+ w = "SafezoneW-SafezoneX";
+ h = "SafezoneH-SafezoneY";
+ idc = 162;
+ class VScrollbar {
+ autoScrollSpeed = -1;
+ autoScrollDelay = 5;
+ autoScrollRewind = 0;
+ color[] = {1,1,1,0};
+ width = 0.001;
+ };
+ class HScrollbar {
+ color[] = {1,1,1,0};
+ height = 0.001;
+ };
+ class Controls {
+ class ACE_javelin_NFOV_mode: ACE_javelin_NFOV_mode_off {
+ idc = 699003;
+ x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.586/4)*3*SafezoneH - SafezoneX";
+ y = "0.031*SafezoneH - SafezoneY";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class StadiaL: RscLine {
+ x = "0.4788*SafezoneW - SafezoneX";
+ y = "0.171*SafezoneH - SafezoneY";
+ w = 0;
+ h = "0.049*SafezoneH";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class StadiaR: RscLine {
+ x = "0.5212*SafezoneW - SafezoneX";
+ y = "0.171*SafezoneH - SafezoneY";
+ w = 0;
+ h = "0.049*SafezoneH";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class LineHL: RscLine {
+ x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.01/4)*3*SafezoneH - SafezoneX";
+ y = "SafezoneH*0.5 - SafezoneY";
+ w = "0.29* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
+ h = "SafezoneH*0.0";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class LineHR: RscLine {
+ x = "((SafezoneW -SafezoneH*3/4)/2)+ (0.695/4)*3*SafezoneH - SafezoneX";
+ y = "SafezoneH*0.5 - SafezoneY";
+ w = "0.29* (((SafezoneW*3)/4)/SafezoneW)/(1/SafezoneH)";
+ h = "SafezoneH*0.0";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class LineVT: RscLine {
+ x = "0.5*SafezoneW - SafezoneX";
+ y = "0.171*SafezoneH - SafezoneY";
+ w = 0;
+ h = "0.1825*SafezoneH";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class LineVB: RscLine {
+ x = "0.5*SafezoneW - SafezoneX";
+ y = "0.6465*SafezoneH - SafezoneY";
+ w = 0;
+ h = "0.1895*SafezoneH";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ };
+ };
/*
- class TargetingConstrains: RscControlsGroup {
- idc = 699100;
- x = "SafezoneX";
- y = "SafezoneY";
- w = "SafezoneW-SafezoneX";
- h = "SafezoneH-SafezoneY";
- class VScrollbar {
- autoScrollSpeed = -1;
- autoScrollDelay = 5;
- autoScrollRewind = 0;
- color[] = {1,1,1,0};
- width = 0.001;
- };
- class HScrollbar {
- color[] = {1,1,1,0};
- height = 0.001;
- };
- class Controls {
- class Top: RscPicture {
- idc = 699101;
- text = "#(argb,8,8,3)color(1,1,1,1)";
- colorText[] = {0.2941,0.2941,0.2941,1};
- x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
- y = "0.15*SafezoneH-SafezoneY";
- w = "(3/4)*SafezoneH";
- h = "0.21*SafezoneH";
- };
- class Bottom: Top {
- idc = 699102;
- y = "0.64*SafezoneH-SafezoneY";
- };
- class Left: Top {
- idc = 699103;
- x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
- y = "0.36*SafezoneH-SafezoneY";
- w = "0.31*(3/4)*SafezoneH";
- h = "0.28*SafezoneH";
- };
- class Right: Left {
- idc = 699104;
- x = "((SafezoneW -(3/4)*SafezoneH)/2)+ 0.69*(3/4)*SafezoneH - SafezoneX";
- };
- class OpticsBorders: RscPicture {
- idc = 699105;
- text = PATHTOF(data\javelin_ui_border_ca.paa);
- colorText[] = {0,0,0,1};
- x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
- y = "0.15*SafezoneH-SafezoneY";
- w = "(3/4)*SafezoneH";
- h = "0.7*SafezoneH";
- };
- };
- };
+ class TargetingConstrains: RscControlsGroup {
+ idc = 699100;
+ x = "SafezoneX";
+ y = "SafezoneY";
+ w = "SafezoneW-SafezoneX";
+ h = "SafezoneH-SafezoneY";
+ class VScrollbar {
+ autoScrollSpeed = -1;
+ autoScrollDelay = 5;
+ autoScrollRewind = 0;
+ color[] = {1,1,1,0};
+ width = 0.001;
+ };
+ class HScrollbar {
+ color[] = {1,1,1,0};
+ height = 0.001;
+ };
+ class Controls {
+ class Top: RscPicture {
+ idc = 699101;
+ text = "#(argb,8,8,3)color(1,1,1,1)";
+ colorText[] = {0.2941,0.2941,0.2941,1};
+ x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
+ y = "0.15*SafezoneH-SafezoneY";
+ w = "(3/4)*SafezoneH";
+ h = "0.21*SafezoneH";
+ };
+ class Bottom: Top {
+ idc = 699102;
+ y = "0.64*SafezoneH-SafezoneY";
+ };
+ class Left: Top {
+ idc = 699103;
+ x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
+ y = "0.36*SafezoneH-SafezoneY";
+ w = "0.31*(3/4)*SafezoneH";
+ h = "0.28*SafezoneH";
+ };
+ class Right: Left {
+ idc = 699104;
+ x = "((SafezoneW -(3/4)*SafezoneH)/2)+ 0.69*(3/4)*SafezoneH - SafezoneX";
+ };
+ class OpticsBorders: RscPicture {
+ idc = 699105;
+ text = PATHTOF(data\javelin_ui_border_ca.paa);
+ colorText[] = {0,0,0,1};
+ x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
+ y = "0.15*SafezoneH-SafezoneY";
+ w = "(3/4)*SafezoneH";
+ h = "0.7*SafezoneH";
+ };
+ };
+ };
- class TargetingGate: TargetingConstrains {
- idc = 699200;
- class Controls {
- class TargetingGateTL: TargetingConstrains {
- x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
- y = "0.15*SafezoneH - SafezoneY";
- idc = 699201;
- class Controls {
- class LineH: RscLine {
- idc = 699210;
- x = "0";
- y = "0";
- w = "0.025*(3/4)*SafezoneH";
- h = "0";
- colorText[] = {0.8745,0.8745,0.8745,1};
- };
- class LineV: LineH {
- idc = 699211;
- w = "0";
- h = "0.025*SafezoneH";
- };
- };
- };
- class TargetingGateTR: TargetingGateTL {
- x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX + 0.975*(3/4)*SafezoneH";
- y = "0.15*SafezoneH - SafezoneY";
- idc = 699202;
- class Controls {
- class LineH: RscLine {
- idc = 699220;
- x = "0";
- y = "0";
- w = "0.025*(3/4)*SafezoneH";
- h = "0";
- colorText[] = {0.8745,0.8745,0.8745,1};
- };
- class LineV: LineH {
- idc = 699221;
- x = "0.025*(3/4)*SafezoneH";
- w = "0";
- h = "0.025*SafezoneH";
- };
- };
- };
- class TargetingGateBL: TargetingGateTL {
- x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
- y = "0.825*SafezoneH - SafezoneY";
- idc = 699203;
- class Controls {
- class LineH: RscLine {
- x = "0";
- y = "0.025*SafezoneH";
- w = "0.025*(3/4)*SafezoneH";
- h = "0";
- colorText[] = {0.8745,0.8745,0.8745,1};
- };
- class LineV: LineH {
- y = "0";
- w = "0";
- h = "0.025*SafezoneH";
- };
- };
- };
- class TargetingGateBR: TargetingGateBL {
- x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX + 0.975*(3/4)*SafezoneH";
- y = "0.825*SafezoneH - SafezoneY";
- idc = 699204;
- class Controls {
- class LineH: RscLine {
- x = "0";
- y = "0.025*SafezoneH";
- w = "0.025*(3/4)*SafezoneH";
- h = "0";
- colorText[] = {0.8745,0.8745,0.8745,1};
- };
- class LineV: LineH {
- x = "0.025*(3/4)*SafezoneH";
- y = "0";
- w = "0";
- h = "0.025*SafezoneH";
- };
- };
- };
- };
- };
+ class TargetingGate: TargetingConstrains {
+ idc = 699200;
+ class Controls {
+ class TargetingGateTL: TargetingConstrains {
+ x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
+ y = "0.15*SafezoneH - SafezoneY";
+ idc = 699201;
+ class Controls {
+ class LineH: RscLine {
+ idc = 699210;
+ x = "0";
+ y = "0";
+ w = "0.025*(3/4)*SafezoneH";
+ h = "0";
+ colorText[] = {0.8745,0.8745,0.8745,1};
+ };
+ class LineV: LineH {
+ idc = 699211;
+ w = "0";
+ h = "0.025*SafezoneH";
+ };
+ };
+ };
+ class TargetingGateTR: TargetingGateTL {
+ x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX + 0.975*(3/4)*SafezoneH";
+ y = "0.15*SafezoneH - SafezoneY";
+ idc = 699202;
+ class Controls {
+ class LineH: RscLine {
+ idc = 699220;
+ x = "0";
+ y = "0";
+ w = "0.025*(3/4)*SafezoneH";
+ h = "0";
+ colorText[] = {0.8745,0.8745,0.8745,1};
+ };
+ class LineV: LineH {
+ idc = 699221;
+ x = "0.025*(3/4)*SafezoneH";
+ w = "0";
+ h = "0.025*SafezoneH";
+ };
+ };
+ };
+ class TargetingGateBL: TargetingGateTL {
+ x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
+ y = "0.825*SafezoneH - SafezoneY";
+ idc = 699203;
+ class Controls {
+ class LineH: RscLine {
+ x = "0";
+ y = "0.025*SafezoneH";
+ w = "0.025*(3/4)*SafezoneH";
+ h = "0";
+ colorText[] = {0.8745,0.8745,0.8745,1};
+ };
+ class LineV: LineH {
+ y = "0";
+ w = "0";
+ h = "0.025*SafezoneH";
+ };
+ };
+ };
+ class TargetingGateBR: TargetingGateBL {
+ x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX + 0.975*(3/4)*SafezoneH";
+ y = "0.825*SafezoneH - SafezoneY";
+ idc = 699204;
+ class Controls {
+ class LineH: RscLine {
+ x = "0";
+ y = "0.025*SafezoneH";
+ w = "0.025*(3/4)*SafezoneH";
+ h = "0";
+ colorText[] = {0.8745,0.8745,0.8745,1};
+ };
+ class LineV: LineH {
+ x = "0.025*(3/4)*SafezoneH";
+ y = "0";
+ w = "0";
+ h = "0.025*SafezoneH";
+ };
+ };
+ };
+ };
+ };
- class TargetingLines: TargetingConstrains {
- idc = 699300;
- class Controls {
- class LineH: RscLine {
- idc = 699301;
- x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
- y = "0.5*SafezoneH - SafezoneY";
- w = "(3/4)*SafezoneH";
- h = "0";
- colorText[] = {0.8745,0.8745,0.8745,1};
- };
- class LineV: RscLine {
- idc = 699302;
- x = "0.5*SafezoneW - SafezoneX";
- y = "0.15*SafezoneH - SafezoneY";
- w = "0";
- h = "0.7*SafezoneH";
- colorText[] = {0.8745,0.8745,0.8745,1};
- };
- };
- };
+ class TargetingLines: TargetingConstrains {
+ idc = 699300;
+ class Controls {
+ class LineH: RscLine {
+ idc = 699301;
+ x = "((SafezoneW -(3/4)*SafezoneH)/2) - SafezoneX";
+ y = "0.5*SafezoneH - SafezoneY";
+ w = "(3/4)*SafezoneH";
+ h = "0";
+ colorText[] = {0.8745,0.8745,0.8745,1};
+ };
+ class LineV: RscLine {
+ idc = 699302;
+ x = "0.5*SafezoneW - SafezoneX";
+ y = "0.15*SafezoneH - SafezoneY";
+ w = "0";
+ h = "0.7*SafezoneH";
+ colorText[] = {0.8745,0.8745,0.8745,1};
+ };
+ };
+ };
*/
- class ACE_javelin_SEEK_off: ACE_javelin_Day_mode_off {
- idc = 699000;
- x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.863/4)*3*SafezoneH - SafezoneX";
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\seek_co.paa";
- };
- class ACE_javelin_SEEK: ACE_javelin_SEEK_off {
- idc = 166;
- colorText[] = {0.2941,0.8745,0.2157,0};
- };
- class ACE_javelin_Missle_off: ACE_javelin_Day_mode_off {
- idc = 1032;
- x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (-0.134/4)*3*SafezoneH - SafezoneX";
- y = "(SafezoneY + 0.208*SafezoneH) - SafezoneY";
- colorText[] = {0.2941,0.2941,0.2941,1};
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\missle_co.paa";
- };
- class ACE_javelin_Missle: ACE_javelin_Missle_off {
- idc = 167;
- colorText[] = {0.9255,0.5216,0.1216,0};
- };
- class ACE_javelin_CLU_off: ACE_javelin_Missle_off {
- idc = 1027;
- y = "(SafezoneY + 0.436*SafezoneH) - SafezoneY";
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\clu_co.paa";
- };
- class ACE_javelin_HangFire_off: ACE_javelin_Missle_off {
- idc = 1028;
- y = "(SafezoneY + 0.669*SafezoneH) - SafezoneY";
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\hangfire_co.paa";
- };
- class ACE_javelin_TOP_off: ACE_javelin_Day_mode_off {
- idc = 699001;
- x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
- y = "(SafezoneY + 0.208*SafezoneH) - SafezoneY";
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\top_co.paa";
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- class ACE_javelin_DIR: ACE_javelin_Day_mode {
- idc = 699002;
- x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
- y = "(SafezoneY + 0.436*SafezoneH) - SafezoneY";
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\dir_co.paa";
- colorText[] = {0.2941,0.2941,0.2941,1};
- };
- class ACE_javelin_FLTR_mode_off: ACE_javelin_Day_mode_off {
- idc = 1002;
- x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
- y = "(SafezoneY + 0.669*SafezoneH) - SafezoneY";
- text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\fltr_co.paa";
- };
- class ACE_javelin_FLTR_mode: ACE_javelin_FLTR_mode_off {
- idc = 161;
- colorText[] = {0.2941,0.8745,0.2157,1};
- };
- };
- };
+ class ACE_javelin_SEEK_off: ACE_javelin_Day_mode_off {
+ idc = 699000;
+ x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (0.863/4)*3*SafezoneH - SafezoneX";
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\seek_co.paa";
+ };
+ class ACE_javelin_SEEK: ACE_javelin_SEEK_off {
+ idc = 166;
+ colorText[] = {0.2941,0.8745,0.2157,0};
+ };
+ class ACE_javelin_Missle_off: ACE_javelin_Day_mode_off {
+ idc = 1032;
+ x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (-0.134/4)*3*SafezoneH - SafezoneX";
+ y = "(SafezoneY + 0.208*SafezoneH) - SafezoneY";
+ colorText[] = {0.2941,0.2941,0.2941,1};
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\missle_co.paa";
+ };
+ class ACE_javelin_Missle: ACE_javelin_Missle_off {
+ idc = 167;
+ colorText[] = {0.9255,0.5216,0.1216,0};
+ };
+ class ACE_javelin_CLU_off: ACE_javelin_Missle_off {
+ idc = 1027;
+ y = "(SafezoneY + 0.436*SafezoneH) - SafezoneY";
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\clu_co.paa";
+ };
+ class ACE_javelin_HangFire_off: ACE_javelin_Missle_off {
+ idc = 1028;
+ y = "(SafezoneY + 0.669*SafezoneH) - SafezoneY";
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\hangfire_co.paa";
+ };
+ class ACE_javelin_TOP_off: ACE_javelin_Day_mode_off {
+ idc = 699001;
+ x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
+ y = "(SafezoneY + 0.208*SafezoneH) - SafezoneY";
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\top_co.paa";
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ class ACE_javelin_DIR: ACE_javelin_Day_mode {
+ idc = 699002;
+ x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
+ y = "(SafezoneY + 0.436*SafezoneH) - SafezoneY";
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\dir_co.paa";
+ colorText[] = {0.2941,0.2941,0.2941,1};
+ };
+ class ACE_javelin_FLTR_mode_off: ACE_javelin_Day_mode_off {
+ idc = 1002;
+ x = "(SafezoneX+(SafezoneW -SafezoneH*3/4)/2)+ (1.023/4)*3*SafezoneH - SafezoneX";
+ y = "(SafezoneY + 0.669*SafezoneH) - SafezoneY";
+ text = "\A3\ui_f\data\igui\rscingameui\rscoptics_titan\fltr_co.paa";
+ };
+ class ACE_javelin_FLTR_mode: ACE_javelin_FLTR_mode_off {
+ idc = 161;
+ colorText[] = {0.2941,0.8745,0.2157,1};
+ };
+ };
+ };
};
};
diff --git a/addons/wep_javelin/config.cpp b/addons/wep_javelin/config.cpp
index fa062944fc..c7ea1c867a 100644
--- a/addons/wep_javelin/config.cpp
+++ b/addons/wep_javelin/config.cpp
@@ -1,13 +1,13 @@
#include "script_component.hpp"
class CfgPatches {
- class ADDON {
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = { "ace_main", "ace_common", "ace_laser" };
- VERSION_CONFIG;
- };
+ class ADDON {
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {"ace_laser"};
+ VERSION_CONFIG;
+ };
};
#include "CfgEventhandlers.hpp"
diff --git a/addons/wep_javelin/functions/fnc_fired.sqf b/addons/wep_javelin/functions/fnc_fired.sqf
index 4e94989677..139f8f4b7e 100644
--- a/addons/wep_javelin/functions/fnc_fired.sqf
+++ b/addons/wep_javelin/functions/fnc_fired.sqf
@@ -5,70 +5,70 @@ TRACE_1("Launch", _this);
PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
FUNC(guidance_Javelin_LOBL_DIR_PFH) = {
- TRACE_1("enter", _this);
- private["_pitch", "_yaw", "_wentTerminal", "_target", "_targetPos", "_curVelocity", "_missile",
+ TRACE_1("enter", _this);
+ private["_pitch", "_yaw", "_wentTerminal", "_target", "_targetPos", "_curVelocity", "_missile",
"_launchPos", "_targetStartPos", "_defPitch", "_defYaw"];
- _args = _this select 0;
- //PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
- _shooter = _args select 0;
- _missile = _args select 6;
-
- if((count _args) > 7) then {
- _saveArgs = _args select 7;
- _target = _saveArgs select 0;
- _targetStartPos = _saveArgs select 1;
+ _args = _this select 0;
+ //PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
+ _shooter = _args select 0;
+ _missile = _args select 6;
+
+ if((count _args) > 7) then {
+ _saveArgs = _args select 7;
+ _target = _saveArgs select 0;
+ _targetStartPos = _saveArgs select 1;
_launchPos = _saveArgs select 2;
_wentTerminal = _saveArgs select 3;
- } else {
+ } else {
_wentTerminal = false;
_launchPos = getPosASL _shooter;
_target = ACE_player getVariable[QGVAR(currentTarget), objNull];
_targetStartPos = ACE_player getVariable[QGVAR(currentTargetPos), [0,0,0]];
- };
-
+ };
+
if(!alive _missile || isNull _missile || isNull _target) exitWith {
- [(_this select 1)] call cba_fnc_removePerFrameHandler;
- };
+ [(_this select 1)] call cba_fnc_removePerFrameHandler;
+ };
_targetPos = getPosASL _target;
- _curVelocity = velocity _missile;
-
+ _curVelocity = velocity _missile;
+
TRACE_4("", _target, _targetPos, _launchPos, _targetStartPos);
- _addHeight = [0,0,0];
- if(!isNil "_target") then {
-
- _yVec = vectorDir _missile;
- _zVec = vectorUp _missile;
- _xVec = vectorNormalized (_yVec vectorCrossProduct _zVec);
-
- _missilePos = getPosASL _missile;
- // player sideChat "G!";
+ _addHeight = [0,0,0];
+ if(!isNil "_target") then {
+
+ _yVec = vectorDir _missile;
+ _zVec = vectorUp _missile;
+ _xVec = vectorNormalized (_yVec vectorCrossProduct _zVec);
+
+ _missilePos = getPosASL _missile;
+ // player sideChat "G!";
- TRACE_4("Phase Check", _launchPos, _missilePos, _targetPos, (_missilePos distance _targetPos));
- if((count _targetPos) > 0) then {
- _distanceToTarget = [(_missilePos select 0), (_missilePos select 1), (_targetPos select 2)] vectorDistance _targetPos;
+ TRACE_4("Phase Check", _launchPos, _missilePos, _targetPos, (_missilePos distance _targetPos));
+ if((count _targetPos) > 0) then {
+ _distanceToTarget = [(_missilePos select 0), (_missilePos select 1), (_targetPos select 2)] vectorDistance _targetPos;
- if( (_missilePos select 2) < (_targetPos select 2) + 60 && !_wentTerminal) then {
- _addHeight = [0,0,(_targetPos select 2) + 120];
-
+ if( (_missilePos select 2) < (_targetPos select 2) + 60 && !_wentTerminal) then {
+ _addHeight = [0,0,(_targetPos select 2) + 120];
+
_defPitch = 0.15;
_defYaw = 0.035;
TRACE_1("Climb phase", _addHeight);
- } else {
- _wentTerminal = true;
- _this set[2, _wentTerminal];
-
+ } else {
+ _wentTerminal = true;
+ _this set[2, _wentTerminal];
+
_defPitch = 0.15;
_defYaw = 0.035;
TRACE_1("TERMINAL", "");
- };
- _targetPos = _targetPos vectorAdd _addHeight;
+ };
+ _targetPos = _targetPos vectorAdd _addHeight;
- _targetVectorSeeker = [_missile, [_xVec, _yVec, _zVec], _targetPos] call FUNC(translateToWeaponSpace);
- TRACE_5("", _missile, _xVec, _yVec, _zVec, _targetPos);
+ _targetVectorSeeker = [_missile, [_xVec, _yVec, _zVec], _targetPos] call FUNC(translateToWeaponSpace);
+ TRACE_5("", _missile, _xVec, _yVec, _zVec, _targetPos);
_yaw = 0.0;
_pitch = 0.0;
@@ -88,37 +88,37 @@ FUNC(guidance_Javelin_LOBL_DIR_PFH) = {
_pitch = _defPitch;
};
};
-
- TRACE_3("", _targetVectorSeeker, _pitch, _yaw);
-
- #ifdef DEBUG_MODE_FULL
- drawLine3D [(ASLtoATL _targetPos) vectorAdd _addHeight, ASLtoATL _targetPos, [0,1,0,1]];
-
- _light = "#lightpoint" createVehicleLocal (getPos _missile);
- _light setLightBrightness 1.0;
- _light setLightAmbient [1.0, 0.0, 0.0];
- _light setLightColor [1.0, 0.0, 0.0];
-
- drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\selectover_ca.paa", [1,1,1,1], ASLtoATL _missilePos, 0.75, 0.75, 0, str _vectorTo, 1, 0.025, "TahomaB"];
- drawLine3D [ASLtoATL _missilePos, ASLtoATL _targetPos, [1,0,0,1]];
+
+ TRACE_3("", _targetVectorSeeker, _pitch, _yaw);
+
+ #ifdef DEBUG_MODE_FULL
+ drawLine3D [(ASLtoATL _targetPos) vectorAdd _addHeight, ASLtoATL _targetPos, [0,1,0,1]];
+
+ _light = "#lightpoint" createVehicleLocal (getPos _missile);
+ _light setLightBrightness 1.0;
+ _light setLightAmbient [1.0, 0.0, 0.0];
+ _light setLightColor [1.0, 0.0, 0.0];
+
+ drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\selectover_ca.paa", [1,1,1,1], ASLtoATL _missilePos, 0.75, 0.75, 0, str _vectorTo, 1, 0.025, "TahomaB"];
+ drawLine3D [ASLtoATL _missilePos, ASLtoATL _targetPos, [1,0,0,1]];
- MARKERCOUNT = MARKERCOUNT + 1;
- #endif
-
- if(accTime > 0) then {
- TRACE_5("", _xVec, _yVec, _zVec, _yaw, _pitch);
- _outVector = [_missile, [_xVec, _yVec, _zVec], [_yaw, 1/accTime, _pitch]] call FUNC(translateToModelSpace);
-
- _vectorTo = _missilePos vectorFromTo _outVector;
- TRACE_3("", _missile, _outVector, _vectorTo);
- _missile setVectorDirAndUp [_vectorTo, vectorUp _missile];
- };
-
- #ifdef DEBUG_MODE_FULL
- hintSilent format["d: %1", _distanceToTarget];
- #endif
- };
- };
+ MARKERCOUNT = MARKERCOUNT + 1;
+ #endif
+
+ if(accTime > 0) then {
+ TRACE_5("", _xVec, _yVec, _zVec, _yaw, _pitch);
+ _outVector = [_missile, [_xVec, _yVec, _zVec], [_yaw, 1/accTime, _pitch]] call FUNC(translateToModelSpace);
+
+ _vectorTo = _missilePos vectorFromTo _outVector;
+ TRACE_3("", _missile, _outVector, _vectorTo);
+ _missile setVectorDirAndUp [_vectorTo, vectorUp _missile];
+ };
+
+ #ifdef DEBUG_MODE_FULL
+ hintSilent format["d: %1", _distanceToTarget];
+ #endif
+ };
+ };
_saveArgs = [_target,_targetStartPos, _launchPos, _wentTerminal];
_args set[7, _saveArgs ];
@@ -126,70 +126,70 @@ FUNC(guidance_Javelin_LOBL_DIR_PFH) = {
};
FUNC(guidance_Javelin_LOBL_TOP_PFH) = {
- TRACE_1("enter", _this);
- private["_pitch", "_yaw", "_wentTerminal", "_target", "_targetPos", "_curVelocity", "_missile",
+ TRACE_1("enter", _this);
+ private["_pitch", "_yaw", "_wentTerminal", "_target", "_targetPos", "_curVelocity", "_missile",
"_launchPos", "_targetStartPos", "_defPitch", "_defYaw"];
- _args = _this select 0;
- //PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
- _shooter = _args select 0;
- _missile = _args select 6;
-
- if((count _args) > 7) then {
- _saveArgs = _args select 7;
- _target = _saveArgs select 0;
- _targetStartPos = _saveArgs select 1;
+ _args = _this select 0;
+ //PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
+ _shooter = _args select 0;
+ _missile = _args select 6;
+
+ if((count _args) > 7) then {
+ _saveArgs = _args select 7;
+ _target = _saveArgs select 0;
+ _targetStartPos = _saveArgs select 1;
_launchPos = _saveArgs select 2;
_wentTerminal = _saveArgs select 3;
- } else {
+ } else {
_wentTerminal = false;
_launchPos = getPosASL _shooter;
_target = ACE_player getVariable[QGVAR(currentTarget), objNull];
_targetStartPos = ACE_player getVariable[QGVAR(currentTargetPos), [0,0,0]];
- };
-
+ };
+
if(!alive _missile || isNull _missile || isNull _target) exitWith {
- [(_this select 1)] call cba_fnc_removePerFrameHandler;
- };
+ [(_this select 1)] call cba_fnc_removePerFrameHandler;
+ };
_targetPos = getPosASL _target;
- _curVelocity = velocity _missile;
-
+ _curVelocity = velocity _missile;
+
TRACE_4("", _target, _targetPos, _launchPos, _targetStartPos);
- _addHeight = [0,0,0];
- if(!isNil "_target") then {
-
- _yVec = vectorDir _missile;
- _zVec = vectorUp _missile;
- _xVec = vectorNormalized (_yVec vectorCrossProduct _zVec);
-
- _missilePos = getPosASL _missile;
- // player sideChat "G!";
+ _addHeight = [0,0,0];
+ if(!isNil "_target") then {
+
+ _yVec = vectorDir _missile;
+ _zVec = vectorUp _missile;
+ _xVec = vectorNormalized (_yVec vectorCrossProduct _zVec);
+
+ _missilePos = getPosASL _missile;
+ // player sideChat "G!";
- TRACE_4("Phase Check", _launchPos, _missilePos, _targetPos, (_missilePos distance _targetPos));
- if((count _targetPos) > 0) then {
- _distanceToTarget = [(_missilePos select 0), (_missilePos select 1), (_targetPos select 2)] vectorDistance _targetPos;
+ TRACE_4("Phase Check", _launchPos, _missilePos, _targetPos, (_missilePos distance _targetPos));
+ if((count _targetPos) > 0) then {
+ _distanceToTarget = [(_missilePos select 0), (_missilePos select 1), (_targetPos select 2)] vectorDistance _targetPos;
- if( (_missilePos select 2) < (_targetPos select 2) + 200 && !_wentTerminal) then {
- _addHeight = [0,0, ( (_distanceToTarget * 2) + 400)];
-
+ if( (_missilePos select 2) < (_targetPos select 2) + 200 && !_wentTerminal) then {
+ _addHeight = [0,0, ( (_distanceToTarget * 2) + 400)];
+
_defPitch = 0.25;
_defYaw = 0.035;
TRACE_1("Climb phase", _addHeight);
- } else {
- _wentTerminal = true;
- _this set[2, _wentTerminal];
-
+ } else {
+ _wentTerminal = true;
+ _this set[2, _wentTerminal];
+
_defPitch = 0.25;
_defYaw = 0.25;
TRACE_1("TERMINAL", "");
- };
- _targetPos = _targetPos vectorAdd _addHeight;
+ };
+ _targetPos = _targetPos vectorAdd _addHeight;
- _targetVectorSeeker = [_missile, [_xVec, _yVec, _zVec], _targetPos] call FUNC(translateToWeaponSpace);
- TRACE_5("", _missile, _xVec, _yVec, _zVec, _targetPos);
+ _targetVectorSeeker = [_missile, [_xVec, _yVec, _zVec], _targetPos] call FUNC(translateToWeaponSpace);
+ TRACE_5("", _missile, _xVec, _yVec, _zVec, _targetPos);
_yaw = 0.0;
_pitch = 0.0;
@@ -215,37 +215,37 @@ FUNC(guidance_Javelin_LOBL_TOP_PFH) = {
_pitch = _defPitch;
};
};
-
- TRACE_3("", _targetVectorSeeker, _pitch, _yaw);
-
- #ifdef DEBUG_MODE_FULL
- drawLine3D [(ASLtoATL _targetPos) vectorAdd _addHeight, ASLtoATL _targetPos, [0,1,0,1]];
-
- _light = "#lightpoint" createVehicleLocal (getPos _missile);
- _light setLightBrightness 1.0;
- _light setLightAmbient [1.0, 0.0, 0.0];
- _light setLightColor [1.0, 0.0, 0.0];
-
- drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\selectover_ca.paa", [1,1,1,1], ASLtoATL _missilePos, 0.75, 0.75, 0, str _vectorTo, 1, 0.025, "TahomaB"];
- drawLine3D [ASLtoATL _missilePos, ASLtoATL _targetPos, [1,0,0,1]];
+
+ TRACE_3("", _targetVectorSeeker, _pitch, _yaw);
+
+ #ifdef DEBUG_MODE_FULL
+ drawLine3D [(ASLtoATL _targetPos) vectorAdd _addHeight, ASLtoATL _targetPos, [0,1,0,1]];
+
+ _light = "#lightpoint" createVehicleLocal (getPos _missile);
+ _light setLightBrightness 1.0;
+ _light setLightAmbient [1.0, 0.0, 0.0];
+ _light setLightColor [1.0, 0.0, 0.0];
+
+ drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\selectover_ca.paa", [1,1,1,1], ASLtoATL _missilePos, 0.75, 0.75, 0, str _vectorTo, 1, 0.025, "TahomaB"];
+ drawLine3D [ASLtoATL _missilePos, ASLtoATL _targetPos, [1,0,0,1]];
- MARKERCOUNT = MARKERCOUNT + 1;
- #endif
-
- if(accTime > 0) then {
- TRACE_5("", _xVec, _yVec, _zVec, _yaw, _pitch);
- _outVector = [_missile, [_xVec, _yVec, _zVec], [_yaw, 1/accTime, _pitch]] call FUNC(translateToModelSpace);
-
- _vectorTo = _missilePos vectorFromTo _outVector;
- TRACE_3("", _missile, _outVector, _vectorTo);
- _missile setVectorDirAndUp [_vectorTo, vectorUp _missile];
- };
-
- #ifdef DEBUG_MODE_FULL
- hintSilent format["d: %1", _distanceToTarget];
- #endif
- };
- };
+ MARKERCOUNT = MARKERCOUNT + 1;
+ #endif
+
+ if(accTime > 0) then {
+ TRACE_5("", _xVec, _yVec, _zVec, _yaw, _pitch);
+ _outVector = [_missile, [_xVec, _yVec, _zVec], [_yaw, 1/accTime, _pitch]] call FUNC(translateToModelSpace);
+
+ _vectorTo = _missilePos vectorFromTo _outVector;
+ TRACE_3("", _missile, _outVector, _vectorTo);
+ _missile setVectorDirAndUp [_vectorTo, vectorUp _missile];
+ };
+
+ #ifdef DEBUG_MODE_FULL
+ hintSilent format["d: %1", _distanceToTarget];
+ #endif
+ };
+ };
_saveArgs = [_target,_targetStartPos, _launchPos, _wentTerminal];
_args set[7, _saveArgs ];
@@ -253,24 +253,24 @@ FUNC(guidance_Javelin_LOBL_TOP_PFH) = {
};
FUNC(guidance_Javelin_LOBL_TOP) = {
- PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
-
- GVAR(lastTime) = time;
- [FUNC(guidance_Javelin_LOBL_TOP_PFH), 0, _this] call cba_fnc_addPerFrameHandler;
+ PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
+
+ GVAR(lastTime) = time;
+ [FUNC(guidance_Javelin_LOBL_TOP_PFH), 0, _this] call cba_fnc_addPerFrameHandler;
};
FUNC(guidance_Javelin_LOBL_DIR) = {
- PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
-
- GVAR(lastTime) = time;
- [FUNC(guidance_Javelin_LOBL_DIR_PFH), 0, _this] call cba_fnc_addPerFrameHandler;
+ PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
+
+ GVAR(lastTime) = time;
+ [FUNC(guidance_Javelin_LOBL_DIR_PFH), 0, _this] call cba_fnc_addPerFrameHandler;
};
if(!local _shooter) exitWith { false };
if(_ammo == "M_Titan_AT") then {
- _fireMode = _shooter getVariable ["ACE_FIRE_SELECTION", ACE_JAV_FIREMODE_TOP];
-
- switch (_fireMode) do {
+ _fireMode = _shooter getVariable ["ACE_FIRE_SELECTION", ACE_JAV_FIREMODE_TOP];
+
+ switch (_fireMode) do {
// Default to FIREMODE_DIRECT_LOAL
// FIREMODE_DIRECT_LOAL
case ACE_JAV_FIREMODE_DIR: {
diff --git a/addons/wep_javelin/functions/fnc_onOpticDraw.sqf b/addons/wep_javelin/functions/fnc_onOpticDraw.sqf
index 1bc848cb04..6a74b3ed57 100644
--- a/addons/wep_javelin/functions/fnc_onOpticDraw.sqf
+++ b/addons/wep_javelin/functions/fnc_onOpticDraw.sqf
@@ -2,10 +2,10 @@
#include "script_component.hpp"
//TRACE_1("enter", _this);
-#define __TRACKINTERVAL 0.1 // how frequent the check should be.
-#define __LOCKONTIME 1.85 // Lock on won't occur sooner
-#define __LOCKONTIMERANDOM 0.3 // Deviation in lock on time
-#define __SENSORSQUARE 1 // Locking on sensor square side in angles
+#define __TRACKINTERVAL 0.1 // how frequent the check should be.
+#define __LOCKONTIME 1.85 // Lock on won't occur sooner
+#define __LOCKONTIMERANDOM 0.3 // Deviation in lock on time
+#define __SENSORSQUARE 1 // Locking on sensor square side in angles
#define __ConstraintTop (((ctrlPosition __JavelinIGUITargetingConstrainTop) select 1) + ((ctrlPosition (__JavelinIGUITargetingConstrainTop)) select 3))
#define __ConstraintBottom ((ctrlPosition __JavelinIGUITargetingConstrainBottom) select 1)
@@ -35,9 +35,9 @@ _soundTime = _args select 4;
// Find a target within the optic range
_newTarget = objNull;
-
+
// Bail on fast movement
-if ((velocity ACE_player) distance [0,0,0] > 0.5 && {cameraView == "GUNNER"} && {cameraOn == ACE_player}) exitWith { // keep it steady.
+if ((velocity ACE_player) distance [0,0,0] > 0.5 && {cameraView == "GUNNER"} && {cameraOn == ACE_player}) exitWith { // keep it steady.
ACE_player switchCamera "INTERNAL";
};
@@ -71,7 +71,7 @@ if (isNull _newTarget) then {
ACE_player setVariable [QGVAR(currentTarget),nil, false];
// Disallow fire
- //if (ACE_player ammo "Javelin" > 0 || {ACE_player ammo "ACE_Javelin_Direct" > 0}) then {ACE_player setWeaponReloadingTime //[player, "Javelin", 0.2];};
+ //if (ACE_player ammo "Javelin" > 0 || {ACE_player ammo "ACE_Javelin_Direct" > 0}) then {ACE_player setWeaponReloadingTime //[player, "Javelin", 0.2];};
} else {
if (_newTarget distance ACE_player < 2500
// && {(call CBA_fnc_getFoV) select 1 > 7}
diff --git a/addons/wep_javelin/functions/fnc_translateToWeaponSpace.sqf b/addons/wep_javelin/functions/fnc_translateToWeaponSpace.sqf
index afe2436e5d..8f85005d48 100644
--- a/addons/wep_javelin/functions/fnc_translateToWeaponSpace.sqf
+++ b/addons/wep_javelin/functions/fnc_translateToWeaponSpace.sqf
@@ -18,9 +18,9 @@ _y = _offset select 1;
_z = _offset select 2;
_out = [
- ((_xVec select 0)*_x) + ((_xVec select 1)*_y) + ((_xVec select 2)*_z),
- ((_yVec select 0)*_x) + ((_yVec select 1)*_y) + ((_yVec select 2)*_z),
- ((_zVec select 0)*_x) + ((_zVec select 1)*_y) + ((_zVec select 2)*_z)
- ];
+ ((_xVec select 0)*_x) + ((_xVec select 1)*_y) + ((_xVec select 2)*_z),
+ ((_yVec select 0)*_x) + ((_yVec select 1)*_y) + ((_yVec select 2)*_z),
+ ((_zVec select 0)*_x) + ((_zVec select 1)*_y) + ((_zVec select 2)*_z)
+ ];
_out;
\ No newline at end of file
diff --git a/addons/winddeflection/config.cpp b/addons/winddeflection/config.cpp
index 3d342d50fe..f515640f12 100644
--- a/addons/winddeflection/config.cpp
+++ b/addons/winddeflection/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ACE_common", "ACE_weather"};
+ requiredAddons[] = {"ace_weather"};
versionDesc = "ACE Wind Deflection";
version = VERSION;
author[] = {$STR_ACE_Common_ACETeam, "Glowbal", "Ruthberg"};
diff --git a/addons/winddeflection/functions/fnc_initalizeModule.sqf b/addons/winddeflection/functions/fnc_initalizeModule.sqf
index 2833ecc54c..85d61e3bcc 100644
--- a/addons/winddeflection/functions/fnc_initalizeModule.sqf
+++ b/addons/winddeflection/functions/fnc_initalizeModule.sqf
@@ -15,5 +15,5 @@ if (!hasInterface) exitwith {}; // No need for this module on HC or dedicated se
private ["_logic"];
_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
if (!isNull _logic) then {
- [_logic, QGVAR(EnableForAI), "EnableForAI" ] call EFUNC(common,readSettingFromModule);
+ [_logic, QGVAR(EnableForAI), "EnableForAI" ] call EFUNC(common,readSettingFromModule);
};
\ No newline at end of file
diff --git a/addons/winddeflection/functions/script_component.hpp b/addons/winddeflection/functions/script_component.hpp
index 278930e4e7..eb67fc3887 100644
--- a/addons/winddeflection/functions/script_component.hpp
+++ b/addons/winddeflection/functions/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_WINDDEFLECTION
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_WINDDEFLECTION
- #define DEBUG_SETTINGS DEBUG_SETTINGS_WINDDEFLECTION
+ #define DEBUG_SETTINGS DEBUG_SETTINGS_WINDDEFLECTION
#endif
#include "\z\ace\addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/addons/winddeflection/script_component.hpp b/addons/winddeflection/script_component.hpp
index 047b7980e5..4af43227de 100644
--- a/addons/winddeflection/script_component.hpp
+++ b/addons/winddeflection/script_component.hpp
@@ -2,11 +2,11 @@
#include "\z\ace\addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_WINDDEFLECTION
- #define DEBUG_MODE_FULL
+ #define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_WINDDEFLECTION
- #define DEBUG_SETTINGS DEBUG_SETTINGS_WINDDEFLECTION
+ #define DEBUG_SETTINGS DEBUG_SETTINGS_WINDDEFLECTION
#endif
#include "\z\ace\addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/documentation/development/ace3-config-entries.md b/documentation/development/ace3-config-entries.md
new file mode 100644
index 0000000000..f56285052d
--- /dev/null
+++ b/documentation/development/ace3-config-entries.md
@@ -0,0 +1,98 @@
+---
+layout: wiki
+title: ACE3 Config Entries
+group: dev
+parent: wiki
+order: 2
+---
+
+### CfgVehicles
+
+```c++
+ace_nightvision_grain
+ace_nightvision_blur
+ace_recoil_enablecamshake
+ace_dragging_cancarry
+ace_dragging_carryposition
+ace_dragging_carrydirection
+ace_dragging_candrag
+ace_dragging_dragposition
+ace_dragging_dragdirection
+ace_gforcecoef
+ace_offset
+```
+
+
+### CfgWeapons
+
+```c++
+ace_recoil_shakemultiplier
+ace_overpressure_angle
+ace_overpressure_range
+ace_overpressure_damage
+ace_overheating_dispersion
+ace_overheating_slowdownfactor
+ace_overheating_jamchance
+ace_nightvision_grain
+ace_nightvision_blur
+ace_nightvision_radblur
+ace_usedtube
+ace_reloadlaunchers_enabled
+ace_bipod
+ace_overheating_allowswapbarrel
+ace_clearjamaction
+ace_checktemperatureaction
+ace_gforcecoef
+ace_protection
+ace_scopeadjust_horizontal
+ace_scopeadjust_vertical
+ace_isusedlauncher
+ace_attachable
+ace_range
+ace_detonator
+```
+
+
+### CfgAmmo
+
+```c++
+ace_bulletmass
+ace_recoil_shakemultiplier
+ace_frag_skip
+ace_frag_force
+ace_frag_classes
+ace_frag_metal
+ace_frag_charge
+ace_frag_gurney_c
+ace_frag_gurney_k
+ace_explodeondefuse
+ace_explosive
+ace_fcs_airburst
+```
+
+
+### CfgGlasses
+
+```c++
+ace_color
+ace_tintamount
+ace_overlay
+ace_overlaydirt
+ace_overlaycracked
+ace_resistance
+ace_protection
+ace_dustpath
+```
+
+
+### CfgMagazines
+
+```c++
+ace_isbelt
+ace_attachable
+ace_placeable
+ace_setupobject
+ace_delaytime
+ace_triggers
+ace_magazines_forcemagazinemuzzlevelocity
+```
diff --git a/documentation/development/ace3-events-system.md b/documentation/development/ace3-events-system.md
new file mode 100644
index 0000000000..9075347f71
--- /dev/null
+++ b/documentation/development/ace3-events-system.md
@@ -0,0 +1,171 @@
+---
+layout: wiki
+title: ACE3 Events System
+group: dev
+parent: wiki
+order: 3
+---
+
+## Event Handlers
+
+Event handlers in ACE3 are implemented through our event system. They should be used to trigger or allow triggering of specific functionality.
+
+The commands are listed below.
+
+* `[eventName, eventCodeBlock] call ace_common_fnc_addEventHandler` adds an event handler with the event name and returns the event handler id.
+* `[eventName, args] call ace_common_fnc_globalEvent` calls an event with the listed args on all machines, the local machine, and the server.
+* `[eventName, args] call ace_common_fnc_serverEvent` calls an event just on the server computer (dedicated or self-hosted).
+* `[eventName, targetObject(s), args] call ace_common_fnc_targetEvent` calls an event just on the targeted object or list of objects.
+* `[eventName, args] call ace_common_fnc_localEvent` calls an event just on the local machine, useful for inter-module events.
+
+Events can be removed or cleared with the following commands.
+
+* `[eventName, eventHandlerId] call ace_common_fnc_removeEventHandler` will remove a specific event handler of the event name, using the ID returned from `ace_common_fnc_addEventHandler`.
+* `[eventName] call ace_common_fnc_removeAllEventHandlers` will remove all event handlers for that type of event.
+
+### Pattern:
+```c++
+// tapper machine
+["tapShoulder", [_target], [otherArguments]] call EFUNC(common,targetEvent);
+
+// target machine XEH_preInit.sqf
+PREP(onTapShoulder);
+["tapShoulder", FUNC(onTapShoulder) ] call EFUNC(common,addEventHandler);
+```
+
+### Listenable Event List:
+
+
+
+
Event Key
+
Description
+
Source(s)
+
Locality
+
+
+
+
+
"playerChanged"
+
`player` changed (zeus/respawn)
+
common
+
local
+
+
+
+
"playerInventoryChanged"
+
Inventory changed
+
common
+
local
+
+
+
+
"playerVisionModeChanged"
+
Vision mode changed (e.g. NVG on)
+
common
+
local
+
+
+
+
"zeusDisplayChanged"
+
Zeus display opened/closed
+
common
+
local
+
+
+
+
"cameraViewChanged"
+
Camera view changed
+
common
+
local
+
+
+
"playerVehicleChanged"
+
Player vehicle changed
+
common
+
local
+
+
+
"playerTurretChanged"
+
Player turret changed
+
common
+
local
+
+
+
"infoDisplayChanged"
+
On info box change (e.g. entering and leaving a vehicle)
+
common
+
local
+
+
+
"inventoryDisplayLoaded"
+
On opening the inventory display
+
common
+
local
+
+
+
"interactionMenuOpened"
+
Interaction Menu Opened
+
interaction
+
local
+
+
+
"killedByFriendly"
+
On TK/Civilian Killed
+
respawn
+
local
+
+
+
"drawing_requestMarkers"
+
Request Drawing Markers
+
map
+
target
+
+
+
"drawing_sendbackMarkers"
+
Send Drawing Markers
+
map
+
target
+
+
+
"drawing_addLineMarker"
+
Line Drawn
+
map
+
global
+
+
+
"drawing_removeLineMarker"
+
Line Deleted
+
map
+
global
+
+
+
"flashbangExplosion"
+
Flashbang Goes Bang
+
grenades
+
target
+
+
+
+
+### Callable Event List:
+
+
+
+
Event Key
+
Description
+
Parameters
+
Owner
+
Locality
+
+
+
+
+
"ace_fcs_forceChange"
+
force FCS updates
+
fcs
+
fcs
+
local
+
+
+
+
diff --git a/documentation/development/arma-3-issues.md b/documentation/development/arma-3-issues.md
new file mode 100644
index 0000000000..b6ef063cbc
--- /dev/null
+++ b/documentation/development/arma-3-issues.md
@@ -0,0 +1,25 @@
+---
+layout: wiki
+title: Arma 3 Issues
+group: dev
+parent: wiki
+order: 6
+---
+
+
+Keeping track of Arma 3 issues that need to be fixed. If you want to support us and help raise Bohemia's awareness of those issues, please upvote them:
+
+**Open:**
+
+* [bux578: 0020997: MineDetector equipable in Launcher slot](http://feedback.arma3.com/view.php?id=20997)
+* [bux578: 0021176: Zeus / Curator Add Remote Controlled Event](http://feedback.arma3.com/view.php?id=21176)
+* [bux578: 0021469: Add script commands "addPrimaryWeaponMagazine" and "addSecondaryWeaponMagazine"](http://feedback.arma3.com/view.php?id=21469)
+* [bux578: 0022000: Add/Alter script command to add perfectly configured weapons to cargo](http://feedback.arma3.com/view.php?id=22000)
+* [commy2: 0021443: Unexpected behavior of += array in configs](http://feedback.arma3.com/view.php?id=21443)
+* [commy2: 0022671: setVariable is not always JIP persistent](http://feedback.arma3.com/view.php?id=22671)
+* [CorruptedHeart: 0022318: Can no longer use "MenuBack" shortcut in AddAction](http://feedback.arma3.com/view.php?id=22318)
+
+**Resolved:**
+
+* [Nou: 0020761: Memory points rfemur, lfemur, and other leg memory points returned incorrectly with SQF command selectionPosition](http://feedback.arma3.com/view.php?id=20761)
+* [commy2: 0023136: isLightOn doesn't recognize destroyed light bulbs for streetlamps](http://feedback.arma3.com/view.php?id=23136)
diff --git a/documentation/development/arma-3-scheduler-and-our-practices.md b/documentation/development/arma-3-scheduler-and-our-practices.md
new file mode 100644
index 0000000000..90646b3b4a
--- /dev/null
+++ b/documentation/development/arma-3-scheduler-and-our-practices.md
@@ -0,0 +1,94 @@
+---
+layout: wiki
+title: Arma 3 Scheduler And Our Practices
+group: dev
+parent: wiki
+order: 8
+---
+
+## Terminology
+
+#### Frame
+A single rendered frame of Arma 3.
+
+#### Scheduled Space
+
+This refers to execution would is ruled by the Arma 3 default script scheduling engine. This would include:
+* spawn
+* execVM
+
+#### Unscheduled Space
+This refers to execution which is linear; what this means is that the code will run to completion prior to executing the current frame. It must complete, but is guaranteed to run within a given frame.
+* perFrameHandler
+* Extended_EventHandlers
+* addEventHandler
+
+
+## What is the scheduler and why do I care?
+
+BIKI Article: https://community.bistudio.com/wiki/Biki2.0:Performance_Considerations
+
+The Arma 3 script scheduler basically gives a fair-share execution to all running scripts, FSMs, and SQS files running on any given client or server at any given time. See the BIKI article for a in-depth explanation of this. What this basically means though, is that all scripts get a fair share; this also means scheduled execution is drastically affected by other poorly written mods. For example, if 2 different spawn's are running in a tight loop of `do { foo } while (true);`, they will both get exactly 50% of the scheduling time.
+
+With the way mission makers and mod makers generally use spawn/execVM, this means you're actually getting drastically less execution time in the scheduled environment than you might think. This leads to visible delay issues all the way up to massive delay on execution. You can easily test and prove this by looping spawns and watching the execution times extend.
+
+What does this all mean? It means we need to live outside of the spawn execution as much as possible. There are 2 places that the majority of our functionality should stem from, which means that as long as we strictly always perform calls between functions, we are executing within the same frame. If our execution is either stemming from the perFrameHandlers, or any default Extended_EventHandlers, than we can guarantee execution within a single frame. *ANY OTHER CIRCUMSTANCE IS NOT GUARANTEED.*
+
+The scheduler will also actually halt your script mid-execution, usually at the end of a given control block, and pause you to yield to other scripts. This can lead to drastically incorrect results when performing calculations. Again, this is the reason we want all our given code to run to completion in a single given frame.
+
+## Design Patterns
+
+Because we are attempting to always run to completion; execution occurs from 2 places. Either PFH handles or event handlers; in both cases, we wish our code to run to completion. This takes a change in mind set for design to ensure your executing that way. In a nutshell though, this all distills down to the fact that you will always call other chunks of code; nothing will ever be spawned off. The only circumstance this really becomes a problem is for waiting or delay. If designed correctly, though, you can avoid those circumstances.
+
+Rules of thumb for component design:
+
+* If you need to wait for a value, don't wait, use a CBA event! This means everything should be designed and written with an event-driven model in mind.
+
+* If you have to wait, use a PFH delay/diag_tickTime check.
+
+
+### PFH-Design Pattern
+
+Line Notes:
+
+* PerFrameHandlers should be self-removing. If a PFH is no longer needed, it is responsible for removing itself.
+
+
+
+### ACE3 General Rules
+
+* Always use call whenever possible. We should be calling functions chains exclusive and not be relying on spawn/execVM ever. Consider spawn/execVM banned without good reason. All code should be a chain of execution which is traceable, and not triggered between seperate threads.
+* waitUntil and sleep are banned. If you need to use them, use scheduled delay execution instead. **Reasoning** *Sleep/waituntil surrender about 5x the scheduler time than even normal execution does. *
+* If we need a spawn or exec, we should utilize the perFrame scheduler. Spawn/execVM are subject to the Arma 3 scheduler and as such, cannot be relied upon. In order to give our players a consistent gameplay experience, we need to have total control over how and when all of our code runs.
+* PFH should be utilized at all possible times when the player can see the result of whatever the code is. This applies to missile guidance, bullets, wind, optics, interactive UI, HUD's, and rendering. We should only consider scheduled execution if the code is running out of the visual range of the player.
+
+
+### Code Examples
+
+##### Generic PFH functions
+See: https://dev.withsix.com/docs/cba/files/common/fnc_addPerFrameHandler-sqf.html for more details.
+
+```c++
+[{ code } , delayTime, [ARGS] ] call CBA_fnc_addPerFrameHandler;
+```
+
+
+##### PFH Wait
+
+```c++
+DFUNC(myDelayedFunction) = {
+ // Our argument array is passed in a PFH as select 0
+ _args = _this select 0;
+
+ // Print our arguments
+ diag_log text format["I received: %1", (_args select 0)];
+
+ // Delete this PFH, so it is only executed once
+ [_this select 1] call CBA_fnc_removePerFrameHandler;
+};
+
+// This runs the PFH once every 5 seconds, with the variable array ["balls"] being passed in
+// This executes FUNC(myDelayedFunction), that could also be a { code } block.
+// Parameter 2 is the delay (in seconds) for a PFH. This is "execute every N seconds", 0 will be every frame.
+[FUNC(myDelayedFunction), 5, ["balls"] ] call CBA_fnc_addPerFrameHandler;
+```
diff --git a/documentation/development/coding-guidelines.md b/documentation/development/coding-guidelines.md
new file mode 100644
index 0000000000..c3517dec1d
--- /dev/null
+++ b/documentation/development/coding-guidelines.md
@@ -0,0 +1,274 @@
+---
+layout: wiki
+title: Coding Guidelines
+group: dev
+parent: wiki
+order: 1
+---
+
+## Table Of Contents
+
+- [Indentation](#indentation)
+- [Braces](#braces)
+- [Modules](#how-to-create-a-new-module)
+- [Macros](#macro-usage)
+- [Events](#event-handlers)
+- [Hashes](#hashes)
+
+
+## Indentation
+
+4 spaces for indentation.
+
+```c++
+class Something: Or {
+....class Other {
+........foo = "bar";
+....};
+};
+```
+
+#### Reasoning
+
+Tabs can be tricky sometimes, especially when it comes to sharing code with others. Additionally, a lot of people tend to forget they're using tabs when they're aligning things after the first character, which causes things to fall apart when viewing the code at different tab lengths.
+
+
+## Braces
+
+- opening bracket on the same line as keyword
+- closing bracket in own line, same level of indentation as keyword
+
+**Yes:**
+
+```c++
+class Something: Or {
+ class Other {
+ foo = "bar";
+ };
+};
+```
+
+**No:**
+
+```c++
+class Something : Or
+{
+ class Other
+ {
+ foo = "bar";
+ };
+};
+```
+
+**Also no:**
+
+```c++
+class Something : Or {
+ class Other {
+ foo = "bar";
+ };
+ };
+```
+
+When using `if`/`else`, it is encouraged to put `else` on the same line as the closing bracket to save space:
+
+```c++
+if (alive player) then {
+ player setDamage 1;
+} else {
+ hint ":(";
+};
+```
+
+In cases where you , e.g, have a lot of one-liner classes, it is allowed to use something like this to save space:
+
+```c++
+class One {foo = 1;};
+class Two {foo = 2;};
+class Three {foo = 3;};
+```
+
+#### Reasoning
+
+Putting the opening bracket in it's own line wastes a lot of space, and keeping the closing bracket on the same level as the keyword makes it easier to recognize what exactly the bracket closes.
+
+
+## How to create a new module
+
+1. Copy the structure from `extras\blank` to the `addons\` folder and name it what you wish the new module to be named.
+1. Edit `script_component.hpp`, change the `COMPONENT` definition to the name of the module. Also edit each of the `DEBUG` definitions to be the name of the module (for example, `DEBUG_SETTINGS_BLANK` should be `DEBUG_SETTINGS_BALLS` for module balls)
+1. Edit the `script_component.hpp` file in the the `functions` directory to match the path of the new module, for example `#include "\z\ace\addons\blank\script_component.hpp"` for module called balls should now be `#include "\z\ace\addons\ballls\script_component.hpp"`.
+1. The module is now prepared for development
+
+
+### Function Definitions
+
+Functions should be created in the functions\ subdirectory, named `fnc_FunctionName.sqf` They should then be indexed via the `PREP(FunctionName)` macro in the XEH_preInit.sqf file. The `PREP` macro allows for CBA function caching, which drastically speeds up load times. **Beware though that function caching is enabled by default and as such to disable it you need to `#define DISABLE_COMPILE_CACHE` above your `#include "script_components.hpp"` include!**
+
+Every function should have a header of the following format:
+
+```cpp
+/*
+ * Author: [Name of Author(s)]
+ * [Description]
+ *
+ * Arguments:
+ * 0: The first argument
+ * 1: The second argument