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

Buff boomstick

Browse Source
This commit is contained in:
Anton Tarasenko 2024-11-27 02:17:05 +07:00
parent a3f4baabc6
commit b3b107c8ec
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources/NiceGameType.uc
View File

@ -75,6 +75,7 @@ State MatchInProgress{
function ScoreKill(Controller Killer, Controller Other) function ScoreKill(Controller Killer, Controller Other)
{ {
local NicePlayerController niceKiller; local NicePlayerController niceKiller;
local NiceHumanPawn niceKillerPawn;
local PlayerReplicationInfo OtherPRI; local PlayerReplicationInfo OtherPRI;
local float KillScore; local float KillScore;
local Controller C; local Controller C;
@ -201,8 +202,13 @@ function ScoreKill(Controller Killer, Controller Other)
/* End Marco's Kill Messages */ /* End Marco's Kill Messages */
niceKiller = NicePlayerController(killer); niceKiller = NicePlayerController(killer);
if (niceKiller != none && niceKiller.abilityManager != none) { if (niceKiller != none && niceKiller.abilityManager != none) {
niceKillerPawn = NiceHumanPawn(niceKiller.pawn);
niceKiller.abilityManager.AddToAllCooldowns(-1); niceKiller.abilityManager.AddToAllCooldowns(-1);
} }
if ( niceKillerPawn != none && NiceBoomStick(niceKillerPawn.weapon) != none
&& other != none && other.pawn != none && other.pawn.default.health >= 1000) {
niceKillerPawn.invincibilityTimer += 1.0;
}
} }
function DramaticEvent(float BaseZedTimePossibility, optional float DesiredZedTimeDuration){ function DramaticEvent(float BaseZedTimePossibility, optional float DesiredZedTimeDuration){

8
sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickAltFire.uc
View File

@ -1,13 +1,13 @@
class NiceBoomStickAltFire extends NiceBoomStickFire; class NiceBoomStickAltFire extends NiceBoomStickFire;
// Overload to force last shot to have a different animation with reload // Overload to force last shot to have a different animation with reload
// NICETODO: uncomment this // NICETODO: uncomment this
function name GetCorrectAnim(bool bLoop, bool bAimed){ function name GetCorrectAnim(bool bLoop, bool bAimed) {
if(currentContext.sourceWeapon != none && currentContext.sourceWeapon.MagAmmoRemainingClient > 0) if(currentContext.sourceWeapon != none && currentContext.sourceWeapon.MagAmmoRemainingClient > 0)
return super.GetCorrectAnim(bLoop, bAimed); return super.GetCorrectAnim(bLoop, bAimed);
if(bAimed) if(bAimed)
return 'Fire_Last_Iron'; return 'Fire_Last_Iron';
else else
return 'Fire_Last'; return 'Fire_Last';
return FireAnim; return FireAnim;
} }
defaultproperties defaultproperties

2
sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickFire.uc
View File

@ -58,6 +58,6 @@ defaultproperties
ShakeOffsetTime=3.500000 ShakeOffsetTime=3.500000
BotRefireRate=2.500000 BotRefireRate=2.500000
aimerror=2.000000 aimerror=2.000000
Spread=3000.000000 Spread=2000.000000
FireAnimRate=1.25 FireAnimRate=1.25
} }