diff --git a/Content/Classes/Effects_SEF.u b/Content/Classes/Effects_SEF.u new file mode 100644 index 00000000..1ac0d189 Binary files /dev/null and b/Content/Classes/Effects_SEF.u differ diff --git a/Content/Classes/SwatEquipmentModels2.u b/Content/Classes/SwatEquipmentModels2.u index f2a1fc4b..f6be00f9 100644 Binary files a/Content/Classes/SwatEquipmentModels2.u and b/Content/Classes/SwatEquipmentModels2.u differ diff --git a/System/SwatEquipment.ini b/System/SwatEquipment.ini index ccc7e7b7..7581f50f 100644 --- a/System/SwatEquipment.ini +++ b/System/SwatEquipment.ini @@ -148,7 +148,7 @@ ZoomedAimErrorModifier=0.75 ;ViewInertia controls how much the weapon moves when you move, ;and how quickly you can align the iron sights ;Valid range is 0 - 1 -ViewInertia=0.5; +ViewInertia=0.5 ComplianceAnimation=Compliance_Handgun [SwatEquipment.NoWeapon] @@ -188,7 +188,7 @@ IdleWeaponCategory=IdleWithSubmachineGun bUseZoomFovModifier=true ZoomedFovModifier=0.75 ZoomTime=0.25 -ViewInertia=0.35; +ViewInertia=0.35 MaxInertiaOffset=1.1 ComplianceAnimation=Compliance_SubmachineGun @@ -219,7 +219,7 @@ IdleWeaponCategory=IdleWithG36 bUseZoomFovModifier=true ZoomedFovModifier=0.7 ZoomTime=0.25 -ViewInertia=0.45; +ViewInertia=0.45 MaxInertiaOffset=1.3 ComplianceAnimation=Compliance_MachineGun @@ -234,7 +234,7 @@ Choke=0.85 bUseZoomFovModifier=true ZoomedFovModifier=0.8 ZoomTime=0.25 -ViewInertia=0.5; +ViewInertia=0.5 MaxInertiaOffset=1.3 ; Handling qualities similar to shotguns (can be overridden) AimErrorBreakingPoint=4.0 @@ -253,7 +253,7 @@ IdleWeaponCategory=IdleWithPaintballGun bUseZoomFovModifier=true ZoomedFovModifier=0.75 ZoomTime=0.25 -ViewInertia=0.4; +ViewInertia=0.4 MaxInertiaOffset=1 ComplianceAnimation=Compliance_CSBallLauncher OfficerMaxShotsWhenGassed=5 @@ -266,7 +266,7 @@ LightstickThrowAnimPostfix="SG" bUseZoomFovModifier=true ZoomedFovModifier=0.8 ZoomTime=0.25 -ViewInertia=0.5; +ViewInertia=0.5 MaxInertiaOffset=1.3 ; Handling qualities similar to shotguns (can be overridden) AimErrorBreakingPoint=4.0 @@ -289,7 +289,7 @@ bUseZoomFovModifier=true ZoomedFovModifier=0.7 ZoomTime=0.25 ComplianceAnimation=Compliance_Shotgun -ViewInertia=0.6; +ViewInertia=0.6 MaxInertiaOffset=1.3 @@ -2985,9 +2985,6 @@ IronSightLocationOffset=(X=2,Y=-5.85,Z=1.475) IronSightRotationOffset=(Pitch=360,Yaw=0,Roll=0) bUsesRedDotSight=true -;; GUI -;GUIImage=material'bp_gui_tex.gui_M4v2_v01' -GUIImage=material'gui_tex.equip_m4a1' WeaponCategory=WeaponClass_AssaultRifle AllowedSlots=WeaponEquip_PrimaryOnly @@ -3376,7 +3373,7 @@ Bulk=28.56 ;; Viewmodel and Zoom FirstPersonModelClass=class'SwatEquipmentModels2.M16A1sd_FirstPerson' ThirdPersonModelClass=class'SwatEquipmentModels2.M16A1sd_ThirdPerson' -ViewInertia=0.6; +ViewInertia=0.6 ;; GUI GUIImage=material'gui_sas.m16a1sd' @@ -4885,7 +4882,7 @@ ZoomedAutoRecoilPerShot=19 ZoomedAutoRecoilBase=100 ;************************* -; Less Lethal Shotgun +; Benelli Nova Less Lethal Shotgun ;************************* [SwatEquipment.LessLethalSG] @@ -4943,7 +4940,7 @@ FlashlightRotation_1stPerson=(Pitch=0,Yaw=0,Roll=0) FlashlightPosition_3rdPerson=(X=0,Y=-39.4,Z=1.15) FlashlightRotation_3rdPerson=(Pitch=0,Yaw=-16384,Roll=0) LightstickThrowAnimPostfix="SG" -IronSightLocationOffset=(X=2,Y=-7.86,Z=2.125) +IronSightLocationOffset=(X=2,Y=-8,Z=2) IronSightRotationOffset=(Pitch=400,Yaw=32,Roll=1200) Weight=3.89 diff --git a/System/VisualEffects.ini b/System/VisualEffects.ini index 46ed6a61..32e9fd53 100644 --- a/System/VisualEffects.ini +++ b/System/VisualEffects.ini @@ -618,8 +618,8 @@ EventResponse=SAW_ThirdPersonFired_muzzleFlash EventResponse=SAW_ThirdPersonBurstFired_muzzleFlash EventResponse=P90_FirstPersonFired_muzzleFlash EventResponse=P90_FirstPersonBurstFired_muzzleFlash -EventResponse=P90sd_FirstPersonFired_muzzleFlash -EventResponse=P90sd_FirstPersonBurstFired_muzzleFlash +;EventResponse=P90sd_FirstPersonFired_muzzleFlash +;EventResponse=P90sd_FirstPersonBurstFired_muzzleFlash EventResponse=TEC9_FirstPersonBurstFired EventResponse=TEC9_FirstPersonBurstFired_muzzleFlash EventResponse=TEC9_ThirdPersonBurstFired_muzzleFlash @@ -4562,13 +4562,13 @@ Specification=(SpecificationType=3rdp90BurstMuzzleFlash,SpecificationClass=Class Event=Fired SourceClassName=P90sd_FirstPerson Chance=100 -Specification=(SpecificationType=p901stMuzzleflash,SpecificationClass=Class'IGVisualEffectsSubsystem.VisualEffectSpecification') +Specification=(SpecificationType=p90sd1stMuzzleflash,SpecificationClass=Class'IGVisualEffectsSubsystem.VisualEffectSpecification') [P90sd_FirstPersonBurstFired] Event=BurstFired SourceClassName=P90sd_FirstPerson Chance=100 -Specification=(SpecificationType=p901stburstMuzzleFlash,SpecificationClass=Class'IGVisualEffectsSubsystem.VisualEffectSpecification') +Specification=(SpecificationType=p90sd1stburstMuzzleFlash,SpecificationClass=Class'IGVisualEffectsSubsystem.VisualEffectSpecification') [P90sd_ThirdPersonFired] Event=Fired @@ -6900,14 +6900,14 @@ ClassName=Class'IGVisualEffectsSubsystem.VisualEffectSpecification' Precache=True AttachToSource=True MaterialType=MVT_Default -EffectClass=class'SWATeffects2.P90_1stPersonMuzzleFlash' +EffectClass=class'Effects_SEF.P90_1stPersonMuzzleFlash' [p901stburstMuzzleFlash] ClassName=Class'IGVisualEffectsSubsystem.VisualEffectSpecification' Precache=True AttachToSource=True MaterialType=MVT_Default -EffectClass=class'SWATeffects2.P90_1stPersonMuzzleFlash' +EffectClass=class'Effects_SEF.P90_1stPersonMuzzleFlash' [P903rdMuzzleFlash] ClassName=Class'IGVisualEffectsSubsystem.VisualEffectSpecification' @@ -6923,6 +6923,20 @@ AttachToSource=True MaterialType=MVT_Default EffectClass=class'SWATeffects2.P90_3rdPersonMuzzleFlash' +[p90sd1stMuzzleflash] +ClassName=Class'IGVisualEffectsSubsystem.VisualEffectSpecification' +Precache=True +AttachToSource=True +MaterialType=MVT_Default +EffectClass=class'Effects_SEF.P90SD_1stPersonMuzzleFlash' + +[p90sd1stburstMuzzleFlash] +ClassName=Class'IGVisualEffectsSubsystem.VisualEffectSpecification' +Precache=True +AttachToSource=True +MaterialType=MVT_Default +EffectClass=class'Effects_SEF.P90SD_1stPersonMuzzleFlash' + [1stSAWmuzzleflash] ClassName=Class'IGVisualEffectsSubsystem.VisualEffectSpecification' Precache=True