2.7.1 fixes, 2.8 layouts

2.7
- g5 camo attachment fixed
- m50 offsets C fixed
- m50a3 melees removed for now
- m50a3 wont try to cock after releasing slide
- m50a3 reload speed reduced
- ak490 layouts use stockbash melee now
- gungame put into patch

2.8
- X83 Irons, 4x scope layouts
- VSK Irons, 8x scope layouts
- FSSG-50, X83 size increased
- FSSG-50, X83 scope time increased

BWBP_APC_Pro/Classes/R9000EWeaponParamsClassic.uc

@@ -98,6 +98,7 @@ defaultproperties
 		YRandFactor=0.10000
 		DeclineDelay=1.25
 		DeclineTime=1.000000
+		bViewDecline=True
 	End Object
 
 	//=================================================================

BWBP_SKC_Pro/Classes/AK490BattleRifle.uc

@@ -35,6 +35,7 @@ simulated function OnWeaponParamsChanged()
 	{
 		bLoaded=false;
 		bHasKnife=false;
+		AK490MeleeFire(MeleeFireMode).SwitchBladeMode(false);
 	}
 }
 

BWBP_SKC_Pro/Classes/AS50WeaponParamsClassic.uc

@@ -26,6 +26,7 @@ defaultproperties
 		FireSound=(Sound=SoundGroup'BWBP_SKC_Sounds.AS50.AS50-Fire',Pitch=1.000000,Volume=5.100000,Slot=SLOT_Interact,bNoOverride=False)
 		Recoil=2300.000000
 		Chaos=1.500000
+		PushbackForce=255.000000
 		Inaccuracy=(X=2,Y=2)
 		BotRefireRate=0.300000
 		WarnTargetPct=0.050000
@@ -86,7 +87,7 @@ defaultproperties
 		PlayerJumpFactor=0.750000
 		InventorySize=10
 		SightMoveSpeedFactor=0.500000
-		SightingTime=0.600000
+		SightingTime=0.700000
 		bNeedCock=True
 		MagAmmo=10
 		//SightOffset=(X=-5.000000,Y=25.000000,Z=10.300000)

BWBP_SKC_Pro/Classes/AS50WeaponParamsTactical.uc

@@ -104,7 +104,7 @@ defaultproperties
 		PlayerSpeedFactor=0.9
         PlayerJumpFactor=0.9
         DisplaceDurationMult=1.25
-		InventorySize=7
+		InventorySize=8
         SightMoveSpeedFactor=0.35
 		SightingTime=0.55	
 		ScopeScale=0.7

BWBP_SKC_Pro/Classes/FG50WeaponParamsTactical.uc

@@ -68,7 +68,7 @@ defaultproperties
 	//AP rounds
 	Begin Object Class=InstantEffectParams Name=TacticalPriStandardEffectParams_AP
 		TraceRange=(Min=15000.000000,Max=15000.000000)
-		Damage=100 // .50 AP
+		Damage=95 // .50 AP
         HeadMult=3
         LimbMult=0.75
 		DamageType=Class'BWBP_SKC_Pro.DT_FG50Torso'
@@ -98,7 +98,7 @@ defaultproperties
 
 	Begin Object Class=InstantEffectParams Name=TacticalPriControlledEffectParams_AP
 		TraceRange=(Min=15000.000000,Max=15000.000000)
-		Damage=100 // .50 AP
+		Damage=95 // .50 AP
         HeadMult=3
         LimbMult=0.75
 		DamageType=Class'BWBP_SKC_Pro.DT_FG50Torso'

BWBP_SKC_Pro/Classes/G51WeaponParamsClassic.uc

@@ -134,6 +134,18 @@ defaultproperties
 		FireAnim="FireGrenade"	
 	FireEffectParams(0)=GrenadeEffectParams'ClassicSecondaryEffectParams_Sensor'
 	End Object
+
+	//Scope
+	Begin Object Class=FireEffectParams Name=ClassicSecondaryEffectParams_Scope
+		BotRefireRate=0.300000
+	End Object
+
+	Begin Object Class=FireParams Name=ClassicSecondaryFireParams_Scope
+		TargetState="Scope"
+		FireInterval=0.200000
+		AmmoPerFire=0
+		FireEffectParams(0)=FireEffectParams'ClassicSecondaryEffectParams_Scope'
+	End Object	
 
 	//=================================================================
 	// RECOIL
@@ -262,9 +274,41 @@ defaultproperties
 		AltFireParams(0)=FireParams'ClassicSecondaryFireParams_HE'
 	End Object
 
