Merge pull request #1668 from Vdauphin/Add-deadbody_processing

Add: Deadbody direct processing, without bodybag

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/body/bagRecover.sqf

@@ -27,11 +27,8 @@ params [
 
 private _array = nearestObjects [_logistic, ["ACE_bodyBagObject", "CAManBase"], 10];
 _array = _array select {
-    alive _x && (
-        (_x isKindOf "CAManBase" &&
-        side group _x isEqualTo btc_enemy_side) ||
-        _x isKindOf "ACE_bodyBagObject"
-    )
+    _x isKindOf "CAManBase" ||
+    _x isKindOf "ACE_bodyBagObject"
 };
 if (_array isEqualTo []) exitWith {
     localize "STR_BTC_HAM_O_BODYBAG_NO" call CBA_fnc_notify;

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/body/bagRecover_s.sqf

@@ -30,7 +30,11 @@ private _ticket = 0;
 private _UID = _bodyBag getVariable ["btc_UID", ""];
 private _players = [];
 if (_UID isEqualTo "") then {
-    if (alive _bodyBag && _bodyBag isKindOf "CAManBase") then {
+    if (
+        alive _bodyBag &&
+        _bodyBag isKindOf "CAManBase" &&
+         side group _bodyBag isEqualTo btc_enemy_side
+    ) then {
         _ticket = btc_body_prisonerTicket;
 
         switch (btc_p_respawn_ticketsFromPrisoners) do { 

=BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml

@@ -162,7 +162,7 @@
         </Container>
         <Container name="Documentation: Respawn tickets">
             <Key ID="STR_BTC_HAM_DOC_RESPAWN_TEXT">
-                <Original>&lt;img image='\a3\Ui_F_Curator\Data\CfgMarkers\kia_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Introduction:&lt;/marker&gt;&lt;br/&gt; By default, each player has a limited number of respawn tickets. On first join, you get the default number of tickets (20). After, each time you respawn, your number of tickets will decrease by one and a kill in action (KIA) marker will appear after 10 minutes.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_104_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Get new tickets:&lt;/marker&gt;&lt;br/&gt; Players can increase by one ticket if they retrieve their dead body back to base. Prisoners also increase by one ticket but to all currently connected players.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_118_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\medical_gui\ui\bodybag.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Dead player body:&lt;/marker&gt;&lt;br/&gt; Any player can retrieve dead player body by:&lt;br/&gt; - &lt;img image='\z\ace\addons\medical_treatment\ui\bodybag_ca.paa' width='13' height='13'/&gt; Putting dead body in a body bag. Watch out if your vehicle get destroyed, all body bag will be lost!&lt;br/&gt; - Carry it to the logistic point&lt;br/&gt; - Interact with the logistic point&lt;br/&gt; - &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='13' height='13'/&gt; Select "Get tickets from body bag or prisoner"&lt;br/&gt; The ticket from the body bag will go to the player owned the dead body (even if he is not connected).&lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\EditorPreviews_F_Orange\Data\CfgVehicles\Land_Bodybag_01_black_F.jpg' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\captives\UI\handcuff_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Prisoners:&lt;/marker&gt;&lt;br/&gt; Prisoners &lt;img image='\z\ace\addons\captives\UI\Surrender_ca.paa' width='13' height='13'/&gt; follow the same process as dead player body without the need of body bag. The prisonner need to be alive but it could be unconcious.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_106_co.paa' width='355' height='200'/&gt;</Original>
+                <Original>&lt;img image='\a3\Ui_F_Curator\Data\CfgMarkers\kia_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Introduction:&lt;/marker&gt;&lt;br/&gt; By default, each player has a limited number of respawn tickets. On first join, you get the default number of tickets (20). After, each time you respawn, your number of tickets will decrease by one and a kill in action (KIA) marker will appear after 10 minutes.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_104_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Get new tickets:&lt;/marker&gt;&lt;br/&gt; Players can increase by one ticket if they retrieve their dead body back to base. Prisoners also increase by one ticket but to all currently connected players.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_118_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\medical_gui\ui\bodybag.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Dead player body:&lt;/marker&gt;&lt;br/&gt; Any player can retrieve dead player body by:&lt;br/&gt; - &lt;img image='\z\ace\addons\medical_treatment\ui\bodybag_ca.paa' width='13' height='13'/&gt; Putting dead body in a body bag. Watch out if your vehicle get destroyed, all body bag will be lost!&lt;br/&gt; - Carry it to the logistic point&lt;br/&gt; - Interact with the logistic point&lt;br/&gt; - &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='13' height='13'/&gt; Select "Get tickets from body bag or prisoner"&lt;br/&gt; The ticket from the body bag will go to the player owned the dead body (even if he is not connected). Dead body can also be directly processed. &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\EditorPreviews_F_Orange\Data\CfgVehicles\Land_Bodybag_01_black_F.jpg' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\captives\UI\handcuff_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Prisoners:&lt;/marker&gt;&lt;br/&gt; Prisoners &lt;img image='\z\ace\addons\captives\UI\Surrender_ca.paa' width='13' height='13'/&gt; follow the same process as dead player body without the need of body bag. The prisonner need to be alive but it could be unconcious.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_106_co.paa' width='355' height='200'/&gt;</Original>
                 <German>&lt;img image='\a3\Ui_F_Curator\Data\CfgMarkers\kia_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Einführung:&lt;/marker&gt;&lt;br/&gt; Standardmäßig hat jeder Spieler eine begrenzte Anzahl von Respawn Tickets. Beim ersten Spawen erhält jeder Spieler standartmäßig 20 Tickets. Mit jedem Respawn wird ein Ticket abgezogen und eine Kill in Action (KIA) Markierung erscheint nach 10 Minuten.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_104_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Tickets auffüllen:&lt;/marker&gt;&lt;br/&gt; Spieler können ein Ticket dazu erhalten, wenn sie ihren Leiche zurück zur Basis bringen. Für jeden zur Basis gebrachten Gefangenen erhält jeder Spieler, welcher sich aktuell auf den Server befindet, ein Ticket dazu.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_118_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\medical_gui\ui\bodybag.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Leiche eines Spielers:&lt;/marker&gt;&lt;br/&gt; Jeder Spieler kann einen toten Spieler bergen, in dem er:&lt;br/&gt; - &lt;img image='\z\ace\addons\medical_treatment\ui\bodybag_ca.paa' width='13' height='13'/&gt; die Leiche eines Spielers in einen Leichensack packt. Achtung! Wenn das Fahrzeug mit Leichensäcken zerstört wird, sind diese verloren!&lt;br/&gt; - Trage die Leichensäcke zum Logistik Punkt&lt;br/&gt; - Interagiere mit dem Logistikpunkt&lt;br/&gt; - &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='13' height='13'/&gt; Wähle: "Erhalte ein Ticket durch Leichensack oder Gefangenen"&lt;br/&gt; Die Leiche des Spielers, welche im Leichensack war, erhält ein Ticket, auch wenn er aktuell nicht auf dem Server ist.&lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\EditorPreviews_F_Orange\Data\CfgVehicles\Land_Bodybag_01_black_F.jpg' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\captives\UI\handcuff_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Prisoners:&lt;/marker&gt;&lt;br/&gt; Gefangene &lt;img image='\z\ace\addons\captives\UI\Surrender_ca.paa' width='13' height='13'/&gt; folge den gleichen Schritten wie bei Leichen von Spielern, nur ohne Leichensack. Gefangene müssen am Leben sein, können aber Ohnmächtig sein.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_106_co.paa' width='355' height='200'/&gt;</German>
                 <Chinesesimp>&lt;img image='\a3\Ui_F_Curator\Data\CfgMarkers\kia_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;介绍:&lt;/marker&gt;&lt;br/&gt; 默认情况下, 每名玩家都有受限的重生票数。首次进入服务器时, 你会获得默认的重生票数(20)。此后, 每次重生都会使你的重生票数减一, 且地图上将于10分钟后出现阵亡(KIA)标记。&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_104_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;获得新的重生票数:&lt;/marker&gt;&lt;br/&gt; 玩家可以通过将他们的尸体带回基地, 来获得一枚重生票数。带回囚犯也可以为全体在线玩家每人增加一枚重生票数。&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_118_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\medical_gui\ui\bodybag.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;阵亡玩家的尸体:&lt;/marker&gt;&lt;br/&gt; 玩家都可以通过以下方式回收尸体:&lt;br/&gt; - &lt;img image='\z\ace\addons\medical_treatment\ui\bodybag_ca.paa' width='13' height='13'/&gt; 将尸体放进尸体袋。小心, 如果你的载具被摧毁, 其中所有尸体袋都会丢失!&lt;br/&gt; - 将尸体搬运到后勤点&lt;br/&gt; - 与后勤点互动&lt;br/&gt; - &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='13' height='13'/&gt; 选择"回收尸体袋或囚犯以获得重生票数"&lt;br/&gt; 获得的重生票数将会发放给该尸体对应的玩家(即使他不在线)。&lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\EditorPreviews_F_Orange\Data\CfgVehicles\Land_Bodybag_01_black_F.jpg' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\captives\UI\handcuff_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Prisoners:&lt;/marker&gt;&lt;br/&gt; 囚犯 &lt;img image='\z\ace\addons\captives\UI\Surrender_ca.paa' width='13' height='13'/&gt; 遵循与回收玩家尸体相同的流程, 但无需尸体袋。被回收的囚犯必须活着, 但可以出于昏迷状态。&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_106_co.paa' width='355' height='200'/&gt;</Chinesesimp>
                 <Czech>&lt;img image='\a3\Ui_F_Curator\Data\CfgMarkers\kia_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Úvod:&lt;/marker&gt;&lt;br/&gt; Ve výchozím nastavení má každý hráč omezený počet respawn tiketů. Při prvním připojení získáte výchozí počet tiketů (20). Poté, co se znovu objevíte, se váš počet lístků sníží o jeden a po 10 minutách se objeví značka zabití v akci (KIA).&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_104_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Získejte nové vstupenky:&lt;/marker&gt;&lt;br/&gt; Hráči mohou zvýšit o jeden tiket, pokud získají své mrtvé tělo zpět na základnu. Vězni se také zvyšují o jeden tiket, ale všem aktuálně připojeným hráčům.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_118_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\medical_gui\ui\bodybag.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Tělo mrtvého hráče:&lt;/marker&gt;&lt;br/&gt; Každý hráč může získat tělo mrtvého hráče:&lt;br/&gt; - &lt;img image='\z\ace\addons\medical_treatment\ui\bodybag_ca.paa' width='13' height='13'/&gt; Vkládání mrtvého těla do vaku na tělo. Dávejte pozor, pokud se vaše vozidlo zničí, všechno se ztratí!&lt;br/&gt; - Odneste to do logistického bodu.&lt;br/&gt; - Komunikujte s logistickým bodem&lt;br/&gt; - &lt;img image='\A3\Data_F_AoW\Logos\arma3_aow_logo_ca.paa' width='13' height='13'/&gt; Vyberte „Získejte lístky z vaku na tělo nebo vězně“&lt;br/&gt; Lístek z pytle na mrtvoly dostane mrtvé tělo hráče (i když není připojen).&lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\EditorPreviews_F_Orange\Data\CfgVehicles\Land_Bodybag_01_black_F.jpg' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\z\ace\addons\captives\UI\handcuff_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt; Vězni &lt;img image='\z\ace\addons\captives\UI\Surrender_ca.paa' width='13' height='13'/&gt; postupujte stejným způsobem jako tělo mrtvého hráče bez potřeby vaku na tělo. Vězeň musí být naživu, ale může být v bezvědomí.&lt;br/&gt;&lt;br/&gt; &lt;img image='a3\Missions_F_AoW\Data\Img\Artwork\Landscape\showcase_aow_picture_106_co.paa' width='355' height='200'/&gt;</Czech>

docs/InGame-documentation.md

@@ -65,7 +65,7 @@ Any player can retrieve dead player's body by:
    - Interact with the logistic point
    - Select "Get tickets from body bag or prisoner"
 
-The ticket from the body bag will go to the player owned the dead body (even if he is not connected). 
+The ticket from the body bag will go to the player owned the dead body (even if he is not connected). Dead body can also be directly processed.
 ### Prisoners:
 Prisoners follow the same process as dead player body without the need of body bag. The prisonner need to be alive but it could be unconcious.