add fix to playercontroller classes for utterly inbred voting menu ha…

…ndling set scope scaling for pro/tactical tweak deermaster sight offset
ANVF-Postal · Apr 1, 2023 · 64de5d1 · 64de5d1
1 parent 0921afe
commit 64de5d1
Show file tree

Hide file tree

Showing 38 changed files with 137 additions and 39 deletions.
diff --git a/BWBP_OP_Pro/Classes/AkeronWeaponParamsComp.uc b/BWBP_OP_Pro/Classes/AkeronWeaponParamsComp.uc
@@ -122,7 +122,8 @@ defaultproperties
         DisplaceDurationMult=1.25
 		InventorySize=5
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.500000
+		ScopeScale=0.7
+		SightingTime=0.450000
 		MagAmmo=9
         ZoomType=ZT_Logarithmic
         RecoilParams(0)=RecoilParams'ArenaRecoilParams'

diff --git a/BWBP_OP_Pro/Classes/AkeronWeaponParamsTactical.uc b/BWBP_OP_Pro/Classes/AkeronWeaponParamsTactical.uc
@@ -123,7 +123,8 @@ defaultproperties
         DisplaceDurationMult=1.25
 		InventorySize=6
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.5
+		SightingTime=0.45
+		ScopeScale=0.7
 		MagAmmo=9
 		// acog-like
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_OP_Pro/Classes/CX85WeaponParamsComp.uc b/BWBP_OP_Pro/Classes/CX85WeaponParamsComp.uc
@@ -96,7 +96,8 @@ defaultproperties
 		PlayerSpeedFactor=0.95
 		InventorySize=6
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.650000
+		SightingTime=0.45	
+		ScopeScale=0.7
 		DisplaceDurationMult=1
 		MagAmmo=50
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_OP_Pro/Classes/CX85WeaponParamsTactical.uc b/BWBP_OP_Pro/Classes/CX85WeaponParamsTactical.uc
@@ -107,7 +107,8 @@ defaultproperties
 		PlayerSpeedFactor=0.95
 		InventorySize=6
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.65
+		SightingTime=0.45	
+		ScopeScale=0.7
 		DisplaceDurationMult=1
 		MagAmmo=50
         // sniper 4-8x

diff --git a/BWBP_OP_Pro/Classes/KF8XWeaponParamsComp.uc b/BWBP_OP_Pro/Classes/KF8XWeaponParamsComp.uc
@@ -63,7 +63,8 @@ defaultproperties
 		PlayerJumpFactor=1
 		InventorySize=5
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.400000
+		SightingTime=0.4	
+		ScopeScale=0.7
 		DisplaceDurationMult=1
 		MagAmmo=8
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_OP_Pro/Classes/KF8XWeaponParamsTactical.uc b/BWBP_OP_Pro/Classes/KF8XWeaponParamsTactical.uc
@@ -64,7 +64,8 @@ defaultproperties
 	Begin Object Class=WeaponParams Name=TacticalParams
 		InventorySize=7
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.5
+		SightingTime=0.4	
+		ScopeScale=0.7
 		DisplaceDurationMult=1
 		MagAmmo=8
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_OP_Pro/Classes/LightningWeaponParamsComp.uc b/BWBP_OP_Pro/Classes/LightningWeaponParamsComp.uc
@@ -98,7 +98,8 @@ defaultproperties
 		PlayerJumpFactor=0.9
 		InventorySize=6
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.450000
+		SightingTime=0.45	
+		ScopeScale=0.7
 		DisplaceDurationMult=1.25
 		MagAmmo=8
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_OP_Pro/Classes/LightningWeaponParamsTactical.uc b/BWBP_OP_Pro/Classes/LightningWeaponParamsTactical.uc
@@ -100,7 +100,8 @@ defaultproperties
 		PlayerJumpFactor=0.9
 		InventorySize=7
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.80000
+		SightingTime=0.45	
+		ScopeScale=0.7
 		DisplaceDurationMult=1.25
 		MagAmmo=20
 		// sniper 4-8x

