KillingFloor2/KF2-MSK-GS
KillingFloor2/KF2-MSK-GS
1
0
Fork 0
Code Releases 3 Activity

[f] fix ProxyZed XP

Browse Source
This commit is contained in:
GenZmeY 2021-12-09 07:44:41 +03:00
parent ff23b17c54
commit dbc90167f1
29 changed files with 107 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MskGs/Classes/KFGameInfoHelper.uc
View File

@ -90,12 +90,7 @@ public static function UpdateGameSettings(KFGameInfo_Survival KFGI, bool bUsesSt
public static function class<KFPawn_Monster> PickProxyZed(class<KFPawn_Monster> MonsterClass, Controller Killer, MskGsMut Mut) public static function class<KFPawn_Monster> PickProxyZed(class<KFPawn_Monster> MonsterClass, Controller Killer, MskGsMut Mut)
{ {
`log("[MSK-GS] DBG: Length:"@Mut.MskGsMemberList.Length); if (Mut.MskGsMemberList.Find(Killer) == INDEX_NONE) return MonsterClass;
if (Mut.MskGsMemberList.Find(Killer) == INDEX_NONE)
{
`log("[MSK-GS] DBG:"@MonsterClass);
return MonsterClass;
}
switch (MonsterClass) switch (MonsterClass)
{ {
@ -127,7 +122,6 @@ public static function class<KFPawn_Monster> PickProxyZed(class<KFPawn_Monster>
case class'KFPawn_ZedStalker': MonsterClass = class'KFPawnProxy_ZedStalker'; break; case class'KFPawn_ZedStalker': MonsterClass = class'KFPawnProxy_ZedStalker'; break;
} }
`log("[MSK-GS] DBG:"@MonsterClass);
return MonsterClass; return MonsterClass;
} }

8
MskGs/Classes/KFPawnProxy_ZedBloat.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedBloat extends KFPawn_ZedBloat;
DefaultProperties DefaultProperties
{ {
XPValues(0)=17 * 1.1f XPValues(0)=19 // 17
XPValues(1)=22 * 1.1f XPValues(1)=24 // 22
XPValues(2)=30 * 1.1f XPValues(2)=33 // 30
XPValues(3)=34 * 1.1f XPValues(3)=37 // 34
} }

8
MskGs/Classes/KFPawnProxy_ZedBloatKing.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedBloatKing extends KFPawn_ZedBloatKing;
defaultproperties defaultproperties
{ {
XPValues(0)=1291 * 1.1f XPValues(0)=1420 // 1291
XPValues(1)=1694 * 1.1f XPValues(1)=1863 // 1694
XPValues(2)=1790 * 1.1f XPValues(2)=1969 // 1790
XPValues(3)=1843 * 1.1f XPValues(3)=2027 // 1843
} }

8
MskGs/Classes/KFPawnProxy_ZedBloatKingSubspawn.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedBloatKingSubspawn extends KFPawn_ZedBloatKingSubspawn;
defaultproperties defaultproperties
{ {
XPValues(0)=8 * 1.1f XPValues(0)=9 // 8
XPValues(1)=10 * 1.1f XPValues(1)=11 // 10
XPValues(2)=10 * 1.1f XPValues(2)=11 // 10
XPValues(3)=10 * 1.1f XPValues(3)=11 // 10
} }

8
MskGs/Classes/KFPawnProxy_ZedBloatKing_SantasWorkshop.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedBloatKing_SantasWorkshop extends KFPawn_ZedBloatKing_Santas
defaultproperties defaultproperties
{ {
XPValues(0)=1291 * 1.1f XPValues(0)=1291
XPValues(1)=1694 * 1.1f XPValues(1)=1694
XPValues(2)=1790 * 1.1f XPValues(2)=1969 // 1790
XPValues(3)=1843 * 1.1f XPValues(3)=2027 // 1843
} }

8
MskGs/Classes/KFPawnProxy_ZedClot_Alpha.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedClot_Alpha extends KFPawn_ZedClot;
DefaultProperties DefaultProperties
{ {
XPValues(0)=8 * 1.1f XPValues(0)=9 // 8
XPValues(1)=11 * 1.1f XPValues(1)=12 // 11
XPValues(2)=11 * 1.1f XPValues(2)=12 // 11
XPValues(3)=11 * 1.1f XPValues(3)=12 // 11
} }

8
MskGs/Classes/KFPawnProxy_ZedClot_AlphaKing.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedClot_AlphaKing extends KFPawn_ZedClot_AlphaKing;
defaultproperties defaultproperties
{ {
XPValues(0)=8 * 1.1f XPValues(0)=9 // 8
XPValues(1)=11 * 1.1f XPValues(1)=12 // 11
XPValues(2)=11 * 1.1f XPValues(2)=12 // 11
XPValues(3)=11 * 1.1f XPValues(3)=12 // 11
} }

8
MskGs/Classes/KFPawnProxy_ZedClot_Cyst.uc
View File

@ -2,10 +2,10 @@ class KFPawnProxy_ZedClot_Cyst extends KFPawn_ZedClot_Cyst;
defaultproperties defaultproperties
{ {
XPValues(0)=8 * 1.1f XPValues(0)=9 // 8
XPValues(1)=11 * 1.1f XPValues(1)=12 // 11
XPValues(2)=11 * 1.1f XPValues(2)=12 // 11
XPValues(3)=11 * 1.1f XPValues(3)=12 // 11
} }

8
MskGs/Classes/KFPawnProxy_ZedClot_Slasher.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedClot_Slasher extends KFPawn_ZedClot_Slasher;
DefaultProperties DefaultProperties
{ {
XPValues(0)=8 * 1.1f XPValues(0)=9 // 8
XPValues(1)=11 * 1.1f XPValues(1)=12 // 11
XPValues(2)=11 * 1.1f XPValues(2)=12 // 11
XPValues(3)=11 * 1.1f XPValues(3)=12 // 11
} }

8
MskGs/Classes/KFPawnProxy_ZedCrawler.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedCrawler extends KFPawn_ZedCrawler;
defaultproperties defaultproperties
{ {
XPValues(0)=8 * 1.1f XPValues(0)=9 // 8
XPValues(1)=10 * 1.1f XPValues(1)=11 // 10
XPValues(2)=10 * 1.1f XPValues(2)=11 // 10
XPValues(3)=10 * 1.1f XPValues(3)=11 // 10
} }

8
MskGs/Classes/KFPawnProxy_ZedCrawlerKing.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedCrawlerKing extends KFPawn_ZedCrawlerKing;
defaultproperties defaultproperties
{ {
XPValues(0)=8 * 1.1f XPValues(0)=9 // 8
XPValues(1)=10 * 1.1f XPValues(1)=11 // 10
XPValues(2)=10 * 1.1f XPValues(2)=11 // 10
XPValues(3)=10 * 1.1f XPValues(3)=11 // 10
} }

8
MskGs/Classes/KFPawnProxy_ZedDAR.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedDAR extends KFPawn_ZedDAR;
defaultproperties defaultproperties
{ {
XPValues(0)=15 * 1.1f XPValues(0)=17 // 15
XPValues(1)=20 * 1.1f XPValues(1)=22 // 20
XPValues(2)=27 * 1.1f XPValues(2)=30 // 27
XPValues(3)=31 * 1.1f XPValues(3)=34 // 31
} }

8
MskGs/Classes/KFPawnProxy_ZedDAR_EMP.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedDAR_EMP extends KFPawn_ZedDAR_EMP;
defaultproperties defaultproperties
{ {
XPValues(0)=15 * 1.1f XPValues(0)=17 // 15
XPValues(1)=20 * 1.1f XPValues(1)=22 // 20
XPValues(2)=27 * 1.1f XPValues(2)=30 // 27
XPValues(3)=31 * 1.1f XPValues(3)=34 // 31
} }

8
MskGs/Classes/KFPawnProxy_ZedDAR_Laser.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedDAR_Laser extends KFPawn_ZedDAR_Laser;
defaultproperties defaultproperties
{ {
XPValues(0)=15 * 1.1f XPValues(0)=17 // 15
XPValues(1)=20 * 1.1f XPValues(1)=22 // 20
XPValues(2)=27 * 1.1f XPValues(2)=30 // 27
XPValues(3)=31 * 1.1f XPValues(3)=34 // 31
} }

8
MskGs/Classes/KFPawnProxy_ZedDAR_Rocket.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedDAR_Rocket extends KFPawn_ZedDAR_Rocket;
defaultproperties defaultproperties
{ {
XPValues(0)=15 * 1.1f XPValues(0)=17 // 15
XPValues(1)=20 * 1.1f XPValues(1)=22 // 20
XPValues(2)=27 * 1.1f XPValues(2)=30 // 27
XPValues(3)=31 * 1.1f XPValues(3)=34 // 31
} }

8
MskGs/Classes/KFPawnProxy_ZedFleshpound.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedFleshpound extends KFPawn_ZedFleshpound;
DefaultProperties DefaultProperties
{ {
XPValues(0)=35 * 1.1f XPValues(0)=39 // 35
XPValues(1)=47 * 1.1f XPValues(1)=52 // 47
XPValues(2)=63 * 1.1f XPValues(2)=69 // 63
XPValues(3)=72 * 1.1f XPValues(3)=79 // 72
} }

8
MskGs/Classes/KFPawnProxy_ZedFleshpoundKing.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedFleshpoundKing extends KFPawn_ZedFleshpoundKing;
DefaultProperties DefaultProperties
{ {
XPValues(0)=1291 * 1.1f XPValues(0)=1291
XPValues(1)=1694 * 1.1f XPValues(1)=1694
XPValues(2)=1790 * 1.1f XPValues(2)=1969 // 1790
XPValues(3)=1843 * 1.1f XPValues(3)=2027 // 1843
} }

8
MskGs/Classes/KFPawnProxy_ZedFleshpoundMini.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedFleshpoundMini extends KFPawn_ZedFleshpoundMini;
defaultproperties defaultproperties
{ {
XPValues(0)=17 * 1.1f XPValues(0)=19 // 17
XPValues(1)=22 * 1.1f XPValues(1)=24 // 22
XPValues(2)=30 * 1.1f XPValues(2)=33 // 30
XPValues(3)=34 * 1.1f XPValues(3)=37 // 34
} }

8
MskGs/Classes/KFPawnProxy_ZedGorefast.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedGorefast extends KFPawn_ZedGorefast;
DefaultProperties DefaultProperties
{ {
XPValues(0)=11 * 1.1f XPValues(0)=12 // 11
XPValues(1)=14 * 1.1f XPValues(1)=15 // 14
XPValues(2)=14 * 1.1f XPValues(2)=15 // 14
XPValues(3)=14 * 1.1f XPValues(3)=15 // 14
} }

8
MskGs/Classes/KFPawnProxy_ZedGorefastDualBlade.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedGorefastDualBlade extends KFPawn_ZedGorefastDualBlade;
defaultproperties defaultproperties
{ {
XPValues(0)=11 * 1.1f XPValues(0)=12 // 11
XPValues(1)=14 * 1.1f XPValues(1)=15 // 14
XPValues(2)=14 * 1.1f XPValues(2)=15 // 14
XPValues(3)=14 * 1.1f XPValues(3)=15 // 14
} }

8
MskGs/Classes/KFPawnProxy_ZedHans.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedHans extends KFPawn_ZedHans;
DefaultProperties DefaultProperties
{ {
XPValues(0)=1291 * 1.1f XPValues(0)=1291
XPValues(1)=1694 * 1.1f XPValues(1)=1694
XPValues(2)=1790 * 1.1f XPValues(2)=1969 // 1790
XPValues(3)=1843 * 1.1f XPValues(3)=2027 // 1843
} }

8
MskGs/Classes/KFPawnProxy_ZedHusk.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedHusk extends KFPawn_ZedHusk;
DefaultProperties DefaultProperties
{ {
XPValues(0)=15 * 1.1f XPValues(0)=17 // 15
XPValues(1)=20 * 1.1f XPValues(1)=22 // 20
XPValues(2)=27 * 1.1f XPValues(2)=30 // 27
XPValues(3)=31 * 1.1f XPValues(3)=34 // 31
} }

8
MskGs/Classes/KFPawnProxy_ZedMatriarch.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedMatriarch extends KFPawn_ZedMatriarch;
defaultproperties defaultproperties
{ {
XPValues(0)=1291 * 1.1f XPValues(0)=1291
XPValues(1)=1694 * 1.1f XPValues(1)=1694
XPValues(2)=1790 * 1.1f XPValues(2)=1969 // 1790
XPValues(3)=1843 * 1.1f XPValues(3)=2027 // 1843
} }

8
MskGs/Classes/KFPawnProxy_ZedPatriarch.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedPatriarch extends KFPawn_ZedPatriarch;
defaultproperties defaultproperties
{ {
XPValues(0)=1291 * 1.1f XPValues(0)=1291
XPValues(1)=1694 * 1.1f XPValues(1)=1694
XPValues(2)=1790 * 1.1f XPValues(2)=1969 // 1790
XPValues(3)=1843 * 1.1f XPValues(3)=2027 // 1843
} }

8
MskGs/Classes/KFPawnProxy_ZedScrake.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedScrake extends KFPawn_ZedScrake;
defaultproperties defaultproperties
{ {
XPValues(0)=34 * 1.1f XPValues(0)=37 // 34
XPValues(1)=45 * 1.1f XPValues(1)=50 // 45
XPValues(2)=60 * 1.1f XPValues(2)=66 // 60
XPValues(3)=69 * 1.1f XPValues(3)=76 // 69
} }

8
MskGs/Classes/KFPawnProxy_ZedSiren.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedSiren extends KFPawn_ZedSiren;
defaultproperties defaultproperties
{ {
XPValues(0)=11 * 1.1f XPValues(0)=12 // 11
XPValues(1)=15 * 1.1f XPValues(1)=17 // 15
XPValues(2)=15 * 1.1f XPValues(2)=17 // 15
XPValues(3)=15 * 1.1f XPValues(3)=17 // 15
} }

8
MskGs/Classes/KFPawnProxy_ZedStalker.uc
View File

@ -2,8 +2,8 @@ class KFPawnProxy_ZedStalker extends KFPawn_ZedStalker;
DefaultProperties DefaultProperties
{ {
XPValues(0)=8 * 1.1f XPValues(0)=9 // 8
XPValues(1)=10 * 1.1f XPValues(1)=11 // 10
XPValues(2)=10 * 1.1f XPValues(2)=11 // 10
XPValues(3)=10 * 1.1f XPValues(3)=11 // 10
} }

5
MskGs/Classes/MskGsMut.uc
View File

@ -235,13 +235,9 @@ function NotifyLogin(Controller C)
if (C == None) return; if (C == None) return;
`log("[MSK-GS] DBG1: NotifyLogin()"@RepInfo@RepInfo.Mut@RepInfo.C);
RepInfo = Spawn(class'MskGsRepInfo', KFPlayerController(C)); RepInfo = Spawn(class'MskGsRepInfo', KFPlayerController(C));
`log("[MSK-GS] DBG2: NotifyLogin()"@RepInfo@RepInfo.Mut@RepInfo.C);
RepInfo.C = C; RepInfo.C = C;
RepInfo.Mut = Self; RepInfo.Mut = Self;
`log("[MSK-GS] DBG3: NotifyLogin()"@RepInfo@RepInfo.Mut@RepInfo.C);
RepClients.AddItem(RepInfo); RepClients.AddItem(RepInfo);
super.NotifyLogin(C); super.NotifyLogin(C);
@ -263,7 +259,6 @@ function NotifyLogout(Controller C)
{ {
if (RepInfo.C == C) if (RepInfo.C == C)
{ {
`log("[MSK-GS] DBG: Destroy()");
RepInfo.Destroy(); RepInfo.Destroy();
RepClients.RemoveItem(RepInfo); RepClients.RemoveItem(RepInfo);
return; return;

21
MskGs/Classes/MskGsRepInfo.uc
View File

@ -9,37 +9,29 @@ var private OnlineSubsystemSteamworks SW;
simulated event PostBeginPlay() simulated event PostBeginPlay()
{ {
`log("[MSK-GS] DBG: PostBeginPlay()");
super.PostBeginPlay(); super.PostBeginPlay();
if (bDeleteMe) return; if (bDeleteMe) return;
if (Role < ROLE_Authority || WorldInfo.NetMode == NM_StandAlone) if (Role < ROLE_Authority || WorldInfo.NetMode == NM_StandAlone)
{ {
`log("[MSK-GS] DBG: if (Role < ROLE_Authority || WorldInfo.NetMode == NM_StandAlone)");
ClientGetOnlineSubsystem(); ClientGetOnlineSubsystem();
} }
} }
private reliable client function ClientGetOnlineSubsystem() private reliable client function ClientGetOnlineSubsystem()
{ {
`log("[MSK-GS] DBG: ClientGetOnlineSubsystem()");
if (SW == None) if (SW == None)
{ {
`log("[MSK-GS] DBG: 1");
SW = OnlineSubsystemSteamworks(class'GameEngine'.static.GetOnlineSubsystem()); SW = OnlineSubsystemSteamworks(class'GameEngine'.static.GetOnlineSubsystem());
} }
if (SW == None) if (SW == None)
{ {
`log("[MSK-GS] DBG: 2");
SetTimer(0.1f, false, nameof(ClientGetOnlineSubsystem)); SetTimer(0.1f, false, nameof(ClientGetOnlineSubsystem));
} }
else else
{ {
`log("[MSK-GS] DBG: 3");
ClearTimer(nameof(ClientGetOnlineSubsystem)); ClearTimer(nameof(ClientGetOnlineSubsystem));
ClientGetMembership(); ClientGetMembership();
} }
@ -48,27 +40,18 @@ private reliable client function ClientGetOnlineSubsystem()
private reliable client function ClientGetMembership() private reliable client function ClientGetMembership()
{ {
local UniqueNetId GroupID; local UniqueNetId GroupID;
`log("[MSK-GS] DBG: ClientGetMembership()");
class'OnlineSubsystem'.Static.StringToUniqueNetId("0x017000000223386E", GroupID); class'OnlineSubsystem'.Static.StringToUniqueNetId("0x017000000223386E", GroupID);
if (SW.CheckPlayerGroup(GroupID)) if (SW.CheckPlayerGroup(GroupID)) ServerApplyMembership();
{
`log("[MSK-GS] DBG: ClientGetMembership() ServerApplyMembership()");
ServerApplyMembership();
}
} }
private simulated reliable server function ServerApplyMembership() private simulated reliable server function ServerApplyMembership()
{ {
`log("[MSK-GS] DBG: ServerApplyMembership() start");
if (Mut == None || C == None) if (Mut == None || C == None)
{ {
`log("[MSK-GS] DBG: ServerApplyMembership() timer");
SetTimer(1.0f, false, nameof(ServerApplyMembership)); SetTimer(1.0f, false, nameof(ServerApplyMembership));
return; return;
} }
`log("[MSK-GS] DBG: ServerApplyMembership()"@Self@Mut@C);
ClearTimer(nameof(ServerApplyMembership)); ClearTimer(nameof(ServerApplyMembership));
Mut.MskGsMemberList.AddItem(C); Mut.MskGsMemberList.AddItem(C);
} }
@ -79,5 +62,5 @@ DefaultProperties
bOnlyRelevantToOwner = true; bOnlyRelevantToOwner = true;
Role = ROLE_Authority; Role = ROLE_Authority;
RemoteRole = ROLE_SimulatedProxy; RemoteRole = ROLE_SimulatedProxy;
bSkipActorPropertyReplication = false; // This is needed, otherwise the client-to-server RPC fails bSkipActorPropertyReplication = false;
} }