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

hardcode removed / husk proj fix

Browse source
This commit is contained in:
Shtoyan 2022-01-21 14:25:59 +04:00
commit 31a99d413b
653 changed files with 1294 additions and 1272 deletions
Download patch file Download diff file Expand all files Collapse all files

24
sources/Zeds/Mean/MeanZombieCrawler.uc
View file

@ -21,22 +21,32 @@ function bool MeleeDamageTarget(int hitdamage, vector pushdir) {
Poison(KFHumanPawn(Controller.Target));
return result;
}
function Poison(KFHumanPawn poisonedPawn){
function Poison(KFHumanPawn poisonedPawn)
{
local Inventory I;
local bool bFoundPoison;
if(poisonedPawn.Inventory != none){
for(I = poisonedPawn.Inventory; I != none; I = I.Inventory)
if(I != none && MeanPoisonInventory(I) != none){
if (poisonedPawn.Inventory != none)
{
for (I = poisonedPawn.Inventory; I != none; I = I.Inventory)
{
// why we double check Inv != none here???
if (I != none && MeanPoisonInventory(I) != none)
{
bFoundPoison = true;
MeanPoisonInventory(I).poisonStartTime = Level.TimeSeconds;
}
}
}
}
if(!bFoundPoison){
I = Controller.Spawn(class<Inventory>(DynamicLoadObject("NicePack.MeanPoisonInventory", Class'Class')));
if (!bFoundPoison)
{
I = Controller.Spawn(class<Inventory>(DynamicLoadObject(string(class'MeanPoisonInventory'), class'Class')));
MeanPoisonInventory(I).poisonStartTime = Level.TimeSeconds;
I.GiveTo(poisonedPawn);
}
}
defaultproperties
{
GroundSpeed=190.000000

4
sources/Zeds/Mean/MeanZombieHusk.uc
View file

@ -48,10 +48,10 @@ function RangedAttack(Actor A) {
defaultproperties
{
maxNormalShots=3
HuskFireProjClass=Class'NicePack.MeanHuskFireProjectile'
HuskFireProjClass=class'MeanHuskFireProjectile'
remainingStuns=1
MenuName="Mean Husk"
ControllerClass=Class'NicePack.MeanZombieHuskController'
ControllerClass=class'MeanZombieHuskController'
Skins(0)=Texture'NicePackT.MonsterMeanHusk.burns_tatters'
Skins(1)=Shader'NicePackT.MonsterMeanHusk.burns_shdr'
}

11
sources/Zeds/Nice/NiceHuskFireProjectile.uc
View file

@ -32,12 +32,18 @@ simulated function PostBeginPlay()
}
super(ROBallisticProjectile).PostBeginPlay();
}
simulated function Explode(vector HitLocation, vector HitNormal)
{
local Controller C;
local PlayerController LocalPlayer;
local float ShakeScale;
bHasExploded = True;
// fix for multiple explosions during slomo
if (bHasExploded)
return;
bHasExploded = true;
// Don't explode if this is a dud
if( bDud )
{
@ -75,6 +81,7 @@ simulated function Explode(vector HitLocation, vector HitNormal)
}
}
}
// Get the shake amount for when this projectile explodes
simulated function float GetShakeScale(vector ViewLocation, vector EventLocation)
{
@ -274,7 +281,7 @@ defaultproperties
MaxSpeed=2200.000000
Damage=25.000000
DamageRadius=150.000000
MyDamageType=Class'NicePack.NiceDamTypeFire'
MyDamageType=class'NiceDamTypeFire'
ExplosionDecal=Class'KFMod.FlameThrowerBurnMark'
LightType=LT_Steady
LightHue=45

2
sources/Zeds/Nice/NiceZombieBoss.uc
View file

@ -1809,7 +1809,7 @@ defaultproperties
DetachedSpecialArmClass=Class'KFChar.SeveredRocketArmPatriarch'
HitSound(0)=SoundGroup'KF_EnemiesFinalSnd.Patriarch.Kev_Pain'
DeathSound(0)=SoundGroup'KF_EnemiesFinalSnd.Patriarch.Kev_Death'
ControllerClass=Class'NicePack.NiceZombieBossController'
ControllerClass=class'NiceZombieBossController'
AmbientSound=Sound'KF_BasePatriarch.Idle.Kev_IdleLoop'
Mesh=SkeletalMesh'KF_Freaks_Trip.Patriarch_Freak'
Skins(0)=Combiner'KF_Specimens_Trip_T.gatling_cmb'

2
sources/Zeds/Nice/NiceZombieBrute.uc
View file

@ -512,5 +512,5 @@ defaultproperties
DetachedArmClass=Class'ScrnZedPack.SeveredArmBrute'
DetachedLegClass=Class'ScrnZedPack.SeveredLegBrute'
DetachedHeadClass=Class'ScrnZedPack.SeveredHeadBrute'
ControllerClass=Class'NicePack.NiceZombieBruteController'
ControllerClass=class'NiceZombieBruteController'
}

4
sources/Zeds/Nice/NiceZombieCrawler.uc
View file

@ -37,7 +37,7 @@ event Bump(actor Other)
// TODO: is there a better way
if(bPouncing && KFHumanPawn(Other)!=none )
{
KFHumanPawn(Other).TakeDamage(((MeleeDamage - (MeleeDamage * 0.05)) + (MeleeDamage * (FRand() * 0.1))), self ,self.Location,self.velocity, class 'NicePack.NiceZedMeleeDamageType');
KFHumanPawn(Other).TakeDamage(((MeleeDamage - (MeleeDamage * 0.05)) + (MeleeDamage * (FRand() * 0.1))), self ,self.Location,self.velocity, class'NiceZedMeleeDamageType');
if (KFHumanPawn(Other).Health <=0)
{
//TODO - move this to humanpawn.takedamage? Also see KFMonster.MeleeDamageTarget
@ -136,7 +136,7 @@ defaultproperties
ChallengeSound(1)=SoundGroup'KF_EnemiesFinalSnd.Crawler.Crawler_Acquire'
ChallengeSound(2)=SoundGroup'KF_EnemiesFinalSnd.Crawler.Crawler_Acquire'
ChallengeSound(3)=SoundGroup'KF_EnemiesFinalSnd.Crawler.Crawler_Acquire'
ControllerClass=Class'NicePack.NiceZombieCrawlerController'
ControllerClass=class'NiceZombieCrawlerController'
AmbientSound=Sound'KF_BaseCrawler.Crawler_Idle'
Mesh=SkeletalMesh'KF_Freaks_Trip.Crawler_Freak'
Skins(0)=Combiner'KF_Specimens_Trip_T.crawler_cmb'

2
sources/Zeds/Nice/NiceZombieCrawlerBase.uc
View file

@ -34,7 +34,7 @@ event Bump(actor Other)
// TODO: is there a better way
if(bPouncing && KFHumanPawn(Other)!=none )
{
KFHumanPawn(Other).TakeDamage(((MeleeDamage - (MeleeDamage * 0.05)) + (MeleeDamage * (FRand() * 0.1))), self ,self.Location,self.velocity, class 'NicePack.NiceZedMeleeDamageType');
KFHumanPawn(Other).TakeDamage(((MeleeDamage - (MeleeDamage * 0.05)) + (MeleeDamage * (FRand() * 0.1))), self ,self.Location,self.velocity, class'NiceZedMeleeDamageType');
if (KFHumanPawn(Other).Health <=0)
{
//TODO - move this to humanpawn.takedamage? Also see KFMonster.MeleeDamageTarget

6
sources/Zeds/Nice/NiceZombieFleshPound.uc
View file

@ -452,7 +452,7 @@ function SpinDamage(actor Target)
}
if (Target !=none && Target.IsA('KFDoorMover'))
{
Target.TakeDamage(DamageAmount , self ,HitLocation,pushdir, class 'NicePack.NiceZedMeleeDamageType');
Target.TakeDamage(DamageAmount , self ,HitLocation,pushdir, class'NiceZedMeleeDamageType');
PlaySound(MeleeAttackHitSound, SLOT_Interact, 1.25);
}
if (KFHumanPawn(Target)!=none)
@ -462,7 +462,7 @@ function SpinDamage(actor Target)
HumanTarget.Controller.ShakeView(RotMag, RotRate, RotTime, OffsetMag, OffsetRate, OffsetTime);
//TODO - line below was KFPawn. Does this whole block need to be KFPawn, or is it OK as KFHumanPawn?
KFHumanPawn(Target).TakeDamage(DamageAmount, self ,HitLocation,pushdir, class 'NicePack.NiceZedMeleeDamageType');
KFHumanPawn(Target).TakeDamage(DamageAmount, self ,HitLocation,pushdir, class'NiceZedMeleeDamageType');
if (KFHumanPawn(Target).Health <=0)
{
@ -574,7 +574,7 @@ defaultproperties
ChallengeSound(1)=SoundGroup'KF_EnemiesFinalSnd.Fleshpound.FP_Challenge'
ChallengeSound(2)=SoundGroup'KF_EnemiesFinalSnd.Fleshpound.FP_Challenge'
ChallengeSound(3)=SoundGroup'KF_EnemiesFinalSnd.Fleshpound.FP_Challenge'
ControllerClass=Class'NicePack.NiceZombieFleshpoundController'
ControllerClass=class'NiceZombieFleshpoundController'
AmbientSound=Sound'KF_BaseFleshpound.FP_IdleLoop'
Mesh=SkeletalMesh'KF_Freaks_Trip.FleshPound_Freak'
Skins(0)=Combiner'KF_Specimens_Trip_T.fleshpound_cmb'

2
sources/Zeds/Nice/NiceZombieGorefast.uc
View file

@ -300,7 +300,7 @@ defaultproperties
ChallengeSound(1)=SoundGroup'KF_EnemiesFinalSnd.GoreFast.Gorefast_Challenge'
ChallengeSound(2)=SoundGroup'KF_EnemiesFinalSnd.GoreFast.Gorefast_Challenge'
ChallengeSound(3)=SoundGroup'KF_EnemiesFinalSnd.GoreFast.Gorefast_Challenge'
ControllerClass=Class'NicePack.NiceZombieGorefastController'
ControllerClass=class'NiceZombieGorefastController'
AmbientSound=Sound'KF_BaseGorefast.Gorefast_Idle'
Mesh=SkeletalMesh'KF_Freaks_Trip.GoreFast_Freak'
Skins(0)=Combiner'KF_Specimens_Trip_T.gorefast_cmb'

4
sources/Zeds/Nice/NiceZombieHusk.uc
View file

@ -379,7 +379,7 @@ static simulated function PreCacheMaterials(LevelInfo myLevel)
}
defaultproperties
{
HuskFireProjClass=Class'NicePack.NiceHuskFireProjectile'
HuskFireProjClass=class'NiceHuskFireProjectile'
stunLoopStart=0.080000
stunLoopEnd=0.900000
idleInsertFrame=0.930000
@ -398,7 +398,7 @@ defaultproperties
ChallengeSound(1)=SoundGroup'KF_EnemiesFinalSnd.Husk.Husk_Challenge'
ChallengeSound(2)=SoundGroup'KF_EnemiesFinalSnd.Husk.Husk_Challenge'
ChallengeSound(3)=SoundGroup'KF_EnemiesFinalSnd.Husk.Husk_Challenge'
ControllerClass=Class'NicePack.NiceZombieHuskController'
ControllerClass=class'NiceZombieHuskController'
AmbientSound=Sound'KF_BaseHusk.Husk_IdleLoop'
Mesh=SkeletalMesh'KF_Freaks2_Trip.Burns_Freak'
Skins(0)=Texture'KF_Specimens_Trip_T_Two.burns.burns_tatters'

2
sources/Zeds/Nice/NiceZombieScrake.uc
View file

@ -651,7 +651,7 @@ defaultproperties
ChallengeSound(1)=SoundGroup'KF_EnemiesFinalSnd.Scrake.Scrake_Challenge'
ChallengeSound(2)=SoundGroup'KF_EnemiesFinalSnd.Scrake.Scrake_Challenge'
ChallengeSound(3)=SoundGroup'KF_EnemiesFinalSnd.Scrake.Scrake_Challenge'
ControllerClass=Class'NicePack.NiceZombieScrakeController'
ControllerClass=class'NiceZombieScrakeController'
AmbientSound=Sound'KF_BaseScrake.Chainsaw.Scrake_Chainsaw_Idle'
Mesh=SkeletalMesh'KF_Freaks_Trip.Scrake_Freak'
Skins(0)=Shader'KF_Specimens_Trip_T.scrake_FB'

8
sources/Zeds/Nice/NiceZombieSick.uc
View file

@ -237,8 +237,8 @@ static simulated function PreCacheMaterials(LevelInfo myLevel)
}
defaultproperties
{
DetachedArmClass=Class'NicePack.NiceSeveredArmSick'
DetachedLegClass=Class'NicePack.NiceSeveredLegSick'
DetachedHeadClass=Class'NicePack.NiceSeveredHeadSick'
ControllerClass=Class'NicePack.NiceSickZombieController'
DetachedArmClass=class'NiceSeveredArmSick'
DetachedLegClass=class'NiceSeveredLegSick'
DetachedHeadClass=class'NiceSeveredHeadSick'
ControllerClass=class'NiceSickZombieController'
}

2
sources/Zeds/Nice/NiceZombieSiren.uc
View file

@ -489,7 +489,7 @@ defaultproperties
DetachedHeadClass=Class'KFChar.SeveredHeadSiren'
HitSound(0)=SoundGroup'KF_EnemiesFinalSnd.siren.Siren_Pain'
DeathSound(0)=SoundGroup'KF_EnemiesFinalSnd.siren.Siren_Death'
ControllerClass=Class'NicePack.NiceZombieSirenController'
ControllerClass=class'NiceZombieSirenController'
AmbientSound=Sound'KF_BaseSiren.Siren_IdleLoop'
Mesh=SkeletalMesh'KF_Freaks_Trip.Siren_Freak'
Skins(0)=FinalBlend'KF_Specimens_Trip_T.siren_hair_fb'

2
sources/Zeds/Nice/NiceZombieSirenBase.uc
View file

@ -36,7 +36,7 @@ defaultproperties
StunThreshold=3.000000
fuelRatio=0.650000
clientHeadshotScale=1.200000
niceZombieDamType=Class'NicePack.NiceZedSlashingDamageType'
niceZombieDamType=class'NiceZedSlashingDamageType'
MeleeAnims(0)="Siren_Bite"
MeleeAnims(1)="Siren_Bite2"
MeleeAnims(2)="Siren_Bite"

2
sources/Zeds/Nice/NiceZombieStalkerBase.uc
View file

@ -15,7 +15,7 @@ defaultproperties
{
fuelRatio=0.850000
clientHeadshotScale=1.200000
niceZombieDamType=Class'NicePack.NiceZedSlashingDamageType'
niceZombieDamType=class'NiceZedSlashingDamageType'
MeleeAnims(0)="StalkerSpinAttack"
MeleeAnims(1)="StalkerAttack1"
MeleeAnims(2)="JumpAttack"

9
sources/Zeds/NiceMonster.uc
View file

@ -2183,12 +2183,13 @@ defaultproperties
bFrugalFuelUsage=True
clientHeadshotScale=1.000000
FrozenMaterial=Texture'HTec_A.Overlay.IceOverlay'
ShatteredIce=Class'NicePack.NiceIceChunkEmitter'
niceZombieDamType=Class'NicePack.NiceZedMeleeDamageType'
ShatteredIce=class'NiceIceChunkEmitter'
niceZombieDamType=class'NiceZedMeleeDamageType'
ZappedSpeedMod=0.300000
DamageToMonsterScale=5.000000
RagdollLifeSpan=120.000000
ControllerClass=Class'NicePack.NiceMonsterController'
ControllerClass=class'NiceMonsterController'
Begin Object Class=KarmaParamsSkel Name=KarmaParamsSkelN
KConvulseSpacing=(Max=2.200000)
KLinearDamping=0.150000
@ -2201,5 +2202,5 @@ defaultproperties
KRestitution=0.200000
KImpactThreshold=85.000000
End Object
KParams=KarmaParamsSkel'NicePack.NiceMonster.KarmaParamsSkelN'
KParams=KarmaParamsSkelN
}