From 2f3c43572be25e0cb5158490c4d5e4ca3aef2f30 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Thu, 14 Dec 2017 15:51:14 +0100
Subject: [PATCH] dedmen's model fixes
---
addons/tripod/CfgVehicles.hpp | 10 +++++-----
addons/tripod/XEH_postInit.sqf | 2 +-
addons/tripod/data/model.cfg | 20 ++++++++++++--------
addons/tripod/data/sniper_tripod.p3d | Bin 1105772 -> 1121844 bytes
addons/tripod/functions/fnc_place.sqf | 2 +-
5 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/addons/tripod/CfgVehicles.hpp b/addons/tripod/CfgVehicles.hpp
index 43239506c7..10d43cb87e 100644
--- a/addons/tripod/CfgVehicles.hpp
+++ b/addons/tripod/CfgVehicles.hpp
@@ -54,7 +54,7 @@ class CfgVehicles {
class slide_down_tripod {
source = "user";
animPeriod = 0.02;
- initPhase = 0;
+ initPhase = 0.5;
minValue = 0;
maxValue = 1;
};
@@ -65,15 +65,15 @@ class CfgVehicles {
class ACE_Actions {
class ACE_MainActions {
- selection = "";
+ selection = "interaction_point";
distance = 5;
- condition = "true";
+ condition = "(true)";
class ACE_Pickup {
selection = "";
displayName = CSTRING(PickUp);
distance = 5;
- condition = "true";
+ condition = "(true)";
statement = QUOTE([ARR_2(_player,_target)] call FUNC(pickup));
showDisabled = 0;
exceptions[] = {};
@@ -85,7 +85,7 @@ class CfgVehicles {
selection = "";
displayName = CSTRING(Adjust);
distance = 5;
- condition = "true";
+ condition = "(true)";
//wait a frame to handle "Do When releasing action menu key" option:
statement = QUOTE([ARR_2({_this call FUNC(adjust)}, [ARR_2(_player,_target)])] call CBA_fnc_execNextFrame);
showDisabled = 0;
diff --git a/addons/tripod/XEH_postInit.sqf b/addons/tripod/XEH_postInit.sqf
index 86fda03b48..9fbfaa6c8d 100644
--- a/addons/tripod/XEH_postInit.sqf
+++ b/addons/tripod/XEH_postInit.sqf
@@ -4,7 +4,7 @@ if (!hasInterface) exitWith {};
GVAR(adjustPFH) = -1;
-GVAR(height) = 0;
+GVAR(height) = 0.5;
// Cancel adjustment if interact menu opens
["ace_interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call CBA_fnc_addEventHandler;
diff --git a/addons/tripod/data/model.cfg b/addons/tripod/data/model.cfg
index ee81d26c8e..3770ac0f82 100644
--- a/addons/tripod/data/model.cfg
+++ b/addons/tripod/data/model.cfg
@@ -1,10 +1,10 @@
-class CfgSkeletons
-{
+class CfgSkeletons {
class Default {
isDiscrete = 1;
skeletonInherit = "";
skeletonBones[] = {};
};
+
class ace_snipertripod_skeleton: Default {
isDiscrete = 1;
skeletonInherit = "Default";
@@ -13,21 +13,25 @@ class CfgSkeletons
"leg_1","tripod",
"leg_2","tripod",
"leg_3","tripod",
+ "interaction_point","tripod",
"leg_slide_1","leg_1",
"leg_slide_2","leg_2",
"leg_slide_3","leg_3"
- };
+ };
};
};
+
class CfgModels {
class Default {
sectionsInherit = "";
sections[] = {};
skeletonName = "";
};
+
class sniper_tripod: Default {
skeletonName = "ace_snipertripod_skeleton";
sectionsInherit = "Default";
+
class animations {
class slide_down_tripod {
type = "translation";
@@ -40,25 +44,25 @@ class CfgModels {
maxValue = 1;
sourceAddress = "clamp";
offset0 = 0;
- offset1 = 0.855;
+ offset1 = 0.855;
};
class retract_leg_1: slide_down_tripod {
selection = "leg_slide_1";
begin = "slide_end_1";
end = "slide_start_1";
offset0 = 0;
- offset1 = -0.95;
+ offset1 = -0.95;
};
class retract_leg_2: retract_leg_1 {
selection = "leg_slide_2";
begin = "slide_end_2";
- end = "slide_start_2";
+ end = "slide_start_2";
};
class retract_leg_3: retract_leg_2 {
selection = "leg_slide_3";
begin = "slide_end_3";
- end = "slide_start_3";
- };
+ end = "slide_start_3";
+ };
};
};
};
diff --git a/addons/tripod/data/sniper_tripod.p3d b/addons/tripod/data/sniper_tripod.p3d
index 2cb6e43f2fd870f4430cd329326e41f85ac501a0..66931c638214113b4da93874766240bafd66255b 100644
GIT binary patch
delta 10424
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
delta 2670
zcmc&$U2IfE6rQ{7LYLjP+tPw<u_<h&P=4BGO9Kd<%TJ*KOIM+#i4UfPrXbL+r6w3d
z_aY?)#1sJ;NwJhDMu;VvZCML+YvKcnkceo+kf@mOU@San6e9#Z-`u&^OB3URF-~&k
zeBb$-GiPTv+kau{NMea6w5n#QrZF~Vr)RfE8}PVx)rq8()a~N4`|bn(cI!&n(%AG&
z8LLYXCxmPL*>Bv{ng~B|FCa8Yq6(qE>^dg&x!zV0zU(a&y;Xj9{7i|rSQEx(R~n*q
zJGvavZ;Eh>Ypn>s=ba&p5r1-Lb(4!Ei3He9GKOR<NeYRFWE_c?#7B}!k`}LSN?&y*
ziMkW{MgBYyx#d1C3X*-DBD~*K9*^YtKRF-uGsa3ud?Z-k&*@08gPy?^>x(MEZz|s0
zwKf5sQ_(f_YxgnUvG>V^;1eyr>5U=qAE$OyvhAM1)hd5P@n=>3)fWyg{EhPWnE6q5
zO&MNN1uiZ8<HFG|x_QsmYx01P6u<Lvfjr>B^ZkkN%>lmu(0tk8eZ^NKg=B-ryMI{V
z%zs<)5tTphMqefJ56Ju|V~;DtGF9NPdk4Qgl$WS~@pN!BzC-rc((X#Tg|Fo97_K{*
zlL!Uw#(--_;gfq$OZz&q1NUxzqMtE?$If=X(;Ib?zrni(K8;=9_w~^HSK9f#=X!!)
zD(r3T34W{aPKvofcpk-E@B3~J9WZ>W;pyUk!chbr$=p|7H0%7(+1u^Ip|4WQiwVaS
zo<;Zr!bd4)wz9u|FNN<}TF*DGd@AU~g6y4S@5zk?op}9p-*E5TI(~9-Jl3G_TPDty
zj=`DhVph;O!s6=tX{DvBL!ZaCT*>G6E>-jP@vlCFH!FJ$#Q@)@7;)kTWfex=4X&&h
zth{)tc^D6}#(|e9?2Hjw)Sq=^jn7R_ftJCsCy}@SBsVxPZ00g!7)vHPh6LJN1|Lhn
zEeWCw4vZMHk{OGbhZibDv8DWF*OBUxTpp;?4;UL~bF&Gr<k*}|A=COo6V!2FDv65H
zag{Wi8yuC>&HKaZEQM73MyRFZE*X-TO<^*bHa9p*kCz;qvl241Y!B0M-E7ItO7i>(
zw!s|wL_5J*3R8N-_Lx)3u`?ONRB~-@a7-;va%|2@n8GB}GgZ3MX@6825N2?UE#Kxe
zR>2Q>vgK!m2^UD0+;oIame9NqKD#M4H#oWuNRG|f1u_e557W`aW0ISda38d1W*OXr
zSrtixWrW5=kva{;Tskf|U1GBoMp0~YgQN5e$+0<`Lgq}{!*pDCmgEM<`8w`1TN#jw
z(j}5(vr4U9w0yZ1ShKOAHBz;qsc~C?eW+sa>aff&n%O>VctX&4#nu-O8V?9QdXnPQ
zxp5g$1mJzb0gZ+*bZ9gKjjmzCJ)tpb_`soYOJK|mvG7B~4h%amw6>&WYow*QvAM0Z
zj9!hHl9iDurv2jeiHq48soErQbwWl?R5Mpw>!wJ{2KBh`=R?^^Q7O8h;(<`ZHX4c!
zBdcBvsjqb}f{f<%wYznQ45e)}*8;V5Yj|T@fOW_-tT<@v<A8Qz%V*h*LuKt*QC$To
vJvss1O51<r7bSgZzR6ZgjFz(l%l<#Nss*Z=H`K&0|K#^;@!x;;cW8eC0TWFR
diff --git a/addons/tripod/functions/fnc_place.sqf b/addons/tripod/functions/fnc_place.sqf
index 15fa4a295c..3c31f44f65 100644
--- a/addons/tripod/functions/fnc_place.sqf
+++ b/addons/tripod/functions/fnc_place.sqf
@@ -33,7 +33,7 @@ if (stance _unit == "STAND") then {
private _tripod = "ACE_TripodObject" createVehicle [0, 0, 0];
{
- _tripod animate [_x, 1];
+ _tripod animate [_x, 0.5];
} count ["slide_down_tripod", "retract_leg_1", "retract_leg_2", "retract_leg_3"];
[{