Fix OICW grip offset

fholger · Aug 19, 2023 · 379793b · 379793b
1 parent 2f11cb3
commit 379793b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/FCData/scripts/Default/Entities/Weapons/AG36.lua b/FCData/scripts/Default/Entities/Weapons/AG36.lua
@@ -221,7 +221,8 @@ AG36MP = {
 	character	= "Objects/Weapons/ag36/ag36.cgf",
 
 	BoneRightHand = "Bone67",
-	BoneLeftArm = "Bone25",
+	BoneLeftHand = "Bone19",
+	RHOffsetAngles = {-2.0, -8.0, 2.0},
 
 	fireCanceled = 0,
 

diff --git a/FCData/scripts/Default/Entities/Weapons/OICW.lua b/FCData/scripts/Default/Entities/Weapons/OICW.lua
@@ -17,8 +17,8 @@ OICWSP = {
 
 	BoneRightHand = "Bone67",
 	BoneLeftHand = "Bone19",
-	RHOffset = {0.0, -0.08, 0.01},
-	RHOffsetAngles = {-33.0, 0.0, -15.0},
+	RHOffsetAngles = {-34.5, 18.0, -2.0},
+	DefaultIdle = "Idle22",
 
 	-- if the weapon supports zooming then add this...
 	ZoomActive = 0,												-- initially always 0
@@ -221,7 +221,9 @@ OICWMP = {
 	character	= "Objects/Weapons/oicw/oicw.cgf",
 
 	BoneRightHand = "Bone67",
-	BoneLeftArm = "Bone25",
+	BoneLeftHand = "Bone19",
+	RHOffsetAngles = {-34.5, 18.0, -2.0},
+	DefaultIdle = "Idle22",
 
 	fireCanceled = 0,
 

diff --git a/Sources/CryGame C++/Solution1/CryGame/WeaponClass.cpp b/Sources/CryGame C++/Solution1/CryGame/WeaponClass.cpp
@@ -827,14 +827,16 @@ bool CWeaponClass::InitModels()
 			if (m_rWeaponSystem.IsLeftHanded())
 				m_pCharacter->SetScale(Vec3d(-1,1,1));
 
+			const char* defaultIdle = "Idle11";
+			m_soWeaponClass->GetValue("DefaultIdle", defaultIdle);
 			// set keyframe 1
 			CryCharAnimationParams ccap;
 			ccap.fBlendInTime = 0;
 			ccap.fBlendOutTime = 0;
 			ccap.nLayerID = 0;
 			m_pCharacter->SetAnimationSpeed(1.0f);
-			m_pCharacter->SetDefaultIdleAnimation(0,"Idle11");
-			m_pCharacter->StartAnimation("Idle11",ccap);
+			m_pCharacter->SetDefaultIdleAnimation(0,defaultIdle);
+			m_pCharacter->StartAnimation(defaultIdle,ccap);
 			m_pCharacter->Update();
 			m_pCharacter->ForceUpdate(); 
 		}