KillingFloor2/KF2-YetAnotherScoreboard
KillingFloor2/KF2-YetAnotherScoreboard
1
0
Fork 0
Code Releases 7 Activity

more renames

Browse Source
This commit is contained in:
GenZmeY 2021-05-16 06:37:39 +03:00
parent e715f274e2
commit 9dae3489e6
14 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ScoreboardExt/Classes/DamageReplicationInfo.uc
View File

@ -4,7 +4,7 @@ var KFPlayerController KFPC;
unreliable client function ClientNumberMsg( int Count, vector Pos, class<KFDamageType> Type ) unreliable client function ClientNumberMsg( int Count, vector Pos, class<KFDamageType> Type )
{ {
ClassicKFHUD(KFPC.MyHUD).AddNumberMsg(Count,Pos,Type); ScoreboardExtHUD(KFPC.MyHUD).AddNumberMsg(Count,Pos,Type);
} }
defaultproperties defaultproperties

2
ScoreboardExt/Classes/GUIStyleBase.uc
View File

@ -11,7 +11,7 @@ var() byte MaxFontScale;
var float DefaultHeight; // Default font text size. var float DefaultHeight; // Default font text size.
var transient Canvas Canvas; var transient Canvas Canvas;
var transient KF2GUIController Owner; var transient KF2GUIController Owner;
var transient ClassicKFHUD HUDOwner; var transient ScoreboardExtHUD HUDOwner;
var Font MainFont, NumberFont, InfiniteFont; var Font MainFont, NumberFont, InfiniteFont;
var Color BlurColor, BlurColor2; var Color BlurColor, BlurColor2;

24
ScoreboardExt/Classes/KF1HUD_BossHealthBar.uc
View File

