Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
Added simple deathmessage to thrown X3 knife

Fixed:
A42 Skrith Sidearm: (Both versions)
When u fire in ADS this message appears in the log:
Log: PlayAnim: Sequence 'Fire' not found for mesh 'FPm_A42'

NFUD Combat Wrench:
It draws another sprint bar that is in sync with the primary bar

MAU-52 Target Designator:
It draws another sprint bar that is in sync with the primary bar
  • Loading branch information
NOOTLORD committed Jul 19, 2023
1 parent e743ff1 commit 927dbb7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 36 deletions.
18 changes: 1 addition & 17 deletions BWBPAirstrikesPro/Classes/TargetDesignator.uc
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ simulated function WeaponTick(float DT)

simulated function NewDrawWeaponInfo(Canvas C, float YPos)
{
local float ScaleFactor, XL, YL, YL2, SprintFactor;
local float ScaleFactor, XL, YL, YL2;
local string Temp;
local int i;
local byte StartMode;
Expand Down Expand Up @@ -244,22 +244,6 @@ simulated function NewDrawWeaponInfo(Canvas C, float YPos)
}
}
}

// This is pretty damn disgusting, but the weapon seems to be the only way we can draw extra info on the HUD
// Would be nice if someone could have a HUD function called along the inventory chain
if (SprintControl != None && SprintControl.Stamina < SprintControl.MaxStamina)
{
SprintFactor = SprintControl.Stamina / SprintControl.MaxStamina;
C.CurX = C.OrgX + 5 * ScaleFactor * class'HUD'.default.HudScale;
C.CurY = C.ClipY - 330 * ScaleFactor * class'HUD'.default.HudScale;
if (SprintFactor < 0.2)
C.SetDrawColor(255, 0, 0);
else if (SprintFactor < 0.5)
C.SetDrawColor(64, 128, 255);
else
C.SetDrawColor(0, 0, 255);
C.DrawTile(Texture'Engine.MenuWhite', 200 * ScaleFactor * class'HUD'.default.HudScale * SprintFactor, 30 * ScaleFactor * class'HUD'.default.HudScale, 0, 0, 1, 1);
}
}

function bool ConsumeAmmo(int Mode, float load, optional bool bAmountNeededIsMax)
Expand Down
18 changes: 1 addition & 17 deletions BWBP_OP_Pro/Classes/WrenchWarpDevice.uc
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ simulated function bool PutDown()

simulated function NewDrawWeaponInfo(Canvas C, float YPos)
{
local float ScaleFactor, XL, YL, YL2, SprintFactor;
local float ScaleFactor, XL, YL, YL2;
local string Temp;
local int i;
local byte StartMode;
Expand Down Expand Up @@ -233,22 +233,6 @@ simulated function NewDrawWeaponInfo(Canvas C, float YPos)
}
}
}
// This is pretty damn disgusting, but the weapon seems to be the only way we can draw extra info on the HUD
// Would be nice if someone could have a HUD function called along the inventory chain
if (SprintControl != None && SprintControl.Stamina < SprintControl.MaxStamina)
{
SprintFactor = SprintControl.Stamina / SprintControl.MaxStamina;
C.CurX = C.OrgX + 5 * ScaleFactor * class'HUD'.default.HudScale;
C.CurY = C.ClipY - 330 * ScaleFactor * class'HUD'.default.HudScale;
if (SprintFactor < 0.2)
C.SetDrawColor(255, 0, 0);
else if (SprintFactor < 0.5)
C.SetDrawColor(64, 128, 255);
else
C.SetDrawColor(0, 0, 255);
C.DrawTile(Texture'Engine.MenuWhite', 200 * ScaleFactor * class'HUD'.default.HudScale * SprintFactor, 30 * ScaleFactor * class'HUD'.default.HudScale, 0, 0, 1, 1);
}
}
simulated function PostNetBeginPlay()
Expand Down
4 changes: 2 additions & 2 deletions BallisticProV55/Classes/A42WeaponParamsComp.uc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ defaultproperties
Begin Object Class=FireParams Name=ArenaProjFireParams
FireInterval=0.16
FireEndAnim=
AimedFireAnim="Fire1"
AimedFireAnim="Fire"
FireEffectParams(0)=ProjectileEffectParams'ArenaProjEffectParams'
End Object

Expand Down Expand Up @@ -59,7 +59,7 @@ defaultproperties
TargetState="SpreadShot"
FireInterval=0.240000
FireEndAnim=
AimedFireAnim="Fire1"
AimedFireAnim="Fire"
FireEffectParams(0)=ProjectileEffectParams'ArenaProjEffectParams_Tri'
End Object

Expand Down
1 change: 1 addition & 0 deletions BallisticProV55/Classes/DTX3KnifeThrown.uc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ defaultproperties
DeathStrings(0)="%k pegged %o with %kh X3."
DeathStrings(1)="%k flung a knife at %o."
DeathStrings(2)="%k flicked a knife into %o's flesh."
SimpleKillString="X3 Thrown"
bCanBeBlocked=False
DamageIdent="Melee"
DisplacementType=DSP_None
Expand Down

0 comments on commit 927dbb7

Please sign in to comment.