+	Begin Object Class=WeaponParams Name=ClassicParams_4XScope
+		//Layout core
+		Weight=5
+		LayoutName="4X Scope"
+		//Attachments
+		WeaponBoneScales(0)=(BoneName="CarryHandle",Slot=54,Scale=1f)
+		WeaponBoneScales(1)=(BoneName="HoloSightUpper",Slot=55,Scale=0f)
+		WeaponBoneScales(2)=(BoneName="HoloSightLower",Slot=56,Scale=0f)
+		SightOffset=(X=-0.500000,Y=-0.01000,Z=3.100000)
+		GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_ACOG',BoneName="tip",Scale=0.1,AugmentOffset=(x=-25,y=-4.6,z=0),AugmentRot=(Pitch=32768,Yaw=0,Roll=-16384))
+		ScopeViewTex=Texture'BW_Core_WeaponTex.Attachment.SKAR-Scope'
+		// Zoom
+		ZoomType=ZT_Fixed
+		MaxZoom=4
+		// ADS handling
+		SightingTime=0.35 //+0.5
+		SightMoveSpeedFactor=0.500000
+		//Function
+		InventorySize=6
+		bNeedCock=True
+		WeaponModes(0)=(ModeName="Semi",ModeID="WM_SemiAuto",Value=1.000000)
+		WeaponModes(1)=(ModeName="Burst",ModeID="WM_BigBurst",Value=3.000000)
+		WeaponModes(2)=(ModeName="Auto",ModeID="WM_FullAuto",bUnavailable=True)
+		InitialWeaponMode=1
+		ViewOffset=(X=5.000000,Y=6.000000,Z=-2.500000)
+		RecoilParams(0)=RecoilParams'ClassicRecoilParams'
+		AimParams(0)=AimParams'ClassicAimParams'
+		FireParams(0)=FireParams'ClassicPrimaryFireParams'
+		AltFireParams(0)=FireParams'ClassicSecondaryFireParams_Scope'
+	End Object
+
 	Layouts(0)=WeaponParams'ClassicParams_HoloChaff'
 	Layouts(1)=WeaponParams'ClassicParams_NoCarrySensor'
 	Layouts(2)=WeaponParams'ClassicParams_IronsHE'
+	Layouts(3)=WeaponParams'ClassicParams_4XScope'
 
 	//Camos =====================================
 	Begin Object Class=WeaponCamo Name=G51_Black

BWBP_SKC_Pro/Classes/G51WeaponParamsComp.uc

@@ -105,6 +105,18 @@ defaultproperties
 		FireAnim="FireGrenade"	
 	FireEffectParams(0)=GrenadeEffectParams'ArenaSecondaryEffectParams_Sensor'
 	End Object
+
+	//Scope
+	Begin Object Class=FireEffectParams Name=ArenaSecondaryEffectParams_Scope
+		BotRefireRate=0.300000
+	End Object
+
+	Begin Object Class=FireParams Name=ArenaSecondaryFireParams_Scope
+		TargetState="Scope"
+		FireInterval=0.200000
+		AmmoPerFire=0
+		FireEffectParams(0)=FireEffectParams'ArenaSecondaryEffectParams_Scope'
+	End Object	
 
 	//=================================================================
 	// RECOIL
@@ -231,9 +243,38 @@ defaultproperties
 		AltFireParams(0)=FireParams'ArenaSecondaryFireParams_HE'
 	End Object
 
+	Begin Object Class=WeaponParams Name=ArenaParams_3XScope
+		//Layout core
+		Weight=5
+		LayoutName="3X Scope"
+		//Attachments
+		WeaponBoneScales(0)=(BoneName="CarryHandle",Slot=54,Scale=1f)
+		WeaponBoneScales(1)=(BoneName="HoloSightUpper",Slot=55,Scale=0f)
+		WeaponBoneScales(2)=(BoneName="HoloSightLower",Slot=56,Scale=0f)
+		SightOffset=(X=-0.500000,Y=-0.01000,Z=3.100000)
+		GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_ACOG',BoneName="tip",Scale=0.1,AugmentOffset=(x=-25,y=-4.6,z=0),AugmentRot=(Pitch=32768,Yaw=0,Roll=-16384))
+		ScopeViewTex=Texture'BW_Core_WeaponTex.Attachment.SKAR-Scope'
+		// Zoom
+		ZoomType=ZT_Fixed
+		MaxZoom=3
+		// ADS handling
+		SightingTime=0.40 //+0.5
+		SightMoveSpeedFactor=0.35
+		//Function
+		ReloadAnimRate=1.25
+		CockAnimRate=1.25
+		MagAmmo=30
+        InventorySize=6
+		RecoilParams(0)=RecoilParams'ArenaRecoilParams'
+		AimParams(0)=AimParams'ArenaAimParams'
+		FireParams(0)=FireParams'ArenaPrimaryFireParams'
+		AltFireParams(0)=FireParams'ArenaSecondaryFireParams_Scope'
+	End Object
+
 	Layouts(0)=WeaponParams'ArenaParams_Chaff'
 	Layouts(1)=WeaponParams'ArenaParams_Sensor'
 	Layouts(2)=WeaponParams'ArenaParams_HE'