diff --git a/BWBP_OP_Pro/Classes/R9A1WeaponParamsComp.uc b/BWBP_OP_Pro/Classes/R9A1WeaponParamsComp.uc
@@ -131,7 +131,8 @@ defaultproperties
 		PlayerJumpFactor=1
 		InventorySize=6
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.350000
+		SightingTime=0.4	
+		ScopeScale=0.7
 		DisplaceDurationMult=1
 		MagAmmo=15
         RecoilParams(0)=RecoilParams'ArenaRecoilParams'

diff --git a/BWBP_OP_Pro/Classes/R9A1WeaponParamsTactical.uc b/BWBP_OP_Pro/Classes/R9A1WeaponParamsTactical.uc
@@ -127,7 +127,8 @@ defaultproperties
 		SightOffset=(X=30.000000,Y=2.850000,Z=9.000000)
 		InventorySize=6
 		SightMoveSpeedFactor=0.45
-		SightingTime=0.5
+		SightingTime=0.4	
+		ScopeScale=0.7
 		DisplaceDurationMult=1
 		MagAmmo=15
 		// sniper 4-8x

diff --git a/BWBP_SKC_Pro/Classes/AS50WeaponParamsComp.uc b/BWBP_SKC_Pro/Classes/AS50WeaponParamsComp.uc
@@ -8,7 +8,7 @@ defaultproperties
 
 	Begin Object Class=InstantEffectParams Name=ArenaPrimaryEffectParams
 		TraceRange=(Min=30000.000000,Max=30000.000000)
-		Damage=85
+		Damage=120
         HeadMult=1.75f
         LimbMult=0.85f
 		DamageType=Class'BWBP_SKC_Pro.DT_AS50Torso'
@@ -107,7 +107,8 @@ defaultproperties
         DisplaceDurationMult=1.25
 		InventorySize=7
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.650000		
+		SightingTime=0.5	
+		ScopeScale=0.7	
 		MagAmmo=8
         ZoomType=ZT_Logarithmic
         RecoilParams(0)=RecoilParams'ArenaRecoilParams'

diff --git a/BWBP_SKC_Pro/Classes/AS50WeaponParamsTactical.uc b/BWBP_SKC_Pro/Classes/AS50WeaponParamsTactical.uc
@@ -106,7 +106,8 @@ defaultproperties
         DisplaceDurationMult=1.25
 		InventorySize=7
         SightMoveSpeedFactor=0.35
-		SightingTime=0.8
+		SightingTime=0.5	
+		ScopeScale=0.7
 		MagAmmo=6
 		// sniper 4-8x
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_SKC_Pro/Classes/FLASHWeaponParamsComp.uc b/BWBP_SKC_Pro/Classes/FLASHWeaponParamsComp.uc
@@ -82,7 +82,8 @@ defaultproperties
         DisplaceDurationMult=1.25
 		InventorySize=8
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.350000		
+		SightingTime=0.4	
+		ScopeScale=0.7	
 		MagAmmo=4
         ZoomType=ZT_Fixed
         RecoilParams(0)=RecoilParams'ArenaRecoilParams'

diff --git a/BWBP_SKC_Pro/Classes/FLASHWeaponParamsTactical.uc b/BWBP_SKC_Pro/Classes/FLASHWeaponParamsTactical.uc
@@ -82,7 +82,8 @@ defaultproperties
         DisplaceDurationMult=1.25
 		InventorySize=8
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.50000		
+		SightingTime=0.4	
+		ScopeScale=0.7
 		MagAmmo=4
         ZoomType=ZT_Fixed
         RecoilParams(0)=RecoilParams'TacticalRecoilParams'

