Merge branch 'release/2.7' into dev

BWBPAirstrikesPro/Classes/TargetDesignator.uc

@@ -158,7 +158,7 @@ simulated function WeaponTick(float DT)
 
 simulated function NewDrawWeaponInfo(Canvas C, float YPos)
 {
-	local float		ScaleFactor, XL, YL, YL2, SprintFactor;
+	local float		ScaleFactor, XL, YL, YL2;
 	local string	Temp;
 	local int i;
 	local byte StartMode;
@@ -244,22 +244,6 @@ simulated function NewDrawWeaponInfo(Canvas C, float YPos)
 			}
 		}
 	}
-
-	// This is pretty damn disgusting, but the weapon seems to be the only way we can draw extra info on the HUD
-	// Would be nice if someone could have a HUD function called along the inventory chain
-	if (SprintControl != None && SprintControl.Stamina < SprintControl.MaxStamina)
-	{
-		SprintFactor = SprintControl.Stamina / SprintControl.MaxStamina;
-		C.CurX = C.OrgX  + 5    * ScaleFactor * class'HUD'.default.HudScale;
-		C.CurY = C.ClipY - 330  * ScaleFactor * class'HUD'.default.HudScale;
-		if (SprintFactor < 0.2)
-			C.SetDrawColor(255, 0, 0);
-		else if (SprintFactor < 0.5)
-			C.SetDrawColor(64, 128, 255);
-		else
-			C.SetDrawColor(0, 0, 255);
-		C.DrawTile(Texture'Engine.MenuWhite', 200 * ScaleFactor * class'HUD'.default.HudScale * SprintFactor, 30 * ScaleFactor * class'HUD'.default.HudScale, 0, 0, 1, 1);
-	}
 }
 
 function bool ConsumeAmmo(int Mode, float load, optional bool bAmountNeededIsMax)

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_JCF_Pro/Classes/M99Attachment.Uc

@@ -131,7 +131,7 @@ defaultproperties
      TracerClass=Class'BWBP_JCF_Pro.TraceEmitter_M99ECS'
      WaterTracerClass=Class'BallisticProV55.TraceEmitter_WaterBullet'
      WaterTracerMode=MU_Both
-     FlyBySound=(Sound=SoundGroup'BW_Core_WeaponSound.FlyBys.Bullet-Whizz',Volume=0.700000)
+     FlyBySound=(Sound=Sound'BWBP_SKC_Sounds.X82.X83-FlyBy',Volume=2.500000)
      Mesh=SkeletalMesh'BWBP_JCF_Anims.M99_TPm'
      DrawScale=0.350000
 }

BWBP_JCF_Pro/Classes/M99RifleWeaponParamsClassic.uc

@@ -77,7 +77,7 @@ defaultproperties
 	//=================================================================	
 
 	Begin Object Class=WeaponParams Name=ClassicParams
-		InventorySize=7
+		InventorySize=9
 		SightMoveSpeedFactor=0.500000
 		SightingTime=0.900000
 		bNeedCock=True

BWBP_JCF_Pro/Classes/M99Turret.uc

@@ -76,9 +76,9 @@ defaultproperties
      UndeployedWeaponName="BWBP_JCF_Pro.M99Rifle"
      WeaponClassName="BWBP_JCF_Pro.M99_TW"
      GunYawBounds=(Min=-12000.000000,Max=12000.000000)
-     GunPitchBounds=(Min=-10000.000000,Max=8192.000000)
+     GunPitchBounds=(Min=-2000.000000,Max=2000.000000)
      CamYawBounds=(Min=-12000.000000,Max=12000.000000)
-     CamPitchBounds=(Max=12000.000000)
+     CamPitchBounds=(Min=-2000.000000,Max=2000.000000)
      GunYawSpeed=24000.000000
      GunPitchSpeed=32768.000000
      CamTrackYawSpeed=32768.000000
@@ -88,7 +88,7 @@ defaultproperties
 	 CameraElevation=5.000000
      GunBone="Weapon"
      PivotBone="StandPivot"
-     DriverBackOff=45.000000
+     DriverBackOff=65.000000
      bDrawDriverInTP=True
      VehicleNameString="M99 Mounted ECS Anti-MaterialRifle"
      Mesh=SkeletalMesh'BWBP_JCF_Anims.M99_Turret_TPm'

BWBP_OP_Pro/Classes/BallisticShieldWeapon.uc

