dkanus/NicePack
dkanus/NicePack
1
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

Compare commits

base: dkanus:e8dada5f67fe3996118a1edf36a90b53f4cb77d2
Branches Tags
dkanus:master
dkanus:dev
...
compare: dkanus:253238e6a990ed2ab05bd68710a5a5d330661f24
Branches Tags
dkanus:master
dkanus:dev

1 Commits
e8dada5f67 ... 253238e6a9

Author SHA1 Message Date
Shtoyan
253238e6a9 multitasker fix part 1 2022-02-07 16:05:55 +04:00
1 changed files with 20 additions and 11 deletions
Show Stats Expand all files Collapse all files

19
sources/GUI/NiceInteraction.uc
View File

@ -170,17 +170,21 @@ function PostRender(Canvas C)
x += 128 + 4; x += 128 + 4;
} }
} }
//// Draw weapons progress bars //// Draw weapons progress bars
if(nicePlayer != none && nicePlayer.bFlagDisplayWeaponProgress) if (class'NiceVeterancyTypes'.static.hasSkill(nicePlayer, class'NiceSkillEnforcerMultitasker')
&& nicePlayer.bFlagDisplayWeaponProgress && niceMutator.niceWeapProgressSet.length > 0)
{ {
x = C.ClipX - InventoryBoxWidth * C.ClipX - 5; x = C.ClipX - InventoryBoxWidth * C.ClipX - 5;
y = C.ClipY * 0.5 - 0.5 * (InventoryBoxHeight * C.ClipX + 4) * niceMutator.niceWeapProgressSet.Length; y = C.ClipY * 0.5 - 0.5 * (InventoryBoxHeight * C.ClipX + 4) * niceMutator.niceWeapProgressSet.Length;
for(i = 0;i < niceMutator.niceWeapProgressSet.Length;i ++){ for (i = 0;i < niceMutator.niceWeapProgressSet.Length;i ++)
{
DrawWeaponProgress(C, niceMutator.niceWeapProgressSet[i], x, y, DrawWeaponProgress(C, niceMutator.niceWeapProgressSet[i], x, y,
C.ViewPort.Actor.Pawn.PlayerReplicationInfo.Team); C.ViewPort.Actor.Pawn.PlayerReplicationInfo.Team);
y += (InventoryBoxHeight * C.ClipX + 4); y += (InventoryBoxHeight * C.ClipX + 4);
} }
} }
//// Draw invincibility bar //// Draw invincibility bar
nicePawn = NiceHumanPawn(nicePlayer.pawn); nicePawn = NiceHumanPawn(nicePlayer.pawn);
if(nicePawn != none && nicePawn.invincibilityTimer != 0.0) if(nicePawn != none && nicePawn.invincibilityTimer != 0.0)
@ -355,15 +359,18 @@ function DrawCalibrationStars(Canvas C){
x += 32 + 16; x += 32 + 16;
} }
} }
function DrawWeaponProgress(Canvas C, NicePack.WeaponProgressDisplay weapProgress, int x, int y, TeamInfo team){
function DrawWeaponProgress(Canvas C, NicePack.WeaponProgressDisplay weapProgress, int x, int y, TeamInfo team)
{
local float textWidth, textHeight; local float textWidth, textHeight;
local string textToDraw; local string textToDraw;
local float TempWidth, TempHeight, TempBorder; local float TempWidth, TempHeight, TempBorder;
TempWidth = InventoryBoxWidth * C.ClipX; TempWidth = InventoryBoxWidth * C.ClipX;
TempHeight = InventoryBoxHeight * C.ClipX; TempHeight = InventoryBoxHeight * C.ClipX;
TempBorder = BorderSize * C.ClipX; TempBorder = BorderSize * C.ClipX;
// Draw background bar // Draw background bar
if(team.teamIndex == 0) if (team.teamIndex == 0)
C.SetDrawColor(255, 64, 64, 64); C.SetDrawColor(255, 64, 64, 64);
else else
C.SetDrawColor(team.teamColor.R, team.teamColor.G, team.teamColor.B, 64); C.SetDrawColor(team.teamColor.R, team.teamColor.G, team.teamColor.B, 64);
@ -387,7 +394,8 @@ function DrawWeaponProgress(Canvas C, NicePack.WeaponProgressDisplay weapProgres
C.SetDrawColor(255, 64, 64); C.SetDrawColor(255, 64, 64);
else else
C.SetDrawColor(team.teamColor.R, team.teamColor.G, team.teamColor.B); C.SetDrawColor(team.teamColor.R, team.teamColor.G, team.teamColor.B);
if(weapProgress.bShowCounter){ if(weapProgress.bShowCounter)
{
textToDraw = string(weapProgress.counter); textToDraw = string(weapProgress.counter);
C.Font = class'ROHUD'.Static.LoadSmallFontStatic(5); C.Font = class'ROHUD'.Static.LoadSmallFontStatic(5);
C.TextSize(textToDraw, textWidth, textHeight); C.TextSize(textToDraw, textWidth, textHeight);
@ -395,6 +403,7 @@ function DrawWeaponProgress(Canvas C, NicePack.WeaponProgressDisplay weapProgres
C.DrawText(textToDraw); C.DrawText(textToDraw);
} }
} }
function bool KeyEvent(EInputKey Key, EInputAction Action, float Delta){ function bool KeyEvent(EInputKey Key, EInputAction Action, float Delta){
local bool bNeedsReload; local bool bNeedsReload;
local string Alias, LeftPart, RigthPart; local string Alias, LeftPart, RigthPart;