Last patch

Commits like that are lazy and shitty, but fuck it, it's the last patch.
This commit is contained in:
Anton Tarasenko 2020-07-03 18:03:21 +07:00
commit bd54850e38
35 changed files with 81 additions and 49 deletions

View file

@ -3,7 +3,7 @@ class MeanZombieSiren extends NiceZombieSiren;
defaultproperties
{
ScreamRadius=800
ScreamForce=-250000
ScreamForce=-200000
MenuName="Mean Siren"
Skins(0)=FinalBlend'MeanZedSkins.siren_hair_fb'
Skins(1)=Combiner'MeanZedSkins.siren_cmb'

View file

@ -185,11 +185,13 @@ function StartChargingFP(Pawn instigatedBy){
if( rageTarget != none && KFGameType(Level.Game) != none
&& class'NiceVeterancyTypes'.static.HasSkill(NicePlayerController(rageTarget.Controller),
class'NiceSkillCommandoPerfectExecution') ){
KFGameType(Level.Game).DramaticEvent(1.0);
NiceGameType(Level.Game).lessDramatic = true;
KFGameType(Level.Game).DramaticEvent(1.0);
}
else if( altRageTarget != none && KFGameType(Level.Game) != none
&& class'NiceVeterancyTypes'.static.HasSkill(NicePlayerController(altRageTarget.Controller),
class'NiceSkillCommandoPerfectExecution') ){
NiceGameType(Level.Game).lessDramatic = true;
KFGameType(Level.Game).DramaticEvent(1.0);
}
}

View file

@ -127,6 +127,7 @@ state RunningState
if( rageTarget != none && KFGameType(Level.Game) != none
&& class'NiceVeterancyTypes'.static.HasSkill(NicePlayerController(rageTarget.Controller),
class'NiceSkillCommandoPerfectExecution') ){
NiceGameType(Level.Game).lessDramatic = true;
KFGameType(Level.Game).DramaticEvent(1.0);
}
}

View file

@ -201,11 +201,13 @@ state RunningState
if( rageTarget != none && KFGameType(Level.Game) != none
&& class'NiceVeterancyTypes'.static.HasSkill(NicePlayerController(rageTarget.Controller),
class'NiceSkillCommandoPerfectExecution') ){
NiceGameType(Level.Game).lessDramatic = true;
KFGameType(Level.Game).DramaticEvent(1.0);
}
else if( rageCause != none && KFGameType(Level.Game) != none
&& class'NiceVeterancyTypes'.static.HasSkill(NicePlayerController(rageCause.Controller),
class'NiceSkillCommandoPerfectExecution') ){
NiceGameType(Level.Game).lessDramatic = true;
KFGameType(Level.Game).DramaticEvent(1.0);
}
}

View file

@ -91,8 +91,8 @@ defaultproperties
WaterSpeed=100.000000
AccelRate=1024.000000
JumpZ=340.000000
HealthMax=250.000000
Health=250
HealthMax=190.000000
Health=190
MenuName="Shiver"
MovementAnims(0)="ClotWalk"
AmbientSound=SoundGroup'ScrnZedPack_S.Shiver.ShiverIdleGroup'

View file

@ -22,7 +22,7 @@ function Touch( actor Other ){
function bool RelevantTo(Pawn P){
local NiceMonster niceZed;
niceZed = NiceMonster(P);
if(niceZed != none && niceZed.default.Health >= 1500)
if(niceZed != none && niceZed.default.Health >= 1000)
return false;
return (niceFP != none && VSizeSquared(niceFP.Velocity) >= 75 && Super.RelevantTo(P) && niceFP.Velocity dot (P.Location - niceFP.Location) > 0 );
}

View file

@ -417,15 +417,19 @@ Begin:
function bool SetEnemy( pawn newEnemy,
optional bool bHateMonster,
optional float MonsterHateChanceOverride){
local NiceMonster niceZed;
local NiceMonster niceZed;
local NiceZombieFleshpound niceFP;
local bool bCanForceFight;
// Can we fight anything?
niceZed = NiceMonster(pawn);
niceFP = NiceZombieFleshpound(niceZed);
if(niceZed != none)
bCanForceFight =
KFMonster(pawn).HeadHealth <= 0
|| KFMonster(pawn).bDecapitated
|| newEnemy.Health <= 15;
if (niceFP != none && niceFP.IsInState('RageCharging'))
bCanForceFight = false;
if(newEnemy != none)
bCanForceFight = bCanForceFight
&& newEnemy.Health > 0 && newEnemy != enemy;