+	Layouts(3)=WeaponParams'ArenaParams_3XScope'
 
 	//Camos =====================================
 	Begin Object Class=WeaponCamo Name=G51_Black

BWBP_SKC_Pro/Classes/G51WeaponParamsRealistic.uc

@@ -133,6 +133,18 @@ defaultproperties
 		FireAnim="FireGrenade"	
 	FireEffectParams(0)=GrenadeEffectParams'RealisticSecondaryEffectParams_Sensor'
 	End Object
+
+	//Scope
+	Begin Object Class=FireEffectParams Name=RealisticSecondaryEffectParams_Scope
+		BotRefireRate=0.300000
+	End Object
+
+	Begin Object Class=FireParams Name=RealisticSecondaryFireParams_Scope
+		TargetState="Scope"
+		FireInterval=0.200000
+		AmmoPerFire=0
+		FireEffectParams(0)=FireEffectParams'RealisticSecondaryEffectParams_Scope'
+	End Object	
 
 	//=================================================================
 	// RECOIL
@@ -154,6 +166,22 @@ defaultproperties
 		bViewDecline=True
 	End Object
 
+	Begin Object Class=RecoilParams Name=RealisticRecoilParams_Scope
+		XCurve=(Points=(,(InVal=0.400000,OutVal=0.250000),(InVal=0.600000,OutVal=0.300000),(InVal=1.000000,OutVal=0.300000)))
+		YCurve=(Points=(,(InVal=0.400000,OutVal=0.300000),(InVal=0.700000,OutVal=0.350000),(InVal=1.000000,OutVal=0.400000)))
+		YawFactor=0.150000
+		XRandFactor=0.150000
+		YRandFactor=0.150000
+		MaxRecoil=2800
+		DeclineTime=0.725000 //
+		DeclineDelay=0.075000
+		ViewBindFactor=0.200000
+		ADSViewBindFactor=1.000000 //
+		HipMultiplier=1.000000
+		CrouchMultiplier=0.700000
+		bViewDecline=True
+	End Object
+
 	//=================================================================
 	// AIM
 	//=================================================================
@@ -265,9 +293,42 @@ defaultproperties
 		AltFireParams(0)=FireParams'RealisticSecondaryFireParams_HE'
 	End Object
 
+	Begin Object Class=WeaponParams Name=RealisticParams_4XScope
+		//Layout core
+		Weight=5
+		LayoutName="4X Scope"
+		//Attachments
+		WeaponBoneScales(0)=(BoneName="CarryHandle",Slot=54,Scale=1f)
+		WeaponBoneScales(1)=(BoneName="HoloSightUpper",Slot=55,Scale=0f)
+		WeaponBoneScales(2)=(BoneName="HoloSightLower",Slot=56,Scale=0f)
+		SightOffset=(X=-0.500000,Y=-0.01000,Z=3.100000)
+		GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_ACOG',BoneName="tip",Scale=0.1,AugmentOffset=(x=-25,y=-4.6,z=0),AugmentRot=(Pitch=32768,Yaw=0,Roll=-16384))
+		ScopeViewTex=Texture'BW_Core_WeaponTex.Attachment.SKAR-Scope'
+		// Zoom
+		ZoomType=ZT_Fixed
+		MaxZoom=4
+		// ADS handling
+		SightingTime=0.40 //+0.5
+		SightMoveSpeedFactor=0.500000
+		//Function
+		InventorySize=6
+		WeaponPrice=1200
+		bMagPlusOne=True
+		WeaponModes(0)=(ModeName="Semi-Auto",ModeID="WM_SemiAuto",Value=1.000000)
+		WeaponModes(1)=(ModeName="Burst Fire",ModeID="WM_BigBurst",Value=3.000000)
+		WeaponModes(2)=(ModeName="Full Auto",ModeID="WM_FullAuto",bUnavailable=True)
+		InitialWeaponMode=1
+		WeaponName="G51 5.56mm Carbine (4X)"
+		RecoilParams(0)=RecoilParams'RealisticRecoilParams_Scope'
+		AimParams(0)=AimParams'RealisticAimParams'
+		FireParams(0)=FireParams'RealisticPrimaryFireParams'
+		AltFireParams(0)=FireParams'RealisticSecondaryFireParams_Scope'
+	End Object
+
 	Layouts(0)=WeaponParams'RealisticParams_Chaff'
 	Layouts(1)=WeaponParams'RealisticParams_Sensor'
 	Layouts(2)=WeaponParams'RealisticParams_HE'
