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

Fix new line symbol issues

Browse source
This commit is contained in:
Anton Tarasenko 2020-04-19 00:44:48 +07:00
commit d66d86b2b1
846 changed files with 33896 additions and 12983 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sources/Weapons/Playable/Incendiary/TommygunInc/NiceDamTypeThompsonInc.uc
View file

@ -1,5 +1,8 @@
class NiceDamTypeThompsonInc extends NiceDamTypeFire
abstract;
defaultproperties
{ heatPart=0.300000 bCheckForHeadShots=True WeaponClass=Class'NicePack.NiceThompsonInc'
}
class NiceDamTypeThompsonInc extends NiceDamTypeFire
abstract;
defaultproperties
{
heatPart=0.300000
bCheckForHeadShots=True
WeaponClass=Class'NicePack.NiceThompsonInc'
}

13
sources/Weapons/Playable/Incendiary/TommygunInc/NiceThompsonInc.uc
View file

@ -1,5 +1,8 @@
class NiceThompsonInc extends ScrnThompsonInc
config(user);
defaultproperties
{ FireModeClass(0)=Class'NicePack.NiceThompsonIncFire' PickupClass=Class'NicePack.NiceThompsonIncPickup' ItemName="Incendiary Tommy Gun NW"
}
class NiceThompsonInc extends ScrnThompsonInc
config(user);
defaultproperties
{
FireModeClass(0)=Class'NicePack.NiceThompsonIncFire'
PickupClass=Class'NicePack.NiceThompsonIncPickup'
ItemName="Incendiary Tommy Gun NW"
}

11
sources/Weapons/Playable/Incendiary/TommygunInc/NiceThompsonIncAmmo.uc
View file

@ -1,5 +1,6 @@
class NiceThompsonIncAmmo extends ScrnThompsonIncAmmo;
#EXEC OBJ LOAD FILE=KillingFloorHUD.utx
defaultproperties
{ PickupClass=Class'NicePack.NiceThompsonIncAmmoPickup'
}
class NiceThompsonIncAmmo extends ScrnThompsonIncAmmo;
#EXEC OBJ LOAD FILE=KillingFloorHUD.utx
defaultproperties
{
PickupClass=Class'NicePack.NiceThompsonIncAmmoPickup'
}

9
sources/Weapons/Playable/Incendiary/TommygunInc/NiceThompsonIncAmmoPickup.uc
View file

@ -1,4 +1,5 @@
class NiceThompsonIncAmmoPickup extends ScrnThompsonIncAmmoPickup;
defaultproperties
{ InventoryType=Class'NicePack.NiceThompsonIncAmmo'
}
class NiceThompsonIncAmmoPickup extends ScrnThompsonIncAmmoPickup;
defaultproperties
{
InventoryType=Class'NicePack.NiceThompsonIncAmmo'
}

106
sources/Weapons/Playable/Incendiary/TommygunInc/NiceThompsonIncFire.uc
View file

