From a6b1a306bd4c498a00ecef9980ff3c6066c74f5b Mon Sep 17 00:00:00 2001 From: Shtoyan Date: Tue, 19 Jul 2022 18:23:23 +0400 Subject: [PATCH] serious fuckup fix --- sources/GUI/NiceInteraction.uc | 80 ++++++++++++------------- sources/Zeds/Mean/MeanBleedInventory.uc | 2 +- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/sources/GUI/NiceInteraction.uc b/sources/GUI/NiceInteraction.uc index fc309bd..f0745a4 100644 --- a/sources/GUI/NiceInteraction.uc +++ b/sources/GUI/NiceInteraction.uc @@ -101,47 +101,47 @@ function PostRender(Canvas C) C.SetPos(x, y); C.DrawTile(poisonIcon, size, size, 0, 0, poisonIcon.MaterialUSize(), poisonIcon.MaterialVSize()); } - - // draw bleed and poison icons for TEAMMATES -// C.GetCAmeraLocation(CamPos, CamRot); -// ViewDir = vector(CamRot); -// kfHud = HUDKillingFloor(ViewportOwner.Actor.myHUD); -// OffsetX = (36.f * kfHud.default.VeterancyMatScaleFactor * 0.6) - (kfHud.default.HealthIconSize + 2.0); -// BarLength = FMin(kfHud.default.BarLength * (float(C.SizeX) / 1024.f), kfHud.default.BarLength); -// BarHeight = FMin(kfHud.default.BarHeight * (float(C.SizeX) / 1024.f), kfHud.default.BarHeight); -// for (i = 0; i < kfHUD.PlayerInfoPawns.Length; i++) -// { -// if (kfHUD.PlayerInfoPawns[i].Pawn != none && kfHUD.PlayerInfoPawns[i].Pawn.Health > 0 && -// (kfHUD.PlayerInfoPawns[i].Pawn.Location - kfHUD.PawnOwner.Location) dot ViewDir > 0.8 && -// kfHUD.PlayerInfoPawns[i].RendTime > ViewportOwner.Actor.Level.TimeSeconds) -// { -// C.StrLen(Left(kfHUD.PlayerInfoPawns[i].Pawn.PlayerReplicationInfo.PlayerName, 16), XL, YL); -// if (kfHUD.PlayerInfoPawns[i].Pawn.ShieldStrength <= 0) -// { -// posY = (kfHUD.PlayerInfoPawns[i].PlayerInfoScreenPosY - YL) - 2.75 * BarHeight - -// kfHUD.default.ArmorIconSize * 0.5; -// } -// else -// { -// posY = (kfHUD.PlayerInfoPawns[i].PlayerInfoScreenPosY - YL) - 3.8 * BarHeight - -// kfHUD.default.ArmorIconSize * 0.5; -// } -// offset = 0; -// if (bIsBleeding(ScrnHumanPawn(kfHUD.PlayerInfoPawns[i].Pawn))) -// { -// C.SetPos(kfHUD.PlayerInfoPawns[i].PlayerInfoScreenPosX - OffsetX - 0.15 * BarLength - -// kfHUD.default.ArmorIconSize - 2.0, posY); -// C.DrawTileScaled(bleedIcon, 0.1875, 0.1875); -// } -// if (bIsPoisoned(ScrnHumanPawn(kfHUD.PlayerInfoPawns[i].Pawn))) -// { -// C.SetPos(kfHUD.PlayerInfoPawns[i].PlayerInfoScreenPosX - OffsetX + 0.15 * BarLength - -// kfHUD.default.ArmorIconSize - 2.0, posY); -// C.DrawTileScaled(poisonIcon, 0.1875, 0.1875); -// } -// } -// } + // draw bleed and poison icons for TEAMMATES + // C.GetCAmeraLocation(CamPos, CamRot); + // ViewDir = vector(CamRot); + // kfHud = HUDKillingFloor(ViewportOwner.Actor.myHUD); + // OffsetX = (36.f * kfHud.default.VeterancyMatScaleFactor * 0.6) - (kfHud.default.HealthIconSize + 2.0); + // BarLength = FMin(kfHud.default.BarLength * (float(C.SizeX) / 1024.f), kfHud.default.BarLength); + // BarHeight = FMin(kfHud.default.BarHeight * (float(C.SizeX) / 1024.f), kfHud.default.BarHeight); + // for (i = 0; i < kfHUD.PlayerInfoPawns.Length; i++) + // { + // if (kfHUD.PlayerInfoPawns[i].Pawn != none && kfHUD.PlayerInfoPawns[i].Pawn.Health > 0 && + // (kfHUD.PlayerInfoPawns[i].Pawn.Location - kfHUD.PawnOwner.Location) dot ViewDir > 0.8 && + // kfHUD.PlayerInfoPawns[i].RendTime > ViewportOwner.Actor.Level.TimeSeconds) + // { + // C.StrLen(Left(kfHUD.PlayerInfoPawns[i].Pawn.PlayerReplicationInfo.PlayerName, 16), XL, YL); + // if (kfHUD.PlayerInfoPawns[i].Pawn.ShieldStrength <= 0) + // { + // posY = (kfHUD.PlayerInfoPawns[i].PlayerInfoScreenPosY - YL) - 2.75 * BarHeight - + // kfHUD.default.ArmorIconSize * 0.5; + // } + // else + // { + // posY = (kfHUD.PlayerInfoPawns[i].PlayerInfoScreenPosY - YL) - 3.8 * BarHeight - + // kfHUD.default.ArmorIconSize * 0.5; + // } + // offset = 0; + + // if (bIsBleeding(ScrnHumanPawn(kfHUD.PlayerInfoPawns[i].Pawn))) + // { + // C.SetPos(kfHUD.PlayerInfoPawns[i].PlayerInfoScreenPosX - OffsetX - 0.15 * BarLength - + // kfHUD.default.ArmorIconSize - 2.0, posY); + // C.DrawTileScaled(bleedIcon, 0.1875, 0.1875); + // } + // if (bIsPoisoned(ScrnHumanPawn(kfHUD.PlayerInfoPawns[i].Pawn))) + // { + // C.SetPos(kfHUD.PlayerInfoPawns[i].PlayerInfoScreenPosX - OffsetX + 0.15 * BarLength - + // kfHUD.default.ArmorIconSize - 2.0, posY); + // C.DrawTileScaled(poisonIcon, 0.1875, 0.1875); + // } + // } + // } if (niceWeap != none && niceWeap.bShowSecondaryCharge && scrnHUDInstance != none) { diff --git a/sources/Zeds/Mean/MeanBleedInventory.uc b/sources/Zeds/Mean/MeanBleedInventory.uc index 796923b..a7a41fd 100644 --- a/sources/Zeds/Mean/MeanBleedInventory.uc +++ b/sources/Zeds/Mean/MeanBleedInventory.uc @@ -6,7 +6,7 @@ var int maxBleedCount; var private float fBleedPeriod; var int bleedLevel; -var MeanZombieCrawler stalker; +var MeanZombieStalker stalker; event PostBeginPlay()