Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dragging - Enabled dragging whilst limping (#9379)

Browse Source 
Enabled dragging whilst limping

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
This commit is contained in:
johnb432 2023-09-19 04:43:10 +02:00 committed by GitHub
parent ad5d351474
commit 748f9aff31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 76 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/dragging/CfgMovesBasic.hpp
View File

@ -7,6 +7,9 @@ class CfgMovesBasic {
class Actions { class Actions {
class MoveWithInjuredManDragger; class MoveWithInjuredManDragger;
class MoveWithInjuredManDraggerRfl: MoveWithInjuredManDragger { class MoveWithInjuredManDraggerRfl: MoveWithInjuredManDragger {
LimpB = "ace_dragging_rifle_limpB";
LimpLB = "ace_dragging_rifle_limpB";
LimpRB = "ace_dragging_rifle_limpB";
Up = "amovpercmstpsraswrfldnon"; Up = "amovpercmstpsraswrfldnon";
}; };
@ -19,6 +22,9 @@ class CfgMovesBasic {
grabDrag = "ace_dragging_static"; grabDrag = "ace_dragging_static";
grabCarry = "Helper_SwitchToCarrynon_pst"; grabCarry = "Helper_SwitchToCarrynon_pst";
HandGunOn = "ace_dragging_static"; HandGunOn = "ace_dragging_static";
LimpB = "ace_dragging_limpB";
LimpLB = "ace_dragging_limpB";
LimpRB = "ace_dragging_limpB";
PlayerSlowB = "ace_dragging"; PlayerSlowB = "ace_dragging";
PlayerSlowLB = "ace_dragging"; PlayerSlowLB = "ace_dragging";
PlayerSlowRB = "ace_dragging"; PlayerSlowRB = "ace_dragging";

127
addons/dragging/CfgMovesMaleSdr.hpp
View File

@ -2,8 +2,6 @@ class CfgMovesMaleSdr: CfgMovesBasic {
class InjuredMovedBase; class InjuredMovedBase;
class AgonyBaseRfl; class AgonyBaseRfl;
class StandBase; class StandBase;
class AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_1;
class DraggerBase;
class States { class States {
class AcinPknlMstpSnonWnonDnon_AcinPercMrunSnonWnonDnon: InjuredMovedBase { class AcinPknlMstpSnonWnonDnon_AcinPercMrunSnonWnonDnon: InjuredMovedBase {
@ -14,59 +12,71 @@ class CfgMovesMaleSdr: CfgMovesBasic {
speed = -10; // 1/10 speed = -10; // 1/10
}; };
class AmovPercMstpSrasWpstDnon: StandBase { // For dragging with rifles
ConnectTo[] = { class AmovPercMstpSlowWrflDnon;
"AmovPercMstpSrasWpstDnon", class AmovPercMstpSrasWrflDnon: AmovPercMstpSlowWrflDnon {
0.02, ConnectTo[] += {
"AovrPercMstpSrasWpstDf", "ace_dragging_rifle_limpB",
0.025,
"AmovPercMstpSrasWpstDnon_AidlPercMstpSlowWpstDnon",
0.0099999998,
"PistolMagazineReloadStand",
0.1,
"AmovPercMstpSrasWpstDnon_AmovPercMstpSlowWpstDnon",
0.02,
"AmovPercMstpSrasWpstDnon_AmovPercMstpSrasWrflDnon",
0.02,
"AmovPercMstpSrasWpstDnon_AwopPercMstpSoptWbinDnon",
0.02,
"AmovPercMstpSrasWpstDnon_AmovPercMstpSnonWnonDnon",
0.02,
"AmovPercMstpSrasWpstDnon_SaluteIn",
0.02,
"AwopPercMstpSgthWpstDnon_Part1",
0.1,
"AmovPercMstpSrasWpstDnon_AinvPknlMstpSnonWnonDnon",
0.02,
"AmovPercMstpSrasWpstDnon_AmovPercMstpSrasWlnrDnon",
0.02,
"AmovPercMstpSrasWpstDnon_AadjPercMstpSrasWpstDup",
0.02,
"AmovPercMstpSrasWpstDnon_AadjPercMstpSrasWpstDdown",
0.02,
"AmovPercMstpSrasWpstDnon_AadjPercMstpSrasWpstDleft",
0.02,
"AmovPercMstpSrasWpstDnon_AadjPercMstpSrasWpstDright",
0.02,
"AmovPercMstpSrasWpstDnon_AmovPercMstpSrasWpstDnon_gear",
0.02,
"Acts_starterPistol_in",
0.001,
"Acts_PistolRaisedStand_Default",
1,
"ace_dragging",
0.1 0.1
}; };
}; };
class AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_1;
class AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_2: AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_1 { class AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_2: AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_1 {
aiming = "aimingDefault"; aiming = "aimingDefault";
aimingBody = "aimingUpDefault"; aimingBody = "aimingUpDefault";
aimPrecision = 5; // default: 1 aimPrecision = 5; // default: 1
ConnectTo[] += {
"ace_dragging_rifle_limpB",
0.1
};
InterpolateTo[] += {
"ace_dragging_rifle_limpB",
0.1
};
}; };
class AcinPknlMstpSrasWrflDnon: AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_1 {
ConnectTo[] += {
"ace_dragging_rifle_limpB",
0.1
};
InterpolateTo[] += {
"ace_dragging_rifle_limpB",
0.1
};
};
class AcinPknlMwlkSrasWrflDb: AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_1 {
ConnectTo[] += {
"ace_dragging_rifle_limpB",
0.1
};
InterpolateTo[] += {
"ace_dragging_rifle_limpB",
0.1
};
};
class ace_dragging_rifle_limpB: AcinPknlMwlkSrasWrflDb {
speed = 0.5;
};
// For dragging with pistols
class AmovPercMstpSrasWpstDnon: StandBase {
ConnectTo[] += {
"ace_dragging",
0.1,
"ace_dragging_limpB",
0.1,
"ace_dragging_static",
0.1
};
};
class DraggerBase;
class ace_dragging: DraggerBase { class ace_dragging: DraggerBase {
actions = "ace_MoveWithInjuredManDraggerPst"; actions = "ACE_MoveWithInjuredManDraggerPst";
aiming = "aimingPistol"; aiming = "aimingPistol";
aimingBody = "aimingPistol"; aimingBody = "aimingPistol";
aimPrecision = 2; // default: 1 aimPrecision = 2; // default: 1
@ -75,14 +85,24 @@ class CfgMovesMaleSdr: CfgMovesBasic {
ConnectTo[] = { ConnectTo[] = {
"ace_dragging", "ace_dragging",
0.1, 0.1,
"ace_dragging_limpB",
0.1,
"ace_dragging_drop", "ace_dragging_drop",
0.2 0.2,
"ace_dragging_static",
0.1
}; };
disableWeapons = 0; disableWeapons = 0;
duty = 0.6; duty = 0.6;
enableBinocular = 0; enableBinocular = 0;
file = QPATHTO_T(anim\ace_dragging.rtm); file = QPATHTO_T(anim\ace_dragging.rtm);
InterpolateTo[] = { InterpolateTo[] = {
"ace_dragging",
0.1,
"ace_dragging_limpB",
0.1,
"ace_dragging_drop",
0.2,
"ace_dragging_static", "ace_dragging_static",
0.1 0.1
}; };
@ -93,20 +113,11 @@ class CfgMovesMaleSdr: CfgMovesBasic {
turnSpeed = 0.5; turnSpeed = 0.5;
}; };
class ace_dragging_limpB: ace_dragging {
speed = 0.5;
};
class ace_dragging_static: ace_dragging { class ace_dragging_static: ace_dragging {
ConnectTo[] = {
"ace_dragging",
0.1,
"ace_dragging_drop",
0.2
};
InterpolateTo[] = {
"ace_dragging",
0.1,
"ace_dragging_drop",
0.2
};
looped = 1;
speed = 0; speed = 0;
}; };

2
addons/dragging/script_component.hpp
View File

@ -18,7 +18,7 @@
#define MAX_LOAD_DISTANCE 5 #define MAX_LOAD_DISTANCE 5
#define DRAG_ANIMATIONS ["amovpercmstpslowwrfldnon_acinpknlmwlkslowwrfldb_2", "amovpercmstpsraswpstdnon_acinpknlmwlksnonwpstdb_2", "amovpercmstpsnonwnondnon_acinpknlmwlksnonwnondb_2", "acinpknlmstpsraswrfldnon", "acinpknlmstpsnonwpstdnon", "acinpknlmstpsnonwnondnon", "acinpknlmwlksraswrfldb", "acinpknlmwlksnonwnondb", "ace_dragging", "ace_dragging_static", "ace_dragging_drop"] #define DRAG_ANIMATIONS ["amovpercmstpslowwrfldnon_acinpknlmwlkslowwrfldb_2", "amovpercmstpsraswpstdnon_acinpknlmwlksnonwpstdb_2", "amovpercmstpsnonwnondnon_acinpknlmwlksnonwnondb_2", "acinpknlmstpsraswrfldnon", "acinpknlmstpsnonwpstdnon", "acinpknlmstpsnonwnondnon", "acinpknlmwlksraswrfldb", "acinpknlmwlksnonwnondb", "ace_dragging_rifle_limpb", "ace_dragging", "ace_dragging_limpb", "ace_dragging_static", "ace_dragging_drop"]
#define CARRY_ANIMATIONS ["acinpercmstpsnonwnondnon", "acinpknlmstpsnonwnondnon_acinpercmrunsnonwnondnon"] #define CARRY_ANIMATIONS ["acinpercmstpsnonwnondnon", "acinpknlmstpsnonwnondnon_acinpercmrunsnonwnondnon"]
#define MAX_DRAGGED_ITEMS 3 #define MAX_DRAGGED_ITEMS 3