@ -2,9 +2,9 @@ class KF1HUD_BossHealthBar extends KFGFxWidget_BossHealthBar;
function TickHud(float DeltaTime) function TickHud(float DeltaTime)
{ {
local ClassicKFHUD HUD; local ScoreboardExtHUD HUD;
HUD = ClassicKFHUD(KFPC.MyHUD); HUD = ScoreboardExtHUD(KFPC.MyHUD);
if(KFPC.bHideBossHealthBar != bLastHideValue) if(KFPC.bHideBossHealthBar != bLastHideValue)
{ {
bLastHideValue = KFPC.bHideBossHealthBar; bLastHideValue = KFPC.bHideBossHealthBar;
@ -18,9 +18,9 @@ function TickHud(float DeltaTime)
function SetEscortPawn(KFPawn_Scripted NewPawn) function SetEscortPawn(KFPawn_Scripted NewPawn)
{ {
local ClassicKFHUD HUD; local ScoreboardExtHUD HUD;
HUD = ClassicKFHUD(KFPC.MyHUD); HUD = ScoreboardExtHUD(KFPC.MyHUD);
if (NewPawn == none) if (NewPawn == none)
return; return;
@ -37,25 +37,25 @@ function SetBossPawn(KFInterface_MonsterBoss NewBoss)
if(NewBoss == None || KFPC.bHideBossHealthBar) if(NewBoss == None || KFPC.bHideBossHealthBar)
return; return;
ClassicKFHUD(KFPC.MyHUD).BossInfoIcon = Texture2D(DynamicLoadObject(NewBoss.GetIconPath(),class'Texture2D')); ScoreboardExtHUD(KFPC.MyHUD).BossInfoIcon = Texture2D(DynamicLoadObject(NewBoss.GetIconPath(),class'Texture2D'));
ClassicKFHUD(KFPC.MyHUD).BossPawn = NewBoss; ScoreboardExtHUD(KFPC.MyHUD).BossPawn = NewBoss;
} }
function UpdateBossShield(float NewShieldPercect) function UpdateBossShield(float NewShieldPercect)
{ {
ClassicKFHUD(KFPC.MyHUD).BossShieldPct = NewShieldPercect; ScoreboardExtHUD(KFPC.MyHUD).BossShieldPct = NewShieldPercect;
} }
function UpdateBossBattlePhase(int BattlePhase) function UpdateBossBattlePhase(int BattlePhase)
{ {
ClassicKFHUD(KFPC.MyHUD).BossBattlePhaseColor = ClassicKFHUD(KFPC.MyHUD).BattlePhaseColors[Max(BattlePhase - 1, 0)]; ScoreboardExtHUD(KFPC.MyHUD).BossBattlePhaseColor = ScoreboardExtHUD(KFPC.MyHUD).BattlePhaseColors[Max(BattlePhase - 1, 0)];
} }
function OnNamePlateHidden() function OnNamePlateHidden()
{ {
local ClassicKFHUD HUD; local ScoreboardExtHUD HUD;
HUD = ClassicKFHUD(KFPC.MyHUD); HUD = ScoreboardExtHUD(KFPC.MyHUD);
if(KFPC.bHideBossHealthBar && HUD.ScriptedPawn == none) if(KFPC.bHideBossHealthBar && HUD.ScriptedPawn == none)
return; return;
@ -66,9 +66,9 @@ function OnNamePlateHidden()
simulated function Deactivate() simulated function Deactivate()
{ {
local ClassicKFHUD HUD; local ScoreboardExtHUD HUD;
HUD = ClassicKFHUD(KFPC.MyHUD); HUD = ScoreboardExtHUD(KFPC.MyHUD);
HUD.BossInfoIcon = None; HUD.BossInfoIcon = None;
HUD.BossPawn = None; HUD.BossPawn = None;

7
ScoreboardExt/Classes/KF1HUD_MusicNotification.uc
View File

@ -1,12 +1,13 @@
class KF1HUD_MusicNotification extends KFGFxWidget_MusicNotification; class KF1HUD_MusicNotification extends KFGFxWidget_MusicNotification
dependson(ScoreboardExtHUD);
function ShowSongInfo(string SongInfoString) function ShowSongInfo(string SongInfoString)
{ {
local KFGameEngine KFEngine; local KFGameEngine KFEngine;
local ClassicKFHUD HUD; local ScoreboardExtHUD HUD;
local PopupMessage Msg; local PopupMessage Msg;
HUD = ClassicKFHUD(GetPC().MyHUD); HUD = ScoreboardExtHUD(GetPC().MyHUD);
KFEngine = KFGameEngine(Class'Engine'.static.GetEngine()); KFEngine = KFGameEngine(Class'Engine'.static.GetEngine());
if(KFEngine != none && KFEngine.MusicVolumeMultiplier > 0) if(KFEngine != none && KFEngine.MusicVolumeMultiplier > 0)

2
ScoreboardExt/Classes/KF1HUD_PlayerStatus.uc
View File

@ -3,7 +3,7 @@ class KF1HUD_PlayerStatus extends KFGFxHUD_PlayerStatus;
function UpdateXP(int XPDelta, int XPPercent, bool bLevelUp, Class<KFPerk> PerkClass) function UpdateXP(int XPDelta, int XPPercent, bool bLevelUp, Class<KFPerk> PerkClass)
{ {
if(!bLevelUp && MyPC.GetPerkLevelFromPerkList(PerkClass) < `MAX_PERK_LEVEL) if(!bLevelUp && MyPC.GetPerkLevelFromPerkList(PerkClass) < `MAX_PERK_LEVEL)
ClassicKFHUD(MyPC.MyHUD).NotifyXPEarned(XPDelta,PerkClass.default.PerkIcon,MakeColor(255, 255 * (KFPlayerReplicationInfo(MyPC.PlayerReplicationInfo).GetActivePerkLevel()/`MAX_PERK_LEVEL), 0, 255)); ScoreboardExtHUD(MyPC.MyHUD).NotifyXPEarned(XPDelta,PerkClass.default.PerkIcon,MakeColor(255, 255 * (KFPlayerReplicationInfo(MyPC.PlayerReplicationInfo).GetActivePerkLevel()/`MAX_PERK_LEVEL), 0, 255));
Super.UpdateXP(XPDelta, XPPercent, bLevelUp, PerkClass); Super.UpdateXP(XPDelta, XPPercent, bLevelUp, PerkClass);
} }

4
ScoreboardExt/Classes/KF1HUD_WeaponSelectWidget.uc
View File

@ -2,9 +2,9 @@ class KF1HUD_WeaponSelectWidget extends KFGFxHUD_WeaponSelectWidget;
function SetSelectedWeapon(int GroupIndex, int SelectedIndex) function SetSelectedWeapon(int GroupIndex, int SelectedIndex)
{ {
local ClassicKFHUD HUD; local ScoreboardExtHUD HUD;
HUD = ClassicKFHUD(GetPC().MyHUD); HUD = ScoreboardExtHUD(GetPC().MyHUD);
if( !HUD.bDisplayInventory ) if( !HUD.bDisplayInventory )
{ {
HUD.bDisplayInventory = true; HUD.bDisplayInventory = true;

7
ScoreboardExt/Classes/KF1_HUDWrapper.uc
View File

@ -1,4 +1,5 @@
class KF1_HUDWrapper extends KFGFxMoviePlayer_HUD; class KF1_HUDWrapper extends KFGFxMoviePlayer_HUD
dependson(ScoreboardExtHUD);
event bool WidgetInitialized(name WidgetName, name WidgetPath, GFxObject Widget) event bool WidgetInitialized(name WidgetName, name WidgetPath, GFxObject Widget)
{ {
@ -145,7 +146,7 @@ function DisplayPriorityMessage(string InPrimaryMessageString, string InSecondar
break; break;
} }
ClassicKFHUD(KFPC.myHUD).ShowPriorityMessage(PriorityMsg); ScoreboardExtHUD(KFPC.myHUD).ShowPriorityMessage(PriorityMsg);
} }
function string GetExpandedWaveInfo() function string GetExpandedWaveInfo()
@ -205,7 +206,7 @@ function ShowKillMessage(PlayerReplicationInfo PRI1, PlayerReplicationInfo PRI2,
KilledName=PRI2.PlayerName; KilledName=PRI2.PlayerName;
} }
ClassicKFHUD(KFPC.myHUD).ShowKillMessage(PRI1, PRI2, bHumanDeath, KilledName, KillerName); ScoreboardExtHUD(KFPC.myHUD).ShowKillMessage(PRI1, PRI2, bHumanDeath, KilledName, KillerName);
} }
DefaultProperties DefaultProperties

12
ScoreboardExt/Classes/KF2GUIController.uc
View File

@ -4,7 +4,7 @@ Class KF2GUIController extends Info
var() class<GUIStyleBase> DefaultStyle; var() class<GUIStyleBase> DefaultStyle;
var PlayerController PlayerOwner; var PlayerController PlayerOwner;
var ClassicKFHUD HUDOwner; var ScoreboardExtHUD HUDOwner;
var transient KF2GUIInput CustomInput; var transient KF2GUIInput CustomInput;
var transient PlayerInput BackupInput; var transient PlayerInput BackupInput;
var transient GameViewportClient ClientViewport; var transient GameViewportClient ClientViewport;
@ -44,7 +44,7 @@ static function KF2GUIController GetGUIController( PlayerController PC )
return None; return None;
} }
foreach PC.ChildActors(class'KFClassicHUD.KF2GUIController',G) foreach PC.ChildActors(class'ScoreboardExt.KF2GUIController',G)
{ {
if( !G.bIsInvalid ) if( !G.bIsInvalid )
{ {
@ -54,7 +54,7 @@ static function KF2GUIController GetGUIController( PlayerController PC )
if( G==None ) if( G==None )
{ {
G = PC.Spawn(class'KFClassicHUD.KF2GUIController',PC); G = PC.Spawn(class'ScoreboardExt.KF2GUIController',PC);
} }
return G; return G;
@ -64,7 +64,7 @@ simulated function PostBeginPlay()
{ {
PlayerOwner = PlayerController(Owner); PlayerOwner = PlayerController(Owner);
ClientViewport = LocalPlayer(PlayerOwner.Player).ViewportClient; ClientViewport = LocalPlayer(PlayerOwner.Player).ViewportClient;
HUDOwner = ClassicKFHUD(PlayerOwner.myHUD); HUDOwner = ScoreboardExtHUD(PlayerOwner.myHUD);
CurrentStyle = new (None) DefaultStyle; CurrentStyle = new (None) DefaultStyle;
CurrentStyle.InitStyle(); CurrentStyle.InitStyle();
@ -232,7 +232,7 @@ simulated function HandleDrawMenu()
{ {
if( HackConsole==None ) if( HackConsole==None )
{ {
HackConsole = new(ClientViewport)class'KFClassicHUD.KFGUIConsoleHack'; HackConsole = new(ClientViewport)class'ScoreboardExt.KFGUIConsoleHack';
HackConsole.OutputObject = Self; HackConsole.OutputObject = Self;
} }
if( HackConsole!=ClientViewport.ViewportConsole ) if( HackConsole!=ClientViewport.ViewportConsole )
@ -352,7 +352,7 @@ simulated final function SetMenuState( bool bActive )
{ {
if( CustomInput==None ) if( CustomInput==None )
{ {
CustomInput = new (KFPlayerController(PlayerOwner)) class'KFClassicHUD.KF2GUIInput'; CustomInput = new (KFPlayerController(PlayerOwner)) class'ScoreboardExt.KF2GUIInput';
CustomInput.ControllerOwner = Self; CustomInput.ControllerOwner = Self;
CustomInput.OnReceivedNativeInputKey = ReceivedInputKey; CustomInput.OnReceivedNativeInputKey = ReceivedInputKey;
CustomInput.BaseInput = PlayerOwner.PlayerInput; CustomInput.BaseInput = PlayerOwner.PlayerInput;

2
ScoreboardExt/Classes/KFGUI_Base.uc
View File

@ -3,7 +3,7 @@ Class KFGUI_Base extends Object
abstract; abstract;
var KF2GUIController Owner; var KF2GUIController Owner;
var ClassicKFHUD HUDOwner; var ScoreboardExtHUD HUDOwner;
var KFGUI_Base ParentComponent; // Parent component if any. var KFGUI_Base ParentComponent; // Parent component if any.
var transient Canvas Canvas; var transient Canvas Canvas;

8
ScoreboardExt/Classes/ClassicKFHUD.uc → ScoreboardExt/Classes/ScoreboardExtHUD.uc
View File

@ -1,5 +1,5 @@
class ClassicKFHUD extends KFGFxHudWrapper class ScoreboardExtHUD extends KFGFxHudWrapper
config(ClassicHUD); config(ScoreboardExtMut);
const GFxListenerPriority = 80000; const GFxListenerPriority = 80000;
@ -608,7 +608,7 @@ function PostRender()
if( GUIController==None || GUIController.bIsInvalid ) if( GUIController==None || GUIController.bIsInvalid )
{ {
GUIController = Class'KFClassicHUD.KF2GUIController'.Static.GetGUIController(PlayerOwner); GUIController = Class'ScoreboardExt.KF2GUIController'.Static.GetGUIController(PlayerOwner);
if( GUIController!=None ) if( GUIController!=None )
{ {
GUIStyle = GUIController.CurrentStyle; GUIStyle = GUIController.CurrentStyle;
@ -3725,7 +3725,7 @@ simulated function CheckAndDrawHiddenPlayerIcons( array<PlayerReplicationInfo> V
exec function OpenSettingsMenu() exec function OpenSettingsMenu()
{ {
GUIController.OpenMenu(class'KFClassicHUD.UI_MidGameMenu'); GUIController.OpenMenu(class'ScoreboardExt.UI_MidGameMenu');
} }
exec function SetShowScores(bool bNewValue) exec function SetShowScores(bool bNewValue)

4
ScoreboardExt/Classes/ClassicHUD.uc → ScoreboardExt/Classes/ScoreboardExtMut.uc
View File

@ -1,4 +1,4 @@
class ClassicHUD extends KFMutator; class ScoreboardExtMut extends KFMutator;
var KFPawn LastHitZed; var KFPawn LastHitZed;
var int LastHitHP; var int LastHitHP;
@ -16,7 +16,7 @@ var array<RepInfoS> DamageReplicationInfos;
function PostBeginPlay() function PostBeginPlay()
{ {
Super.PostBeginPlay(); Super.PostBeginPlay();
WorldInfo.Game.HUDType = class'ClassicKFHUD'; WorldInfo.Game.HUDType = class'ScoreboardExtHUD';
} }
function NetDamage(int OriginalDamage, out int Damage, Pawn Injured, Controller InstigatedBy, vector HitLocation, out vector Momentum, class<DamageType> DamageType, Actor DamageCauser) function NetDamage(int OriginalDamage, out int Damage, Pawn Injured, Controller InstigatedBy, vector HitLocation, out vector Momentum, class<DamageType> DamageType, Actor DamageCauser)

4
ScoreboardExt/Classes/UIP_ColorSettings.uc
View File

@ -2,11 +2,11 @@ Class UIP_ColorSettings extends KFGUI_MultiComponent;
var KFGUI_ComponentList SettingsBox; var KFGUI_ComponentList SettingsBox;
var KFGUI_ColorSlider MainHudSlider,OutlineSlider,FontSlider,ArmorSlider,HealthSlider; var KFGUI_ColorSlider MainHudSlider,OutlineSlider,FontSlider,ArmorSlider,HealthSlider;
var ClassicKFHUD HUD; var ScoreboardExtHUD HUD;
function InitMenu() function InitMenu()
{ {
HUD = ClassicKFHUD(GetPlayer().myHUD); HUD = ScoreboardExtHUD(GetPlayer().myHUD);
Super.InitMenu(); Super.InitMenu();

4
ScoreboardExt/Classes/UIP_Settings.uc
View File

@ -5,7 +5,7 @@ var KFGUI_TextLable ResetColorLabel,PerkStarsLabel,PerkStarsRowLabel,ControllerT
var KFGUI_EditBox PerkStarsBox, PerkRowsBox; var KFGUI_EditBox PerkStarsBox, PerkRowsBox;
var KFGUI_ComboBox ControllerBox; var KFGUI_ComboBox ControllerBox;
var ClassicKFHUD HUD; var ScoreboardExtHUD HUD;
var KFPlayerController PC; var KFPlayerController PC;
function InitMenu() function InitMenu()
@ -13,7 +13,7 @@ function InitMenu()
local string S; local string S;
PC = KFPlayerController(GetPlayer()); PC = KFPlayerController(GetPlayer());
HUD = ClassicKFHUD(PC.myHUD); HUD = ScoreboardExtHUD(PC.myHUD);
Super.InitMenu(); Super.InitMenu();

2
make.sh
View File

@ -162,7 +162,7 @@ echo "Map=\"KF-Outpost\"
Game=\"KFGameContent.KFGameInfo_Survival\" Game=\"KFGameContent.KFGameInfo_Survival\"
Difficulty=\"0\" Difficulty=\"0\"
GameLength=\"0\" GameLength=\"0\"
Mutators=\"KFClassicHUD.ClassicHUD\" Mutators=\"ScoreboardExt.ScoreboardExtMut\"
Args=\"\"" > "$MutTestingIni" Args=\"\"" > "$MutTestingIni"
} }