diff --git a/BWBP_SKC_Pro/Classes/LAWWeaponParamsComp.uc b/BWBP_SKC_Pro/Classes/LAWWeaponParamsComp.uc
@@ -83,7 +83,8 @@ defaultproperties
 		PlayerJumpFactor=0.9
 		InventorySize=8
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.60000		
+		SightingTime=0.5	
+		ScopeScale=0.7	
 		DisplaceDurationMult=1.25
 		MagAmmo=1
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_SKC_Pro/Classes/LAWWeaponParamsTactical.uc b/BWBP_SKC_Pro/Classes/LAWWeaponParamsTactical.uc
@@ -83,7 +83,8 @@ defaultproperties
 		PlayerJumpFactor=0.9
 		InventorySize=8
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.80000		
+		SightingTime=0.65	
+		ScopeScale=0.7
 		DisplaceDurationMult=1.25
 		MagAmmo=1
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_SKC_Pro/Classes/M2020WeaponParamsComp.uc b/BWBP_SKC_Pro/Classes/M2020WeaponParamsComp.uc
@@ -157,7 +157,8 @@ defaultproperties
 		PlayerSpeedFactor=0.95
 		InventorySize=7
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.500000		
+		SightingTime=0.45	
+		ScopeScale=0.75	
 		DisplaceDurationMult=1
 		MagAmmo=10
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_SKC_Pro/Classes/M2020WeaponParamsTactical.uc b/BWBP_SKC_Pro/Classes/M2020WeaponParamsTactical.uc
@@ -169,7 +169,8 @@ defaultproperties
 		PlayerSpeedFactor=0.95
 		InventorySize=7
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.65
+		SightingTime=0.45	
+		ScopeScale=0.75
 		DisplaceDurationMult=1
 		MagAmmo=10
 		// sniper 5-10x

diff --git a/BWBP_SKC_Pro/Classes/MARSWeaponParamsComp.uc b/BWBP_SKC_Pro/Classes/MARSWeaponParamsComp.uc
@@ -165,8 +165,9 @@ defaultproperties
 		ReloadAnimRate=1.10000
 		PlayerJumpFactor=1
 		InventorySize=6
+		ScopeScale=0.7
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.50000		
+		SightingTime=0.4		
 		DisplaceDurationMult=1
 		MagAmmo=30
         ZoomType=ZT_Logarithmic

diff --git a/BWBP_SKC_Pro/Classes/MARSWeaponParamsTactical.uc b/BWBP_SKC_Pro/Classes/MARSWeaponParamsTactical.uc
@@ -185,10 +185,11 @@ defaultproperties
 		ReloadAnimRate=0.85
 		InventorySize=6
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.5	
+		SightingTime=0.4	
 		DisplaceDurationMult=1
 		MagAmmo=30
 		// acog-like
+		ScopeScale=0.7
         ZoomType=ZT_Logarithmic
 		MinZoom=2
 		MaxZoom=4

diff --git a/BWBP_SKC_Pro/Classes/X82WeaponParamsComp.uc b/BWBP_SKC_Pro/Classes/X82WeaponParamsComp.uc
@@ -8,7 +8,7 @@ defaultproperties
 
 	Begin Object Class=InstantEffectParams Name=ArenaPrimaryEffectParams
 		TraceRange=(Min=30000.000000,Max=30000.000000)
-		Damage=95
+		Damage=120
         HeadMult=1.75f
         LimbMult=0.85f
 		PenetrationEnergy=128
@@ -88,7 +88,8 @@ defaultproperties
         DisplaceDurationMult=1.4
 		InventorySize=7
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.750000		
+		SightingTime=0.6	
+		ScopeScale=0.8	
 		MagAmmo=5
         ZoomType=ZT_Logarithmic
 		RecoilParams(0)=RecoilParams'ArenaRecoilParams'

diff --git a/BWBP_SKC_Pro/Classes/X82WeaponParamsTactical.uc b/BWBP_SKC_Pro/Classes/X82WeaponParamsTactical.uc
@@ -97,7 +97,8 @@ defaultproperties
         DisplaceDurationMult=1.4
 		InventorySize=7
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.8
+		SightingTime=0.6	
+		ScopeScale=0.8
 		MagAmmo=5
 		// sniper 5-10x
         ZoomType=ZT_Logarithmic