+	Layouts(3)=WeaponParams'RealisticParams_4XScope'
 
 	//Camos =====================================
 	Begin Object Class=WeaponCamo Name=G51_Black

BWBP_SKC_Pro/Classes/VSKWeaponParamsClassic.uc

@@ -105,19 +105,39 @@ defaultproperties
 	Begin Object Class=WeaponParams Name=ClassicParams
 		Weight=30
 		InventorySize=7
-		SightMoveSpeedFactor=0.500000
 		bNeedCock=True
 		MagAmmo=10
-		//SightOffset=(X=-20.000000,Y=-1.250000,Z=31.000000)
-		//ViewOffset=(X=10.000000,Y=15.000000,Z=-27.000000)
-		SightPivot=(Pitch=600,Roll=-1024)
+		//Attachments
+		GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_8XScope',BoneName="tip",Scale=0.1,AugmentOffset=(x=-20,y=-2,z=0),AugmentRot=(Pitch=32768,Yaw=0,Roll=-16384))
+		SightOffset=(X=25.00,Y=0.40,Z=11.2)
+		SightMoveSpeedFactor=0.500000
+		SightingTime=0.450000
+		//Function
+		SightPivot=(Pitch=0,Roll=0)
 		ZoomType=ZT_Smooth
 		RecoilParams(0)=RecoilParams'ClassicRecoilParams'
 		AimParams(0)=AimParams'ClassicAimParams'
 		FireParams(0)=FireParams'ClassicPrimaryFireHeavyParams'
 		FireParams(1)=FireParams'ClassicPrimaryFireStandardParams'
 	End Object
+
+	Begin Object Class=WeaponParams Name=ClassicParams_Irons
+		Weight=30
+		InventorySize=7
+		SightMoveSpeedFactor=0.500000
+		bNeedCock=True
+		MagAmmo=10
+		SightOffset=(X=20,Y=0.5,Z=3.2)
+		SightPivot=(Pitch=0,Roll=0)
+		ZoomType=ZT_Irons
+		RecoilParams(0)=RecoilParams'ClassicRecoilParams'
+		AimParams(0)=AimParams'ClassicAimParams'
+		FireParams(0)=FireParams'ClassicPrimaryFireHeavyParams'
+		FireParams(1)=FireParams'ClassicPrimaryFireStandardParams'
+	End Object
+
 	Layouts(0)=WeaponParams'ClassicParams'
+	Layouts(1)=WeaponParams'ClassicParams_Irons'
 
 	//Camos ==========================================
 	Begin Object Class=WeaponCamo Name=VSK_Gray

BWBP_SKC_Pro/Classes/X82Rifle.uc

@@ -15,6 +15,7 @@ var   Pawn			Target;
 var   float			TargetTime;
 var   float			LastSendTargetTime;
 var   vector		TargetLocation;
+var()	bool		bIsIrons;
 
 var() BUtil.FullSound	NVOnSound;	// Sound when activating NV/Meat mode
 var() BUtil.FullSound	NVOffSound; // Sound when deactivating NV/Meat mode
@@ -25,6 +26,24 @@ replication
 		Target, bMeatVision;
 }
 
+simulated function OnWeaponParamsChanged()
+{
+    super.OnWeaponParamsChanged();
+
+	assert(WeaponParams != None);
+
+	bIsIrons=false;
+
+	if (InStr(WeaponParams.LayoutTags, "irons") != -1)
+	{
+		bIsIrons=true;
+		SetBoneRotation('RearSightP', rot(15000,0,0));
+		SetBoneRotation('FrontSight', rot(0,0,16000));
+	}
+}
+
+
+
 function InitWeaponFromTurret(BallisticTurret Turret)
 {
 	bNeedCock = false;
@@ -204,6 +223,7 @@ simulated event WeaponTick(float DT)
 
 	super.WeaponTick(DT);
 
+
 	if (bScopeView)
 	{
 		BFireMode[0].BrassOffset = vect(0,-40,0);