Revert weapon conversion
This patch reverts first step of global weapon conversion that would have halted the release of the next version for too long.
This commit is contained in:
parent
3c46801714
commit
12d95e387e
757 changed files with 10788 additions and 4046 deletions
|
|
@ -0,0 +1,5 @@
|
|||
class NiceDamTypeThompsonInc extends NiceDamTypeFire
|
||||
abstract;
|
||||
defaultproperties
|
||||
{
heatPart=0.300000
bCheckForHeadShots=True
WeaponClass=Class'NicePack.NiceThompsonInc'
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
class NiceThompsonInc extends ScrnThompsonInc
|
||||
config(user);
|
||||
defaultproperties
|
||||
{
FireModeClass(0)=Class'NicePack.NiceThompsonIncFire'
PickupClass=Class'NicePack.NiceThompsonIncPickup'
ItemName="Incendiary Tommy Gun NW"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
class NiceThompsonIncAmmo extends ScrnThompsonIncAmmo;
|
||||
#EXEC OBJ LOAD FILE=KillingFloorHUD.utx
|
||||
defaultproperties
|
||||
{
PickupClass=Class'NicePack.NiceThompsonIncAmmoPickup'
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
class NiceThompsonIncAmmoPickup extends ScrnThompsonIncAmmoPickup;
|
||||
defaultproperties
|
||||
{
InventoryType=Class'NicePack.NiceThompsonIncAmmo'
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
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'
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
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"
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue