diff --git a/MskGs/Classes/KFWeapDef_AutoTurretFixed.uc b/MskGs/Classes/KFWeapDef_AutoTurretFixed.uc deleted file mode 100644 index 9a64016..0000000 --- a/MskGs/Classes/KFWeapDef_AutoTurretFixed.uc +++ /dev/null @@ -1,7 +0,0 @@ -class KFWeapDef_AutoTurretFixed extends KFWeapDef_AutoTurret; - -defaultproperties -{ - BuyPrice=666 - WeaponClassPath="KFGameContent.KFWeap_AutoTurretFixed" -} \ No newline at end of file diff --git a/MskGs/Classes/KFWeap_AutoTurretFixed.uc b/MskGs/Classes/KFWeap_AutoTurretFixed.uc deleted file mode 100644 index ddb8adc..0000000 --- a/MskGs/Classes/KFWeap_AutoTurretFixed.uc +++ /dev/null @@ -1,14 +0,0 @@ -class KFWeap_AutoTurretFixed extends KFWeap_AutoTurret; - -function CheckTurretAmmo() -{ - if (KFPC != None) - { - Super.CheckTurretAmmo(); - } -} - -defaultproperties -{ - -} \ No newline at end of file diff --git a/MskGs/Classes/MskGsMut.uc b/MskGs/Classes/MskGsMut.uc index ed4f2cf..ae55012 100644 --- a/MskGs/Classes/MskGsMut.uc +++ b/MskGs/Classes/MskGsMut.uc @@ -120,12 +120,6 @@ function Initialize() MyKFGI.KFGFxManagerClass = class'MskGsGFxMoviePlayer_Manager'; MyKFGI.MyKFGRI.VoteCollectorClass = class'MskGsVoteCollector'; - if (MyKFGI.PlayerControllerClass == class'KFGame.KFPlayerController') - MyKFGI.PlayerControllerClass = class'MskGsPlayerController'; - else if (MyKFGI.PlayerControllerClass == class'KFGameContent.KFPlayerControllerVersus') - MyKFGI.PlayerControllerClass = class'MskGsPlayerControllerVersus'; - else if (MyKFGI.PlayerControllerClass == class'KFGame.KFPlayerController_WeeklySurvival') - MyKFGI.PlayerControllerClass = class'MskGsPlayerController_WeeklySurvival'; MyKFGI.MyKFGRI.VoteCollector = new(MyKFGI.MyKFGRI) MyKFGI.MyKFGRI.VoteCollectorClass; VoteCollector = MskGsVoteCollector(MyKFGI.MyKFGRI.VoteCollector); diff --git a/MskGs/Classes/MskGsPlayerController.uc b/MskGs/Classes/MskGsPlayerController.uc deleted file mode 100644 index 02de53d..0000000 --- a/MskGs/Classes/MskGsPlayerController.uc +++ /dev/null @@ -1,65 +0,0 @@ -class MskGsPlayerController extends KFPlayerController; - -event Destroyed() -{ - local KFProjectile KFProj; - local int i; - - // Stop currently playing stingers when the map is being switched - if( StingerAkComponent != none ) - { - StingerAkComponent.StopEvents(); - } - - // Useful: - // https://wiki.beyondunreal.com/What_happens_when_an_Actor_is_destroyed - for (i = DeployedTurrets.Length - 1; i >= 0; --i) - { - if (DeployedTurrets[i] != None) - if (!DeployedTurrets[i].bPendingDelete && !DeployedTurrets[i].bDeleteMe) - DeployedTurrets[i].Destroy(); - - // don't worry about the Destroyed event on Turret - // because it doesn't do anything if the turret is not in the list - DeployedTurrets.Remove(i, 1); - } - - SetRTPCValue( 'Health', 100, true ); - PostAkEvent( LowHealthStopEvent ); - bPlayingLowHealthSFX = false; - - // Update projectiles in the world - foreach DynamicActors( class'KFProjectile', KFProj ) - { - if( KFProj.InstigatorController == self ) - { - KFProj.OnInstigatorControllerLeft(); - } - } - - if( LocalCustomizationPawn != none && !LocalCustomizationPawn.bPendingDelete ) - { - LocalCustomizationPawn.Destroy(); - } - - if (OnlineSub != none) - { - OnlineSub.ClearAllReadOnlineAvatarByNameCompleteDelegates(); - OnlineSub.ClearAllReadOnlineAvatarCompleteDelegates(); - } - - if (WorldInfo.NetMode != NM_DedicatedServer) - { - ClearMixerDelegates(); - ClearDiscord(); - } - - ClientMatchEnded(); - - Super(GamePlayerController).Destroyed(); -} - -defaultproperties -{ - -} \ No newline at end of file diff --git a/MskGs/Classes/MskGsPlayerControllerVersus.uc b/MskGs/Classes/MskGsPlayerControllerVersus.uc deleted file mode 100644 index 17b2154..0000000 --- a/MskGs/Classes/MskGsPlayerControllerVersus.uc +++ /dev/null @@ -1,65 +0,0 @@ -class MskGsPlayerControllerVersus extends KFPlayerControllerVersus; - -event Destroyed() -{ - local KFProjectile KFProj; - local int i; - - // Stop currently playing stingers when the map is being switched - if( StingerAkComponent != none ) - { - StingerAkComponent.StopEvents(); - } - - // Useful: - // https://wiki.beyondunreal.com/What_happens_when_an_Actor_is_destroyed - for (i = DeployedTurrets.Length - 1; i >= 0; --i) - { - if (DeployedTurrets[i] != None) - if (!DeployedTurrets[i].bPendingDelete && !DeployedTurrets[i].bDeleteMe) - DeployedTurrets[i].Destroy(); - - // don't worry about the Destroyed event on Turret - // because it doesn't do anything if the turret is not in the list - DeployedTurrets.Remove(i, 1); - } - - SetRTPCValue( 'Health', 100, true ); - PostAkEvent( LowHealthStopEvent ); - bPlayingLowHealthSFX = false; - - // Update projectiles in the world - foreach DynamicActors( class'KFProjectile', KFProj ) - { - if( KFProj.InstigatorController == self ) - { - KFProj.OnInstigatorControllerLeft(); - } - } - - if( LocalCustomizationPawn != none && !LocalCustomizationPawn.bPendingDelete ) - { - LocalCustomizationPawn.Destroy(); - } - - if (OnlineSub != none) - { - OnlineSub.ClearAllReadOnlineAvatarByNameCompleteDelegates(); - OnlineSub.ClearAllReadOnlineAvatarCompleteDelegates(); - } - - if (WorldInfo.NetMode != NM_DedicatedServer) - { - ClearMixerDelegates(); - ClearDiscord(); - } - - ClientMatchEnded(); - - Super(GamePlayerController).Destroyed(); -} - -defaultproperties -{ - -} \ No newline at end of file diff --git a/MskGs/Classes/MskGsPlayerController_WeeklySurvival.uc b/MskGs/Classes/MskGsPlayerController_WeeklySurvival.uc deleted file mode 100644 index 95b2f74..0000000 --- a/MskGs/Classes/MskGsPlayerController_WeeklySurvival.uc +++ /dev/null @@ -1,65 +0,0 @@ -class MskGsPlayerController_WeeklySurvival extends KFPlayerController_WeeklySurvival; - -event Destroyed() -{ - local KFProjectile KFProj; - local int i; - - // Stop currently playing stingers when the map is being switched - if( StingerAkComponent != none ) - { - StingerAkComponent.StopEvents(); - } - - // Useful: - // https://wiki.beyondunreal.com/What_happens_when_an_Actor_is_destroyed - for (i = DeployedTurrets.Length - 1; i >= 0; --i) - { - if (DeployedTurrets[i] != None) - if (!DeployedTurrets[i].bPendingDelete && !DeployedTurrets[i].bDeleteMe) - DeployedTurrets[i].Destroy(); - - // don't worry about the Destroyed event on Turret - // because it doesn't do anything if the turret is not in the list - DeployedTurrets.Remove(i, 1); - } - - SetRTPCValue( 'Health', 100, true ); - PostAkEvent( LowHealthStopEvent ); - bPlayingLowHealthSFX = false; - - // Update projectiles in the world - foreach DynamicActors( class'KFProjectile', KFProj ) - { - if( KFProj.InstigatorController == self ) - { - KFProj.OnInstigatorControllerLeft(); - } - } - - if( LocalCustomizationPawn != none && !LocalCustomizationPawn.bPendingDelete ) - { - LocalCustomizationPawn.Destroy(); - } - - if (OnlineSub != none) - { - OnlineSub.ClearAllReadOnlineAvatarByNameCompleteDelegates(); - OnlineSub.ClearAllReadOnlineAvatarCompleteDelegates(); - } - - if (WorldInfo.NetMode != NM_DedicatedServer) - { - ClearMixerDelegates(); - ClearDiscord(); - } - - ClientMatchEnded(); - - Super(GamePlayerController).Destroyed(); -} - -defaultproperties -{ - -} \ No newline at end of file