@@ -241,8 +241,8 @@ defaultproperties
 	 NDCrosshairCfg=(Pic1=None,Pic2=Texture'BW_Core_WeaponTex.Crosshairs.R78OutA',USize1=128,VSize1=128,USize2=256,VSize2=256,Color1=(B=0,G=0,R=255,A=255),Color2=(B=210,G=255,R=0,A=255),StartSize1=96,StartSize2=96)
 	 NDCrosshairInfo=(SpreadRatios=(X1=0.500000,Y1=0.500000,X2=0.500000,Y2=0.750000),SizeFactors=(X1=1.000000,Y1=1.000000,X2=1.000000,Y2=1.000000),MaxScale=4.000000,CurrentScale=0.000000)
 	 ParamsClasses(0)=Class'BallisticShieldWeaponParamsComp'
-	 ParamsClasses(1)=Class'BallisticShieldWeaponParamsComp'
-	 ParamsClasses(2)=Class'BallisticShieldWeaponParamsComp'
+	 ParamsClasses(1)=Class'BallisticShieldWeaponParamsClassic'
+	 ParamsClasses(2)=Class'BallisticShieldWeaponParamsRealistic'
 	 ParamsClasses(3)=Class'BallisticShieldWeaponParamsTactical'
 	 FireModeClass(0)=Class'BWBP_OP_Pro.BallisticShieldPrimaryFire'
      FireModeClass(1)=Class'BWBP_OP_Pro.BallisticShieldSecondaryFire'

BWBP_OP_Pro/Classes/BallisticShieldWeaponParamsClassic.uc

@@ -0,0 +1,133 @@
+class BallisticShieldWeaponParamsClassic extends BallisticWeaponParams;
+
+defaultproperties
+{    
+    //=================================================================
+    // PRIMARY FIRE
+    //=================================================================	
+
+	Begin Object Class=MeleeEffectParams Name=ClassicPrimaryEffectParams
+		TraceRange=(Min=140.000000,Max=140.000000)
+		Damage=65
+		Fatigue=0.150000
+		DamageType=Class'BWBP_OP_Pro.DTBallisticShield'
+		DamageTypeHead=Class'BWBP_OP_Pro.DTBallisticShield'
+		DamageTypeArm=Class'BWBP_OP_Pro.DTBallisticShield'
+		HookStopFactor=1.700000
+		BotRefireRate=0.99
+		WarnTargetPct=0.3
+		FireSound=(Sound=Sound'BW_Core_WeaponSound.M763.M763Swing',Volume=0.5,Radius=12.000000,bAtten=True)
+	End Object
+
+	Begin Object Class=FireParams Name=ClassicPrimaryFireParams
+		FireInterval=0.750000
+		AmmoPerFire=0
+		FireAnim="Bash1"
+		FireEffectParams(0)=MeleeEffectParams'ClassicPrimaryEffectParams'
+	End Object
+
+    //=================================================================
+    // SECONDARY FIRE
+    //=================================================================	
+
+	Begin Object Class=MeleeEffectParams Name=ClassicSecondaryEffectParams
+		TraceRange=(Min=140.000000,Max=140.000000)
+		Damage=80
+		Fatigue=0.500000
+		DamageType=Class'BWBP_OP_Pro.DTBallisticShield'
+		DamageTypeHead=Class'BWBP_OP_Pro.DTBallisticShield'
+		DamageTypeArm=Class'BWBP_OP_Pro.DTBallisticShield'
+		HookStopFactor=1.700000
+		HookPullForce=100.000000
+		BotRefireRate=0.99
+		WarnTargetPct=0.5
+		FireSound=(Sound=Sound'BW_Core_WeaponSound.M763.M763Swing',Volume=0.5,Radius=12.000000,bAtten=True)
+	End Object
+
+	Begin Object Class=FireParams Name=ClassicSecondaryFireParams
+		FireInterval=1.200000
+		AmmoPerFire=0
+		PreFireAnim="PrepSmashAlt"
+		FireAnim="SmashAlt"
+		FireEffectParams(0)=MeleeEffectParams'ClassicSecondaryEffectParams'
+	End Object
+
+	//=================================================================
+	// RECOIL
+	//=================================================================
+
+    Begin Object Class=RecoilParams Name=ClassicRecoilParams
+        ViewBindFactor=0.00
+        PitchFactor=0
+        YawFactor=0
+        DeclineTime=1.500000
+    End Object
+
+	//=================================================================
+	// AIM
+	//=================================================================
+
+    Begin Object Class=AimParams Name=ClassicAimParams
+        ViewBindFactor=0.00
+        SprintOffset=(Pitch=-2048,Yaw=-2048)
+        AimSpread=(Min=0,Max=0)
+        ChaosDeclineTime=0.320000
+    End Object
+
+	//=================================================================
+	// BASIC PARAMS
+	//=================================================================	
+
+    Begin Object Class=WeaponParams Name=ClassicParams
+		//Layout core
+		LayoutName="Riot Shield"
+		Weight=30
+		//Stats
+		PlayerSpeedFactor=0.9
+        MagAmmo=1
+        InventorySize=4
+        DisplaceDurationMult=0
+        RecoilParams(0)=RecoilParams'ClassicRecoilParams'
+        AimParams(0)=AimParams'ClassicAimParams'
+		FireParams(0)=FireParams'ClassicPrimaryFireParams'
+		AltFireParams(0)=FireParams'ClassicSecondaryFireParams'
+    End Object 
+
+	Begin Object Class=WeaponParams Name=ClassicParams-Civ
+		//Layout core
+		LayoutName="Police Shield"
+		Weight=10
+		//Visual
+		LayoutMesh=SkeletalMesh'BWBP_OP_Anim.FPm_CivShield'
+		//Stats
+		PlayerSpeedFactor=0.9
+        MagAmmo=1
+        InventorySize=4
+        DisplaceDurationMult=0
+        RecoilParams(0)=RecoilParams'ClassicRecoilParams'
+        AimParams(0)=AimParams'ClassicAimParams'
+		FireParams(0)=FireParams'ClassicPrimaryFireParams'
+		AltFireParams(0)=FireParams'ClassicSecondaryFireParams'
+    End Object 
+
+	Begin Object Class=WeaponParams Name=ClassicParams-Junk
+		//Layout core
+		LayoutName="Junk Shield"
+		Weight=10
+		//Visual
+		LayoutMesh=SkeletalMesh'BWBP_OP_Anim.FPm_JunkShield'
+		//Stats
+		PlayerSpeedFactor=0.9
+        MagAmmo=1
+        InventorySize=4
+        DisplaceDurationMult=0
+        RecoilParams(0)=RecoilParams'ClassicRecoilParams'
+        AimParams(0)=AimParams'ClassicAimParams'
+		FireParams(0)=FireParams'ClassicPrimaryFireParams'
+		AltFireParams(0)=FireParams'ClassicSecondaryFireParams'
+    End Object 
+
+	Layouts(0)=WeaponParams'ClassicParams'
+	Layouts(1)=WeaponParams'ClassicParams-Civ'
+	Layouts(2)=WeaponParams'ClassicParams-Junk'
+}