@ -1,34 +1,72 @@
class NiceThompsonIncFire extends ScrnThompsonIncFire;
// Overwritten to not switch damage types for the firebug
function DoTrace(Vector Start, Rotator Dir)
{
local Vector X,Y,Z, End, HitLocation, HitNormal, ArcEnd;
local Actor Other;
local KFWeaponAttachment WeapAttach;
local array<int> HitPoints;
local KFPawn HitPawn;
MaxRange();
Weapon.GetViewAxes(X, Y, Z);
if ( Weapon.WeaponCentered() )
{ ArcEnd = (Instigator.Location + Weapon.EffectOffset.X * X + 1.5 * Weapon.EffectOffset.Z * Z);
}
else
{ ArcEnd = (Instigator.Location + Instigator.CalcDrawOffset(Weapon) + Weapon.EffectOffset.X * X + Weapon.Hand * Weapon.EffectOffset.Y * Y + Weapon.EffectOffset.Z * Z);
}
X = Vector(Dir);
End = Start + TraceRange * X;
Other = Instigator.HitPointTrace(HitLocation, HitNormal, End, HitPoints, Start,, 1);
if ( Other != none && Other != Instigator && Other.Base != Instigator )
{ WeapAttach = KFWeaponAttachment(Weapon.ThirdPersonActor);
if ( !Other.bWorldGeometry ) { // Update hit effect except for pawns if ( !Other.IsA('Pawn') && !Other.IsA('HitScanBlockingVolume') && !Other.IsA('ExtendedZCollision') ) { if( WeapAttach!=none ) { WeapAttach.UpdateHit(Other, HitLocation, HitNormal); } }
HitPawn = KFPawn(Other);
if ( HitPawn != none ) { if ( !HitPawn.bDeleteMe ) { HitPawn.ProcessLocationalDamage(DamageMax, Instigator, HitLocation, Momentum * X, DamageType, HitPoints); } } else Other.TakeDamage(DamageMax, Instigator, HitLocation, Momentum * X, DamageType); } else { HitLocation = HitLocation + 2.0 * HitNormal;
if ( WeapAttach != none ) { WeapAttach.UpdateHit(Other,HitLocation,HitNormal); } }
}
else
{ HitLocation = End; HitNormal = Normal(Start - End);
}
}
defaultproperties
{ DamageType=Class'NicePack.NiceDamTypeThompsonInc' AmmoClass=Class'NicePack.NiceThompsonIncAmmo'
}
class NiceThompsonIncFire extends ScrnThompsonIncFire;
// Overwritten to not switch damage types for the firebug
function DoTrace(Vector Start, Rotator Dir)
{
local Vector X,Y,Z, End, HitLocation, HitNormal, ArcEnd;
local Actor Other;
local KFWeaponAttachment WeapAttach;
local array<int> HitPoints;
local KFPawn HitPawn;
MaxRange();
Weapon.GetViewAxes(X, Y, Z);
if ( Weapon.WeaponCentered() )
{
ArcEnd = (Instigator.Location + Weapon.EffectOffset.X * X + 1.5 * Weapon.EffectOffset.Z * Z);
}
else
{
ArcEnd = (Instigator.Location + Instigator.CalcDrawOffset(Weapon) + Weapon.EffectOffset.X * X + Weapon.Hand * Weapon.EffectOffset.Y * Y +
Weapon.EffectOffset.Z * Z);
}
X = Vector(Dir);
End = Start + TraceRange * X;
Other = Instigator.HitPointTrace(HitLocation, HitNormal, End, HitPoints, Start,, 1);
if ( Other != none && Other != Instigator && Other.Base != Instigator )
{
WeapAttach = KFWeaponAttachment(Weapon.ThirdPersonActor);
if ( !Other.bWorldGeometry )
{
// Update hit effect except for pawns
if ( !Other.IsA('Pawn') && !Other.IsA('HitScanBlockingVolume') &&
!Other.IsA('ExtendedZCollision') )
{
if( WeapAttach!=none )
{
WeapAttach.UpdateHit(Other, HitLocation, HitNormal);
}
}
HitPawn = KFPawn(Other);
if ( HitPawn != none )
{
if ( !HitPawn.bDeleteMe )
{
HitPawn.ProcessLocationalDamage(DamageMax, Instigator, HitLocation, Momentum * X, DamageType, HitPoints);
}
}
else
Other.TakeDamage(DamageMax, Instigator, HitLocation, Momentum * X, DamageType);
}
else
{
HitLocation = HitLocation + 2.0 * HitNormal;
if ( WeapAttach != none )
{
WeapAttach.UpdateHit(Other,HitLocation,HitNormal);
}
}
}
else
{
HitLocation = End;
HitNormal = Normal(Start - End);
}
}
defaultproperties
{
DamageType=Class'NicePack.NiceDamTypeThompsonInc'
AmmoClass=Class'NicePack.NiceThompsonIncAmmo'
}

12
sources/Weapons/Playable/Incendiary/TommygunInc/NiceThompsonIncPickup.uc
View file

@ -1,4 +1,8 @@
class NiceThompsonIncPickup extends ScrnThompsonIncPickup;
defaultproperties
{ ItemName="Tommy Gun Incendiary NW" ItemShortName="Tommy Gun Inc. NW" InventoryType=Class'NicePack.NiceThompsonInc' PickupMessage="You got the Incendiary Tommy Gun NW"
}
class NiceThompsonIncPickup extends ScrnThompsonIncPickup;
defaultproperties
{
ItemName="Tommy Gun Incendiary NW"
ItemShortName="Tommy Gun Inc. NW"
InventoryType=Class'NicePack.NiceThompsonInc'
PickupMessage="You got the Incendiary Tommy Gun NW"
}