(Probably final) fix for V4: Remove Meatbarn from list of contexts be…

…cause it breaks sound on other missions
eezstreet · Feb 5, 2017 · 98830f9 · 98830f9
1 parent c46b20f
commit 98830f9
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -473,6 +473,7 @@ If an equipment is not listed as unlocked by a mission, it is unlocked by defaul
 - Five new commands: LEADER THROW & CLEAR; OPEN, LEADER & CLEAR; OPEN, LEADER & MAKE ENTRY; BREACH, LEADER & CLEAR; BREACH, LEADER & MAKE ENTRY. These commands let you throw the grenade instead of the AI doing it.
 - Equipment is now affected by Weight and Bulk. Weight, which represents how heavy your equipment is, slows your character down, and Bulk, which represents how large your equipment is, slows down your actions.
 - The toolkit can now be used to lock doors.
+- Added an FOV slider (Video Options) and a Mouse Smoothing checkbox (Controls Settings)
 - The toolkit interface no longer shows up for doors that cannot be locked (e.g, all of the doors on St. Micheal's Medical Center)
 - FMJ and buckshot can now ricochet off of hard surfaces
 - Bullets are now affected by drag; they will lose momentum (and therefore lethality) over long distances. JHP is more susceptible to drag than FMJ rounds.
@@ -486,6 +487,7 @@ If an equipment is not listed as unlocked by a mission, it is unlocked by defaul
 - Civilians are now not ridiculously noncompliant like they were before
 - Incapacitation health increased from 20 to 30, so incapacitation is more likely
 - All pistols are selectable in primary weapon slots.
+- CO-OP damage modifier reduced (2.0x -> 1.5x, same as Elite difficulty) and Easy damage modifier increased (0.5x -> 1.0x, same as Normal difficulty)
 - Ammo Bandolier item removed
 - VIP Colt M1911 removed
 - Officers get (by default) 3 primary magazines and 5 secondary magazines. The only exception is Jackson, who gets 25 shotgun shells.

diff --git a/Source/Game/SwatGame/Classes/SwatPlayerController.uc b/Source/Game/SwatGame/Classes/SwatPlayerController.uc
@@ -1,5 +1,5 @@
 class SwatPlayerController extends Engine.PlayerController
-    config(SwatGame)
+    config(User)
     dependsOn(SwatGuiConfig)
     native;
 

diff --git a/Source/Unreal/Engine/Classes/Controller.uc b/Source/Unreal/Engine/Classes/Controller.uc
@@ -15,6 +15,7 @@
 // This is a built-in Unreal class and it shouldn't be modified.
 //=============================================================================
 class Controller extends Actor
+  config(User)
 	native
 	nativereplication
     dependsOn(HandheldEquipment)

diff --git a/Source/Unreal/Engine/Classes/PlayerController.uc b/Source/Unreal/Engine/Classes/PlayerController.uc
@@ -1237,13 +1237,12 @@ exec function SetZoom(bool Zoom, optional bool Instantly)
 exec function FOV(float F)
 {
 	local float fFOV;
-	
+
 	if( (F >= 70.0) )
 	{
 		fFOV = FClamp(F, 70, 120);
 		BaseFOV = fFOV;
-		default.BaseFOV = fFOV;
-		class'PlayerController'.static.StaticSaveConfig();
+		SaveConfig();
 	}
 }
 

diff --git a/System/SoundEffects.ini b/System/SoundEffects.ini
@@ -6690,7 +6690,6 @@ Suffix=expm03
 Chance=100
 Specification=(SpecificationType=S1_SpottedContact_expm03,SpecificationClass=Class'IGSoundEffectsSubsystem.StreamSoundEffectSpecification')
 Context=Level_SP-Backstage
-Context=Level_SP-MeatBarn
 
 [SwatPlayerLostContact_s1_expm03]
 Event=LostContact
@@ -6700,7 +6699,6 @@ Suffix=expm03
 Chance=100
 Specification=(SpecificationType=S1_LostContact_expm03,SpecificationClass=Class'IGSoundEffectsSubsystem.StreamSoundEffectSpecification')
 Context=Level_SP-Backstage
-Context=Level_SP-MeatBarn
 
 [SwatPlayerSpottedContact_s1_expm04]
 Event=SpottedContact
@@ -11188,7 +11186,6 @@ Specification=(SpecificationType=ConvAbomb6_1,SpecificationClass=Class'IGSoundEf
 Chance=100
 Specification=(SpecificationType=ConvAbomb7_1,SpecificationClass=Class'IGSoundEffectsSubsystem.StreamSoundEffectSpecification')
 Context=Level_SP-ABomb
-Context=Level_SP-Meatbarn
 
 [PlayerControllerConversationsDummy_m05]
 Event=ConversationsDummy
@@ -11355,7 +11352,6 @@ Specification=(SpecificationType=ConvBarber17_1,SpecificationClass=Class'IGSound
 Chance=100
 Specification=(SpecificationType=ConvBarber17_2,SpecificationClass=Class'IGSoundEffectsSubsystem.StreamSoundEffectSpecification')
 Context=Level_SP-Casino
-Context=Level_SP-Meatbarn
 
 [PlayerControllerConversationsDummy_m08]
 Event=ConversationsDummy
@@ -11612,7 +11608,6 @@ Specification=(SpecificationType=ConvBackstage3_2,SpecificationClass=Class'IGSou
 Chance=100
 Specification=(SpecificationType=ConvBackstage3_3,SpecificationClass=Class'IGSoundEffectsSubsystem.StreamSoundEffectSpecification')
 Context=Level_SP-Backstage
-Context=Level_SP-Meatbarn
 
 [PlayerControllerConversationsDummy_expm04]
 Event=ConversationsDummy

diff --git a/System/SwatGame.ini b/System/SwatGame.ini
@@ -1,35 +1,3 @@
-[SwatGame.SwatGamePlayerController]
-FocusTestDistance=3000.000000
-FocusTestInterval=0.200000
-RestartTime=6.000000
-EnemyTurnSpeed=45000
-InputClass=Class'Engine.PlayerInput'
-Mass=100.000000
-ZoomBezierPt1X=0.400000
-ZoomBezierPt1Y=0.000000
-ZoomBezierPt2X=0.600000
-ZoomBezierPt2Y=1.000000
-SniperAlertTime=4.000000
-BeingCuffedTimeout=10.000000
-FlashScale=0.500000
-FlashFog=(X=900.000000,Y=0.000000,Z=0.000000)
-ZoomTime=0.000000
-PostFullscreenManualFlushDelay=0.000000
-HavokDataClass=None
-FocusInterfaceInfos=(Focus=Focus_Use,FocusClass=Class'SwatGame.UseInterface',Label="UseInterface",ValidNetMode=FNET_All)
-FocusInterfaceInfos=(Focus=Focus_Fire,FocusClass=Class'SwatGame.FireInterface',Label="FireInterface",ValidNetMode=FNET_All)
-FocusInterfaceInfos=(Focus=Focus_PlayerTag,FocusClass=Class'SwatGame.PlayerTagInterface',Label="PlayerTagInterface",ValidNetMode=FNET_MultiplayerOnly)
-FocusInterfaceInfos=(Focus=Focus_ClassicCommand,FocusClass=Class'SwatGame.ClassicCommandInterface_SP',Label="ClassicCommandInterface",ValidNetMode=FNET_StandaloneOnly)
-FocusInterfaceInfos=(Focus=Focus_GraphicCommand,FocusClass=Class'SwatGame.GraphicCommandInterface_SP',Label="GraphicCommandInterface",ValidNetMode=FNET_StandaloneOnly)
-FocusInterfaceInfos=(Focus=Focus_ClassicCommand,FocusClass=Class'SwatGame.ClassicCommandInterface_MP',Label="ClassicCommandInterface",ValidNetMode=FNET_MultiplayerOnly)
-FocusInterfaceInfos=(Focus=Focus_GraphicCommand,FocusClass=Class'SwatGame.GraphicCommandInterface_MP',Label="GraphicCommandInterface",ValidNetMode=FNET_MultiplayerOnly)
-FocusInterfaceInfos=(Focus=Focus_LowReady,FocusClass=Class'SwatGame.LowReadyInterface',Label="LowReadyInterface",ValidNetMode=FNET_All)
-FocusInterfaceInfos=(Focus=Focus_SpeechRecognition,FocusClass=Class'SwatGame.SpeechCommandInterface',Label="SpeechCommandInterface",ValidNetMode=FNET_All)
-
-[SwatGame.SwatPlayerController]
-FlashScale=0.5
-FlashFog=(X=900.00000,Y=0.000000,Z=0.00000)
-
 [Engine.Hands]
 PlayerViewOffset=(X=-22,Y=7,Z=-12)
 AnimationGroups=FP_Hand2.GrenadeHands
@@ -199,38 +167,6 @@ kNegativeFontXOffset=8
 kNegativeFontYOffset=18
 OfficerFontName=SwatOSBold
 
-[Engine.PlayerController]
-bLookUpStairs=False
-bSnapToLevel=False
-bAlwaysMouseLook=True
-bKeyboardLook=True
-bAlwaysLevel=False
-bNoVoiceMessages=False
-bNoVoiceTaunts=False
-bNoAutoTaunts=False
-bAutoTaunt=False
-bNoMatureLanguage=False
-bDynamicNetSpeed=True
-AnnouncerLevel=0
-AnnouncerVolume=4
-AimingHelp=0.000000
-MaxResponseTime=0.700000
-DesiredFOV=85.000000
-DefaultFOV=85.000000
-MaxTimeMargin=0.350000
-StatsUsername=
-StatsPassword=
-DynamicPingThreshold=400.000000
-bEnablePickupForceFeedback=True
-bEnableWeaponForceFeedback=True
-bEnableDamageForceFeedback=True
-bEnableGUIForceFeedback=True
-bEnableInitialChatRoom=False
-BaseFOV=108.529999
-
-[Engine.Controller]
-Handedness=0.000000
-
 [SwatGame.DynamicMusicManager]
 DynamicMusicTime=30.0
 DynamicContextName=Dynamic
@@ -255,7 +191,6 @@ OverheadOffset=70.0
 [SwatGame.SwatEntryPlayerController]
 FlashScale=0.500000
 FlashFog=(X=900.000000,Y=0.000000,Z=0.000000)
-BaseFOV=108.529999
 ZoomTime=0.000000
 ZoomBezierPt1X=0.000000
 ZoomBezierPt1Y=0.000000
@@ -266,4 +201,3 @@ InputClass=Class'Engine.PlayerInput'
 PostFullscreenManualFlushDelay=0.000000
 Mass=100.000000
 HavokDataClass=None
-
diff --git a/System/User.ini b/System/User.ini
@@ -1,7 +1,7 @@
 [SwatGui.SwatGUIController]
 GUI_TO_WORLD_X=160.000000
 GUI_TO_WORLD_Y=125.000000
-bModAuthor=True
+bModAuthor=False
 MenuMouseSens=1.000000
 MouseOverSound=None
 ClickSound=None
@@ -799,3 +799,80 @@ MouseSamplingTime=0.000001
 MouseAccelThreshold=100.000000
 DoubleClickTime=0.250000
 
+[Engine.PlayerController]
+bLookUpStairs=False
+bSnapToLevel=False
+bAlwaysMouseLook=True
+bKeyboardLook=True
+bAlwaysLevel=False
+bNoVoiceMessages=False
+bNoVoiceTaunts=False
+bNoAutoTaunts=False
+bAutoTaunt=False
+bNoMatureLanguage=False
+bDynamicNetSpeed=True
+AnnouncerLevel=0
+AnnouncerVolume=4
+AimingHelp=0.000000
+MaxResponseTime=0.700000
+DesiredFOV=85.000000
+DefaultFOV=85.000000
+MaxTimeMargin=0.350000
+StatsUsername=
+StatsPassword=
+DynamicPingThreshold=400.000000
+bEnablePickupForceFeedback=True
+bEnableWeaponForceFeedback=True
+bEnableDamageForceFeedback=True
+bEnableGUIForceFeedback=True
+bEnableInitialChatRoom=False
+BaseFOV=97.330002
+
+[Engine.Controller]
+Handedness=0.000000
+
+[SwatGame.SwatPlayerController]
+FlashScale=0.5
+FlashFog=(X=900.00000,Y=0.000000,Z=0.00000)
+
+[SwatGame.SwatEntryPlayerController]
+FlashScale=0.500000
+FlashFog=(X=900.000000,Y=0.000000,Z=0.000000)
+ZoomTime=0.000000
+ZoomBezierPt1X=0.000000
+ZoomBezierPt1Y=0.000000
+ZoomBezierPt2X=0.000000
+ZoomBezierPt2Y=0.000000
+EnemyTurnSpeed=45000
+InputClass=Class'Engine.PlayerInput'
+PostFullscreenManualFlushDelay=0.000000
+Mass=100.000000
+HavokDataClass=None
+
+[SwatGame.SwatGamePlayerController]
+FocusTestDistance=3000.000000
+FocusTestInterval=0.200000
+RestartTime=6.000000
+EnemyTurnSpeed=45000
+InputClass=Class'Engine.PlayerInput'
+Mass=100.000000
+ZoomBezierPt1X=0.400000
+ZoomBezierPt1Y=0.000000
+ZoomBezierPt2X=0.600000
+ZoomBezierPt2Y=1.000000
+SniperAlertTime=4.000000
+BeingCuffedTimeout=10.000000
+FlashScale=0.500000
+FlashFog=(X=900.000000,Y=0.000000,Z=0.000000)
+ZoomTime=0.000000
+PostFullscreenManualFlushDelay=0.000000
+HavokDataClass=None
+FocusInterfaceInfos=(Focus=Focus_Use,FocusClass=Class'SwatGame.UseInterface',Label="UseInterface",ValidNetMode=FNET_All)
+FocusInterfaceInfos=(Focus=Focus_Fire,FocusClass=Class'SwatGame.FireInterface',Label="FireInterface",ValidNetMode=FNET_All)
+FocusInterfaceInfos=(Focus=Focus_PlayerTag,FocusClass=Class'SwatGame.PlayerTagInterface',Label="PlayerTagInterface",ValidNetMode=FNET_MultiplayerOnly)
+FocusInterfaceInfos=(Focus=Focus_ClassicCommand,FocusClass=Class'SwatGame.ClassicCommandInterface_SP',Label="ClassicCommandInterface",ValidNetMode=FNET_StandaloneOnly)
+FocusInterfaceInfos=(Focus=Focus_GraphicCommand,FocusClass=Class'SwatGame.GraphicCommandInterface_SP',Label="GraphicCommandInterface",ValidNetMode=FNET_StandaloneOnly)
+FocusInterfaceInfos=(Focus=Focus_ClassicCommand,FocusClass=Class'SwatGame.ClassicCommandInterface_MP',Label="ClassicCommandInterface",ValidNetMode=FNET_MultiplayerOnly)
+FocusInterfaceInfos=(Focus=Focus_GraphicCommand,FocusClass=Class'SwatGame.GraphicCommandInterface_MP',Label="GraphicCommandInterface",ValidNetMode=FNET_MultiplayerOnly)
+FocusInterfaceInfos=(Focus=Focus_LowReady,FocusClass=Class'SwatGame.LowReadyInterface',Label="LowReadyInterface",ValidNetMode=FNET_All)
+FocusInterfaceInfos=(Focus=Focus_SpeechRecognition,FocusClass=Class'SwatGame.SpeechCommandInterface',Label="SpeechCommandInterface",ValidNetMode=FNET_All)