Skip to content

Commit

Permalink
final 2.7.1 fixes, tac changes
Browse files Browse the repository at this point in the history
- MG36 (T) gauss aim params fixed
- Scope Layouts (T) now have correct move speed
- Coach (A/T) no longer needs to charge to shoot
- Loadout now supports killstreaks
- 50 cals now all use the CRACK flyby sound
- M99 Turret wont betray you anymore
  • Loading branch information
MarcMoylan committed Jul 16, 2023
1 parent 277521a commit 7a802fe
Show file tree
Hide file tree
Showing 22 changed files with 131 additions and 81 deletions.
2 changes: 1 addition & 1 deletion BWBP_JCF_Pro/Classes/M99Attachment.Uc
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion BWBP_JCF_Pro/Classes/M99RifleWeaponParamsClassic.uc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ defaultproperties
//=================================================================

Begin Object Class=WeaponParams Name=ClassicParams
InventorySize=7
InventorySize=9
SightMoveSpeedFactor=0.500000
SightingTime=0.900000
bNeedCock=True
Expand Down
6 changes: 3 additions & 3 deletions BWBP_JCF_Pro/Classes/M99Turret.uc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
33 changes: 19 additions & 14 deletions BWBP_SKC_Pro/Classes/AK490WeaponParamsTactical.uc
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,14 @@ defaultproperties
//Layout core
Weight=30
LayoutName="Carbine"
//Function
InventorySize=7
SightMoveSpeedFactor=0.6
SightingTime=0.32
//Visual
SightOffset=(X=-6.500000,Y=0.02,Z=2.55)
SightPivot=(Pitch=64)
// ADS handling
SightMoveSpeedFactor=0.6
SightingTime=0.32
//Function
InventorySize=7
DisplaceDurationMult=1
MagAmmo=25
WeaponName="AK-490U Battle Rifle"
Expand All @@ -221,14 +223,14 @@ defaultproperties
//Visual
LayoutMesh=SkeletalMesh'BWBP_SKC_Anim.FPm_AKM490'
WeaponBoneScales(0)=(BoneName="Mount",Slot=50,Scale=0f)
//GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Holo',BoneName="Muzzle",Scale=0.05,AugmentOffset=(x=-26,y=-3.6,z=-0.2),AugmentRot=(Pitch=32768,Roll=-16384,Yaw=0))
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_SuppressorAK',BoneName="Muzzle",AugmentOffset=(x=0,y=-0.5,z=0),Scale=0.075,AugmentRot=(Pitch=32768,Roll=-16384,Yaw=0))
SightOffset=(X=0.000000,Y=0.00000,Z=2.20000)
SightPivot=(Pitch=0)
//Function
InventorySize=7
// ADS handling
SightMoveSpeedFactor=0.6
SightingTime=0.35
//Function
InventorySize=7
DisplaceDurationMult=1
MagAmmo=25
WeaponName="AKM-490 Battle Rifle (Supp)"
Expand All @@ -247,11 +249,12 @@ defaultproperties
LayoutMesh=SkeletalMesh'BWBP_SKC_Anim.FPm_AKM490'
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Holo',BoneName="Muzzle",Scale=0.05,AugmentOffset=(x=-26,y=-3.6,z=-0.2),AugmentRot=(Pitch=32768,Roll=-16384,Yaw=0))
SightOffset=(X=0.000000,Y=-0.250000,Z=6.505000)
//Function
InventorySize=7
SightPivot=(Pitch=64)
// ADS handling
SightMoveSpeedFactor=0.6
SightingTime=0.35
SightPivot=(Pitch=64)
//Function
InventorySize=7
DisplaceDurationMult=1
MagAmmo=25
WeaponName="AKM-490 Battle Rifle (Holo)"
Expand All @@ -270,14 +273,16 @@ defaultproperties
LayoutMesh=SkeletalMesh'BWBP_SKC_Anim.FPm_AKM490'
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_4XScope',BoneName="Muzzle",Scale=0.07,AugmentOffset=(x=-26,y=-3.6,z=-0.1),AugmentRot=(Pitch=32768,Roll=-16384,Yaw=0))
SightOffset=(X=3.000000,Y=-0.100000,Z=5.000000)
ZoomType=ZT_Fixed
SightPivot=(Pitch=64)
ScopeViewTex=Texture'BWBP_SKC_Tex.VSK.VSKScopeView'
// Zoom
ZoomType=ZT_Fixed
MaxZoom=3
// ADS handling
SightMoveSpeedFactor=0.35
SightingTime=0.4 //+.05
//Function
InventorySize=7
SightMoveSpeedFactor=0.6
SightingTime=0.4 //+.05
SightPivot=(Pitch=64)
DisplaceDurationMult=1
MagAmmo=25
WeaponName="AKM-490 Battle Rifle (3X)"
Expand Down
14 changes: 9 additions & 5 deletions BWBP_SKC_Pro/Classes/AK91WeaponParamsTactical.uc
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,12 @@ defaultproperties
//Attachments
WeaponBoneScales(0)=(BoneName="Scope",Slot=61,Scale=0f)
SightOffset=(X=10.5,Y=0,Z=1.7)
// Zoom
ZoomType=ZT_Irons
//Function
// ADS handling
SightingTime=0.35
SightMoveSpeedFactor=0.6
//Function
MagAmmo=25
InventorySize=6
RecoilParams(0)=RecoilParams'TacticalRecoilParams'
Expand All @@ -138,16 +140,18 @@ defaultproperties
Begin Object Class=WeaponParams Name=TacticalParams_ACOG
//Layout core
Weight=10
LayoutName="ACOG"
LayoutName="3X Scope"
//Attachments
WeaponBoneScales(0)=(BoneName="Scope",Slot=61,Scale=1f)
SightOffset=(X=0.000000,Y=0.00000,Z=3.700000)
ScopeViewTex=Texture'BW_Core_WeaponTex.Attachment.SKAR-Scope'
// Zoom
ZoomType=ZT_Fixed
MaxZoom=3
ScopeViewTex=Texture'BW_Core_WeaponTex.Attachment.SKAR-Scope'
// ADS handling
SightingTime=0.40
SightMoveSpeedFactor=0.35
//Function
SightingTime=0.4
SightMoveSpeedFactor=0.6
MagAmmo=25
InventorySize=6
RecoilParams(0)=RecoilParams'TacticalRecoilParams_Scope'
Expand Down
2 changes: 1 addition & 1 deletion BWBP_SKC_Pro/Classes/AR23Attachment.uc
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ defaultproperties
LightMode=MU_Both
TracerClass=class'TraceEmitter_Default'
WaterTracerClass=class'TraceEmitter_WaterBullet'
FlyBySound=(Sound=SoundGroup'BW_Core_WeaponSound.FlyBys.Bullet-Whizz',Volume=0.700000)
FlyBySound=(Sound=Sound'BWBP_SKC_Sounds.AH104.AH104-FlyBy',Volume=1.800000)
bRapidFire=True
Mesh=SkeletalMesh'BWBP_SKC_Anim.AR23_TPm'
FlashScale=0.4
Expand Down
2 changes: 1 addition & 1 deletion BWBP_SKC_Pro/Classes/AR23WeaponParamsClassic.uc
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ defaultproperties
WeaponBoneScales(2)=(BoneName="GLIrons",Slot=52,Scale=1f)
WeaponBoneScales(3)=(BoneName="Holo",Slot=53,Scale=0f)
WeaponBoneScales(4)=(BoneName="MuzzleAttachment",Slot=54,Scale=0f)
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Suppressor',BoneName="tip",Scale=0.2,AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Suppressor',BoneName="tip",Scale=0.2,AugmentOffset=(x=-3,y=0,z=0),AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
GunAugments(1)=(GunAugmentClass=class'BallisticProV55.Augment_Holo',BoneName="tip",Scale=0.06,AugmentOffset=(x=-25,y=0,z=-1.1),AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
//Function
InventorySize=7
Expand Down
2 changes: 1 addition & 1 deletion BWBP_SKC_Pro/Classes/AR23WeaponParamsComp.uc
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ defaultproperties
WeaponBoneScales(2)=(BoneName="GLIrons",Slot=52,Scale=1f)
WeaponBoneScales(3)=(BoneName="Holo",Slot=53,Scale=0f)
WeaponBoneScales(4)=(BoneName="MuzzleAttachment",Slot=54,Scale=0f)
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Suppressor',BoneName="tip",Scale=0.2,AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Suppressor',BoneName="tip",Scale=0.2,AugmentOffset=(x=-3,y=0,z=0),AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
GunAugments(1)=(GunAugmentClass=class'BallisticProV55.Augment_Holo',BoneName="tip",Scale=0.06,AugmentOffset=(x=-25,y=0,z=-1.1),AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
//Function
PlayerSpeedFactor=0.9
Expand Down
2 changes: 1 addition & 1 deletion BWBP_SKC_Pro/Classes/AR23WeaponParamsRealistic.uc
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ defaultproperties
WeaponBoneScales(2)=(BoneName="GLIrons",Slot=52,Scale=1f)
WeaponBoneScales(3)=(BoneName="Holo",Slot=53,Scale=0f)
WeaponBoneScales(4)=(BoneName="MuzzleAttachment",Slot=54,Scale=0f)
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Suppressor',BoneName="tip",Scale=0.2,AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Suppressor',BoneName="tip",Scale=0.2,AugmentOffset=(x=-3,y=0,z=0),AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
GunAugments(1)=(GunAugmentClass=class'BallisticProV55.Augment_Holo',BoneName="tip",Scale=0.06,AugmentOffset=(x=-25,y=0,z=-1.1),AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
//Function
InventorySize=7
Expand Down
10 changes: 5 additions & 5 deletions BWBP_SKC_Pro/Classes/AR23WeaponParamsTactical.uc
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,10 @@ defaultproperties
End Object

//ACOG
Begin Object Class=WeaponParams Name=TacticalParams_4X
Begin Object Class=WeaponParams Name=TacticalParams_3X
//Layout core
Weight=10
LayoutName="4X Scope"
LayoutName="3X Scope"
//Attachments
WeaponBoneScales(0)=(BoneName="IronsFront",Slot=50,Scale=0f)
WeaponBoneScales(1)=(BoneName="IronsRear",Slot=51,Scale=0f)
Expand All @@ -212,7 +212,7 @@ defaultproperties
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_ACOG',BoneName="tip",Scale=0.12,AugmentOffset=(x=-25,y=0,z=-1),AugmentRot=(Pitch=32768,Yaw=0,Roll=0))
ZoomType=ZT_Fixed
ScopeViewTex=Texture'BW_Core_WeaponTex.Attachment.SKAR-Scope'
MaxZoom=4
MaxZoom=3
//Function
PlayerSpeedFactor=0.9
PlayerJumpFactor=0.9
Expand Down Expand Up @@ -278,7 +278,7 @@ defaultproperties
WeaponBoneScales(2)=(BoneName="GLIrons",Slot=52,Scale=1f)
WeaponBoneScales(3)=(BoneName="Holo",Slot=53,Scale=0f)
WeaponBoneScales(4)=(BoneName="MuzzleAttachment",Slot=54,Scale=0f)
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Suppressor',BoneName="tip",Scale=0.2,AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
GunAugments(0)=(GunAugmentClass=class'BallisticProV55.Augment_Suppressor',BoneName="tip",Scale=0.2,AugmentOffset=(x=-3,y=0,z=0),AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
GunAugments(1)=(GunAugmentClass=class'BallisticProV55.Augment_Holo',BoneName="tip",Scale=0.06,AugmentOffset=(x=-25,y=0,z=-1.1),AugmentRot=(Pitch=0,Yaw=32768,Roll=32768))
//Function
PlayerSpeedFactor=0.9
Expand Down Expand Up @@ -327,7 +327,7 @@ defaultproperties
End Object

Layouts(0)=WeaponParams'TacticalParams'
Layouts(1)=WeaponParams'TacticalParams_4X'
Layouts(1)=WeaponParams'TacticalParams_3X'
Layouts(2)=WeaponParams'TacticalParams_8X'
Layouts(3)=WeaponParams'TacticalParams_Supp'
Layouts(4)=WeaponParams'TacticalParams_Irons'
Expand Down
2 changes: 1 addition & 1 deletion BWBP_SKC_Pro/Classes/AS50Attachment.uc
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ defaultproperties
TracerChance=2.000000
WaterTracerClass=class'TraceEmitter_WaterBullet'
WaterTracerMode=MU_Both
FlyBySound=(Sound=Sound'BWBP_SKC_Sounds.AH104.AH104-FlyBy',Volume=1.500000)
FlyBySound=(Sound=Sound'BWBP_SKC_Sounds.AH104.AH104-FlyBy',Volume=1.800000)
ReloadAnim="Reload_AR"
CockingAnim="Cock_RearPull"
ReloadAnimRate=0.700000
Expand Down
6 changes: 3 additions & 3 deletions BWBP_SKC_Pro/Classes/CoachGun.uc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var bool bLeftLoaded;
var() float SingleReloadAnimRate; // Animation rate for single reload.


simulated event PreBeginPlay()
/*simulated event PreBeginPlay()
{
super.PreBeginPlay();
if (class'BallisticReplicationInfo'.static.IsClassicOrRealism())
Expand All @@ -44,7 +44,7 @@ simulated event PostNetBeginPlay()
{
CoachGunPrimaryFire(FireMode[0]).bFireOnRelease = false;
}
}
}*/
simulated function PostBeginPlay()
{
super.PostBeginPlay();
Expand Down Expand Up @@ -499,7 +499,7 @@ defaultproperties
ParamsClasses(2)=Class'CoachWeaponParamsRealistic'
ParamsClasses(3)=Class'CoachWeaponParamsTactical'
FireModeClass(0)=Class'BWBP_SKC_Pro.CoachGunPrimaryFire'
FireModeClass(1)=Class'BCoreProV55.BallisticScopeFire'
FireModeClass(1)=Class'BWBP_SKC_Pro.CoachGunSecondaryFire'
SelectAnimRate=2.000000
PutDownAnimRate=2.000000
SingleReloadAnimRate=1.0
Expand Down
5 changes: 3 additions & 2 deletions BWBP_SKC_Pro/Classes/CoachGunPrimaryFire.uc
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ simulated event ModeDoFire()
}
return;
}

/*
//DebugMessage("ModeDoFire: Load:"$Load$" ConsumedLoad:"$ConsumedLoad);
if (!AllowFire())
Expand Down Expand Up @@ -335,6 +335,7 @@ simulated event ModeDoFire()
if (bCockAfterFire || (bCockAfterEmpty && BW.MagAmmo - ConsumedLoad < 1))
BW.bNeedCock=true;
}
*/
}

//======================================================================
Expand Down Expand Up @@ -505,7 +506,7 @@ defaultproperties
RangeAtten=0.250000
PenetrateForce=0
bPenetrate=False
bFireOnRelease=True
bFireOnRelease=False
DamageType=Class'BWBP_SKC_Pro.DTCoachShot'
DamageTypeHead=Class'BWBP_SKC_Pro.DTCoachShot'
DamageTypeArm=Class'BWBP_SKC_Pro.DTCoachShot'
Expand Down
2 changes: 1 addition & 1 deletion BWBP_SKC_Pro/Classes/FG50Attachment.uc
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ defaultproperties
TracerChance=2.000000
WaterTracerClass=class'TraceEmitter_WaterBullet'
WaterTracerMode=MU_Both
FlyBySound=(Sound=SoundGroup'BW_Core_WeaponSound.FlyBys.Bullet-Whizz',Volume=0.700000)
FlyBySound=(Sound=Sound'BWBP_SKC_Sounds.AH104.AH104-FlyBy',Volume=1.800000)
ReloadAnim="Reload_MG"
CockingAnim="Cock_RearPull"
ReloadAnimRate=1.500000
Expand Down
10 changes: 5 additions & 5 deletions BWBP_SKC_Pro/Classes/FG50WeaponParamsTactical.uc
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ defaultproperties
PushbackForce=150.000000
MuzzleFlashClass=Class'BWBP_SKC_Pro.FG50FlashEmitter'
FlashScaleFactor=1.000000
Recoil=1024.000000
Recoil=1280.000000
Chaos=0.200000
WarnTargetPct=0.400000
FireSound=(Sound=SoundGroup'BWBP_SKC_Sounds.AS50.FG50-HeavyFire',Volume=7.100000,Slot=SLOT_Interact,bNoOverride=False)
Expand Down Expand Up @@ -110,18 +110,18 @@ defaultproperties
WallPDamageFactor=0.800000
MuzzleFlashClass=Class'BWBP_SKC_Pro.FG50FlashEmitter'
FlashScaleFactor=1.000000
Recoil=512.000000
Recoil=768.000000
Chaos=0.070000
WarnTargetPct=0.400000
FireSound=(Sound=SoundGroup'BWBP_SKC_Sounds.AR23.AR23-HFire',Volume=6.750000,Slot=SLOT_Interact,bNoOverride=False)
FireSound=(Sound=SoundGroup'BWBP_SKC_Sounds.AS50.FG50-HeavyFire',Volume=6.750000,Slot=SLOT_Interact,bNoOverride=False)
End Object

Begin Object Class=FireParams Name=TacticalPriControlledFireParams_AP
TargetState="APAmmo"
FireInterval=0.600000
FireInterval=1.000000
FireEndAnim=
AimedFireAnim="SGCFireAimed"
FireAnimRate=2.400000
FireAnimRate=1.800000
FireEffectParams(0)=InstantEffectParams'TacticalPriControlledEffectParams_AP'
End Object

Expand Down
Loading

0 comments on commit 7a802fe

Please sign in to comment.