diff --git a/BallisticProV55/Classes/BallisticPlayer.uc b/BallisticProV55/Classes/BallisticPlayer.uc
@@ -1440,6 +1440,38 @@ function UpdateRotation(float DeltaTime, float maxPitch)
     }
 }
 
+// Azarael notes:
+//
+// compatibility 
+// the original function was written by someone who thought that the best place 
+// for the vote menu class string was a CONFIG variable of the fucking GUIController,
+// which is a class that can't be changed or changed easily
+//
+// this despite the fact that the desired voting menu is a concern / property of the VOTING SYSTEM, 
+// and its replication info is REQUIRED in order to open the menu in the first place??????
+//
+// some menus call SaveConfig on the GUIController, preventing temporary overrides
+// (client may crash or otherwise exit uncleanly, preventing us from resetting the value and saving, 
+// and potentially breaking the client's mapvote elsewhere)
+// 
+// can't intercept this with an Interaction either because PlayerController's exec function runs first in native code
+//
+// so we check the VoteReplicationInfo in use to see if it has an override, and fall back to the inbred behaviour otherwise
+exec function ShowVoteMenu()
+{
+	local string s;
+
+	if( Level.NetMode == NM_StandAlone ||  VoteReplicationInfo == None || !VoteReplicationInfo.MapVoteEnabled() )
+		return;
+
+	s = VoteReplicationInfo.GetPropertyText("MapVotingMenu");
+
+	if (s == "")
+		s = Player.GUIController.GetPropertyText("MapVotingMenu");
+
+	Player.GUIController.OpenMenu(s);
+}
+
 defaultproperties
 {
      WeapUIEnter=Sound'MenuSounds.selectDshort'

diff --git a/BallisticProV55/Classes/E23WeaponParamsComp.uc b/BallisticProV55/Classes/E23WeaponParamsComp.uc
@@ -153,7 +153,8 @@ defaultproperties
 
     Begin Object Class=WeaponParams Name=ArenaParams
 	    ReloadAnimRate=1.250000
-		SightingTime=0.550000	 
+		SightingTime=0.4
+		ScopeScale=0.7
         MagAmmo=100        
         InventorySize=6
         SightMoveSpeedFactor=0.6

diff --git a/BallisticProV55/Classes/E23WeaponParamsTactical.uc b/BallisticProV55/Classes/E23WeaponParamsTactical.uc
@@ -161,7 +161,8 @@ defaultproperties
 	//=================================================================	
 
     Begin Object Class=WeaponParams Name=TacticalParams
-		SightingTime=0.5
+		SightingTime=0.4
+		ScopeScale=0.7
         MagAmmo=100        
         InventorySize=6
         SightMoveSpeedFactor=0.35

diff --git a/BallisticProV55/Classes/G5WeaponParamsComp.uc b/BallisticProV55/Classes/G5WeaponParamsComp.uc
@@ -75,7 +75,8 @@ defaultproperties
 	    CockAnimRate=1.250000
 		ReloadAnimRate=1.250000
 		SightOffset=(X=-3.000000,Y=-6.000000,Z=4.500000)
-		SightingTime=0.550000	
+		SightingTime=0.5	
+		ScopeScale=0.7
         DisplaceDurationMult=1.25
         MagAmmo=2        
 		InventorySize=8

diff --git a/BallisticProV55/Classes/G5WeaponParamsTactical.uc b/BallisticProV55/Classes/G5WeaponParamsTactical.uc
@@ -72,7 +72,8 @@ defaultproperties
 
     Begin Object Class=WeaponParams Name=TacticalParams
 		SightOffset=(X=-3.000000,Y=-6.000000,Z=4.500000)
-		SightingTime=0.5
+		SightingTime=0.5	
+		ScopeScale=0.7
         DisplaceDurationMult=1.25
         MagAmmo=2        
 		InventorySize=8

diff --git a/BallisticProV55/Classes/M46WeaponParamsComp.uc b/BallisticProV55/Classes/M46WeaponParamsComp.uc
@@ -101,7 +101,8 @@ defaultproperties
 		//Function
         CockAnimRate=1.250000
 		ReloadAnimRate=1.250000
-		SightingTime=0.500000
+		SightingTime=0.4
+		ScopeScale=0.65
         SightMoveSpeedFactor=0.6
         MagAmmo=24
         InventorySize=6

diff --git a/BallisticProV55/Classes/M46WeaponParamsTactical.uc b/BallisticProV55/Classes/M46WeaponParamsTactical.uc
@@ -102,12 +102,13 @@ defaultproperties
 	//=================================================================	
 
     Begin Object Class=WeaponParams Name=TacticalParams_Scope
-		SightingTime=0.5
+		SightingTime=0.4
         SightMoveSpeedFactor=0.35
         MagAmmo=24
         InventorySize=6
 
 		// acog
+		ScopeScale=0.65
         ZoomType=ZT_Logarithmic
 		MinZoom=2
 		MaxZoom=4

diff --git a/BallisticProV55/Classes/M75WeaponParamsComp.uc b/BallisticProV55/Classes/M75WeaponParamsComp.uc
@@ -95,7 +95,8 @@ defaultproperties
 		PlayerSpeedFactor=0.9
         PlayerJumpFactor=0.9
 		SightMoveSpeedFactor=0.6
-        SightingTime=0.6
+		SightingTime=0.45	
+		ScopeScale=0.6
         MagAmmo=5
         InventorySize=8
         ZoomType=ZT_Logarithmic

diff --git a/BallisticProV55/Classes/M75WeaponParamsTactical.uc b/BallisticProV55/Classes/M75WeaponParamsTactical.uc
@@ -100,7 +100,8 @@ defaultproperties
 		PlayerSpeedFactor=0.9
         PlayerJumpFactor=0.9
 		SightMoveSpeedFactor=0.35
-        SightingTime=0.8
+		SightingTime=0.45	
+		ScopeScale=0.6
         MagAmmo=5
         InventorySize=7
 		// sniper 5-10x

diff --git a/BallisticProV55/Classes/MACWeaponParamsComp.uc b/BallisticProV55/Classes/MACWeaponParamsComp.uc
@@ -81,7 +81,8 @@ defaultproperties
 		PlayerSpeedFactor=0.9
 		PlayerJumpFactor=0.9
 		SightMoveSpeedFactor=0.6
-		SightingTime=0.450000
+		SightingTime=0.5	
+		ScopeScale=0.7
 		MagAmmo=5
         InventorySize=8
         ZoomType=ZT_Logarithmic

diff --git a/BallisticProV55/Classes/MACWeaponParamsTactical.uc b/BallisticProV55/Classes/MACWeaponParamsTactical.uc
@@ -83,7 +83,8 @@ defaultproperties
 		PlayerSpeedFactor=0.9
 		PlayerJumpFactor=0.9
 		SightMoveSpeedFactor=0.35
-		SightingTime=0.80000
+		SightingTime=0.8	
+		ScopeScale=0.7
 		MagAmmo=5
         InventorySize=8
 		// acog-like

diff --git a/BallisticProV55/Classes/MarlinWeaponParamsComp.uc b/BallisticProV55/Classes/MarlinWeaponParamsComp.uc
@@ -105,7 +105,7 @@ defaultproperties
 		Weight=30
 		//Attachments
 		WeaponBoneScales(0)=(BoneName="Gauss",Slot=19,Scale=0f)
-		SightOffset=(X=10.000000,Y=-0.070000,Z=4.750000)
+		SightOffset=(X=40.000000,Y=-0.070000,Z=4.750000)
 		//Function
 		WeaponModes(0)=(ModeName="Lever Action",ModeID="WM_SemiAuto",Value=1.000000)
 		WeaponModes(1)=(bUnavailable=True)