BWBP_OP_Pro/Classes/BallisticShieldWeaponParamsComp.uc

@@ -79,8 +79,10 @@ defaultproperties
 	//=================================================================	
 
     Begin Object Class=WeaponParams Name=ArenaParams
-        Weight=30
-		//ViewOffset=(Y=75.000000,Z=-125.000000)
+		//Layout core
+		LayoutName="Riot Shield"
+		Weight=30
+		//Stats
 		PlayerSpeedFactor=0.95
         MagAmmo=1
         InventorySize=2
@@ -92,12 +94,15 @@ defaultproperties
     End Object 
 
 	Begin Object Class=WeaponParams Name=ArenaParams-Civ
+		//Layout core
+		LayoutName="Police Shield"
 		Weight=10
+		//Visual
 		LayoutMesh=SkeletalMesh'BWBP_OP_Anim.FPm_CivShield'
-		//ViewOffset=(Y=75.000000,Z=-125.000000)
-		PlayerSpeedFactor=0.9
+		//Stats
+		PlayerSpeedFactor=0.95
         MagAmmo=1
-        InventorySize=5
+        InventorySize=2
         DisplaceDurationMult=0
         RecoilParams(0)=RecoilParams'ArenaRecoilParams'
         AimParams(0)=AimParams'ArenaAimParams'
@@ -106,12 +111,15 @@ defaultproperties
     End Object 
 
 	Begin Object Class=WeaponParams Name=ArenaParams-Junk
+		//Layout core
+		LayoutName="Junk Shield"
 		Weight=10
+		//Visual
 		LayoutMesh=SkeletalMesh'BWBP_OP_Anim.FPm_JunkShield'
-		//ViewOffset=(Y=75.000000,Z=-125.000000)
-		PlayerSpeedFactor=0.9
+		//Stats
+		PlayerSpeedFactor=0.95
         MagAmmo=1
-        InventorySize=5
+        InventorySize=2
         DisplaceDurationMult=0
         RecoilParams(0)=RecoilParams'ArenaRecoilParams'
         AimParams(0)=AimParams'ArenaAimParams'