From faadfa789e61cb9286ff1893d874a104509acde7 Mon Sep 17 00:00:00 2001 From: "[GNC]Lord-MDB]" Date: Wed, 31 Mar 2021 15:10:48 +0200 Subject: [PATCH 1/7] ok --- addons/OPT/REVIVE/macros.hpp | 1 + dependencies/CLib | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/OPT/REVIVE/macros.hpp b/addons/OPT/REVIVE/macros.hpp index 1500415d..3c8d5e5e 100644 --- a/addons/OPT/REVIVE/macros.hpp +++ b/addons/OPT/REVIVE/macros.hpp @@ -1,2 +1,3 @@ #define MODULE REVIVE #include "\opt\opt\addons\opt\macros.hpp" + diff --git a/dependencies/CLib b/dependencies/CLib index ee8651dc..ee22db3e 160000 --- a/dependencies/CLib +++ b/dependencies/CLib @@ -1 +1 @@ -Subproject commit ee8651dc1a0c170488b71455b7e47d7b95b53bd2 +Subproject commit ee22db3e53a1574090927ec0243b8439c1f4280e From 8baa7a3dc7b68a228a4f26308945665bdfd4d1e1 Mon Sep 17 00:00:00 2001 From: "[GNC]Lord-MDB]" Date: Wed, 31 Mar 2021 15:23:06 +0200 Subject: [PATCH 2/7] GPS erweiterung --- addons/OPT/GPS/fn_gps.sqf | 2 +- addons/OPT/GPS/fn_gps_Unconscious.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/OPT/GPS/fn_gps.sqf b/addons/OPT/GPS/fn_gps.sqf index 84d97051..4936079e 100644 --- a/addons/OPT/GPS/fn_gps.sqf +++ b/addons/OPT/GPS/fn_gps.sqf @@ -106,7 +106,7 @@ GVAR(markerplayer) = [] call FUNC(createPlayerMarker); { _marker setMarkerTextLocal _name; - if ((lifeState _obj isEqualTo "INCAPACITATED") or (_obj getVariable "OPT_isUnconscious" == 1)) then + if ((lifeState _obj isEqualTo "INCAPACITATED") and !(incapacitatedState _obj == "")) then { _marker setMarkerTextLocal ""; _marker setMarkerPosLocal [0,0]; diff --git a/addons/OPT/GPS/fn_gps_Unconscious.sqf b/addons/OPT/GPS/fn_gps_Unconscious.sqf index 2fd983f6..ad55d562 100644 --- a/addons/OPT/GPS/fn_gps_Unconscious.sqf +++ b/addons/OPT/GPS/fn_gps_Unconscious.sqf @@ -46,7 +46,7 @@ for "_i" from 1 to (GVAR(unitnumberUnconscious)) do _Sideidunit = getnumber (configFile >> "CfgVehicles" >> (typeof _x) >> "side"); _sideidplayer = playerSide call BIS_fnc_sideID; - if ((_Sideidunit == _sideidplayer) and ((lifeState _x isEqualTo "INCAPACITATED") or (_x getVariable "OPT_isUnconscious" == 1))) then + if ((_Sideidunit == _sideidplayer) and (lifeState _x isEqualTo "INCAPACITATED") and !(incapacitatedState _x == "")) then { _unitsToMarkisUnconscious pushBack _x; }; From 5849d502ec6858a06532c17187b055028b0b045e Mon Sep 17 00:00:00 2001 From: "[GNC]Lord-MDB]" Date: Wed, 31 Mar 2021 15:23:32 +0200 Subject: [PATCH 3/7] =?UTF-8?q?Erweiterung=20N=C3=A4chster=20Sani=20anzeig?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/OPT/REVIVE/fn_dialog.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/OPT/REVIVE/fn_dialog.sqf b/addons/OPT/REVIVE/fn_dialog.sqf index dcda1297..a37d5361 100644 --- a/addons/OPT/REVIVE/fn_dialog.sqf +++ b/addons/OPT/REVIVE/fn_dialog.sqf @@ -94,12 +94,12 @@ GVAR(startzeit) = time; _sidesoldat =getnumber (configFile >> "CfgVehicles" >> (typeof _x) >> "side"); _sideplayer =getnumber (configFile >> "CfgVehicles" >> (typeof player) >> "side"); - if ((_sidesoldat isEqualTo _sideplayer) and (typeOf _x in GVAR(SaniKlassen)) and !(lifeState _x isEqualTo "INCAPACITATED") and GVAR(onlysani)) then + if ((_sidesoldat isEqualTo _sideplayer) and (typeOf _x in GVAR(SaniKlassen)) and !(lifeState _x isEqualTo "INCAPACITATED") and (incapacitatedState _x == "") and GVAR(onlysani)) then { _poolplayer pushBack _x; }; //alle Spieler - if ((_sidesoldat isEqualTo _sideplayer) and !(lifeState _x isEqualTo "INCAPACITATED") and !GVAR(onlysani)) then + if ((_sidesoldat isEqualTo _sideplayer) and !(lifeState _x isEqualTo "INCAPACITATED") and (incapacitatedState _x == "") and !GVAR(onlysani)) then { _poolplayer pushBack _x; }; From 12242e2e8220a71492f6fdac35e447e3794cb05d Mon Sep 17 00:00:00 2001 From: "[GNC]Lord-MDB]" Date: Wed, 31 Mar 2021 15:24:03 +0200 Subject: [PATCH 4/7] erweiterung 3D marker --- addons/OPT/REVIVE/fn_clientInitEH.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/OPT/REVIVE/fn_clientInitEH.sqf b/addons/OPT/REVIVE/fn_clientInitEH.sqf index d43322ff..310a1ca7 100644 --- a/addons/OPT/REVIVE/fn_clientInitEH.sqf +++ b/addons/OPT/REVIVE/fn_clientInitEH.sqf @@ -162,10 +162,12 @@ GVAR(missionEH_draw3D) = addMissionEventHandler ["Draw3D", { private _nearbyUnits = playableUnits select { + _sideidplayer = playerSide call BIS_fnc_sideID; (_x distance player) < 30 and lifeState _x isEqualTo "INCAPACITATED" and + !(incapacitatedState _x == "") and _x != player and - SIDE _x == PLAYERSIDE + ((getnumber (configFile >> "CfgVehicles" >> (typeof _x) >> "side")) isEqualTo (playerSide call BIS_fnc_sideID)) }; { private _name = NAME _x; From 6dd641e4bfe467e5122e4ad7032c322c24a1aac3 Mon Sep 17 00:00:00 2001 From: "[GNC]Lord-MDB]" Date: Wed, 31 Mar 2021 20:27:33 +0200 Subject: [PATCH 5/7] Erweitere kontrolle beim Beamen --- addons/OPT/GELDZEIT/fn_beam.sqf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/OPT/GELDZEIT/fn_beam.sqf b/addons/OPT/GELDZEIT/fn_beam.sqf index 1a4d7f11..78abe48f 100644 --- a/addons/OPT/GELDZEIT/fn_beam.sqf +++ b/addons/OPT/GELDZEIT/fn_beam.sqf @@ -106,18 +106,17 @@ switch GVAR(Fraktionauswahl) do default { - ERROR_LOG("GeldzeitBeam: Fehlerhafte Datenübergabe - Keine Fraktionauswahl erkannt"); + ERROR_LOG("GeldzeitBeam: Fehlerhafte Daten�bergabe - Keine Fraktionauswahl erkannt"); }; }; if !(isNull _Basis) then { (["Basis"] call BIS_fnc_rscLayer) cutText ["Teleport...", "BLACK OUT", 3]; // fade out in black - // beam player - vehicle player setPosASL [(random 100) - 50, (random 100) - 50, 1000 + random 100]; + private _TempLogic = "Land_HelipadEmpty_F" createvehicle [(getPos _Basis select 0)-20*sin(random 360),(getPos _Basis select 1)-20*cos(random 360)]; vehicle player setVectorUp [0,0,1]; - vehicle player setPosASL (getPosASL _Basis vectorAdd [(random 2) + 2, (random 2) + 2, 0.2]); - + vehicle player setPosASL (getPosASL _TempLogic vectorAdd [0.2,0.2, 0.2]); + deleteVehicle _TempLogic; (["Basis"] call BIS_fnc_rscLayer) cutText ["", "BLACK IN", 3]; }; From 9e13a3cefb19f1c1064fb24410f47718d1dcc05a Mon Sep 17 00:00:00 2001 From: "[GNC]Lord-MDB]" Date: Wed, 31 Mar 2021 20:53:02 +0200 Subject: [PATCH 6/7] Konfig Button im Shop ausblenden --- addons/OPT/SHOP/fn_einlesenInShopDialog.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/OPT/SHOP/fn_einlesenInShopDialog.sqf b/addons/OPT/SHOP/fn_einlesenInShopDialog.sqf index eb925a22..cac6db5e 100644 --- a/addons/OPT/SHOP/fn_einlesenInShopDialog.sqf +++ b/addons/OPT/SHOP/fn_einlesenInShopDialog.sqf @@ -150,7 +150,7 @@ switch (GVAR(vehicleType)) do }; }; GVAR(moveInVeh) = true; - _konfig ctrlEnable true; + _konfig ctrlEnable false; }; case "vehicles": @@ -183,7 +183,7 @@ switch (GVAR(vehicleType)) do }; }; GVAR(moveInVeh) = true; - _konfig ctrlEnable true; + _konfig ctrlEnable false; }; case "supplies" : @@ -251,7 +251,7 @@ switch (GVAR(vehicleType)) do }; }; GVAR(moveInVeh) = true; - _konfig ctrlEnable true; + _konfig ctrlEnable false; }; default { From a703fc44848aa5d5b65c3a20db343997c9621a7a Mon Sep 17 00:00:00 2001 From: "[GNC]Lord-MDB]" Date: Thu, 1 Apr 2021 15:29:38 +0200 Subject: [PATCH 7/7] =?UTF-8?q?beamen=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/OPT/GELDZEIT/fn_beam.sqf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/OPT/GELDZEIT/fn_beam.sqf b/addons/OPT/GELDZEIT/fn_beam.sqf index 78abe48f..ef3e9213 100644 --- a/addons/OPT/GELDZEIT/fn_beam.sqf +++ b/addons/OPT/GELDZEIT/fn_beam.sqf @@ -106,7 +106,7 @@ switch GVAR(Fraktionauswahl) do default { - ERROR_LOG("GeldzeitBeam: Fehlerhafte Daten�bergabe - Keine Fraktionauswahl erkannt"); + ERROR_LOG("GeldzeitBeam: Fehlerhafte Datenübergabe - Keine Fraktionauswahl erkannt"); }; }; @@ -115,8 +115,9 @@ if !(isNull _Basis) then (["Basis"] call BIS_fnc_rscLayer) cutText ["Teleport...", "BLACK OUT", 3]; // fade out in black // beam player private _TempLogic = "Land_HelipadEmpty_F" createvehicle [(getPos _Basis select 0)-20*sin(random 360),(getPos _Basis select 1)-20*cos(random 360)]; - vehicle player setVectorUp [0,0,1]; - vehicle player setPosASL (getPosASL _TempLogic vectorAdd [0.2,0.2, 0.2]); + vehicle player setPosASL (getPosASL _TempLogic vectorAdd [0, 0, 10]); + vehicle player setVectorUp surfaceNormal position _TempLogic; + vehicle player setPosASL (getPosASL _TempLogic vectorAdd [0, 0, 0.2]); deleteVehicle _TempLogic; (["Basis"] call BIS_fnc_rscLayer) cutText ["", "BLACK IN", 3]; };