Zed fixes #16

Merged
dkanus merged 24 commits from :fpfix into master 2022-03-03 15:43:35 +03:00
10 changed files with 36 additions and 26 deletions
Showing only changes of commit 7fc6d92410 - Show all commits

View File

@ -167,30 +167,23 @@ function PreBeginPlay()
simulated function PostBeginPlay() simulated function PostBeginPlay()
{ {
local int i;
local ScrnVotingHandlerMut VH; local ScrnVotingHandlerMut VH;
local MeanVoting VO; local MeanVoting VO;
local NiceFFVoting FFVO; local NiceFFVoting FFVO;
super.PostBeginPlay(); super.PostBeginPlay();
class'ScrnLightVestPickup'.default.cost = 50; class'ScrnLightVestPickup'.default.cost = 50;
class'ScrnHorzineVestPickup'.default.weight = 2; class'ScrnHorzineVestPickup'.default.weight = 2;
class'ScrnHorzineVestPickup'.default.cost = 750; class'ScrnHorzineVestPickup'.default.cost = 750;
class'NicePack'.default.Mut = self; class'NicePack'.default.Mut = self;
// Gun skins
class'NiceMaulerPickup'.default.VariantClasses[class'NiceMaulerPickup'.default.VariantClasses.length] = class'ScrnSPSniperPickup';
class'NiceDeaglePickup'.default.VariantClasses[class'NiceDeaglePickup'.default.VariantClasses.length] = class'SkinExecutionerPickup';
class'NiceDualDeaglePickup'.default.VariantClasses[class'NiceDualDeaglePickup'.default.VariantClasses.length] = class'SkinDualExecutionerPickup';
class'NiceMagnumPickup'.default.VariantClasses[class'NiceMagnumPickup'.default.VariantClasses.length] = class'SkinCowboyMagnumPickup';
class'NiceDualMagnumPickup'.default.VariantClasses[class'NiceDualMagnumPickup'.default.VariantClasses.length] = class'SkinDualCowboyMagnumPickup';
class'NiceWinchesterPickup'.default.VariantClasses[class'NiceWinchesterPickup'.default.VariantClasses.length] = class'SkinRetroLARPickup';
class'NiceM14EBRPickup'.default.VariantClasses[class'NiceM14EBRPickup'.default.VariantClasses.length] = class'SkinM14EBR2ProPickup';
class'ScrnKrissMPickup'.default.VariantClasses[class'ScrnKrissMPickup'.default.VariantClasses.length] = class'SkinGoldenKrissPickup';
class'NiceSCARMK17Pickup'.default.VariantClasses[class'NiceSCARMK17Pickup'.default.VariantClasses.length] = class'SkinCamoSCARMK17Pickup';
// Abilities // Abilities
class'NiceAbilityManager'.default.events.static.AddAdapter(class'NiceSharpshooterAbilitiesAdapter', level); class'NiceAbilityManager'.default.events.static.AddAdapter(class'NiceSharpshooterAbilitiesAdapter', level);
class'NiceAbilityManager'.default.events.static.AddAdapter(class'NiceEnforcerAbilitiesAdapter', level); class'NiceAbilityManager'.default.events.static.AddAdapter(class'NiceEnforcerAbilitiesAdapter', level);
SetTimer(0.25, true); SetTimer(0.25, true);
if(Role < ROLE_Authority) if (Role < ROLE_Authority)
return; return;
// Create sync node // Create sync node
serverStorage = new class'NiceStorageServer'; serverStorage = new class'NiceStorageServer';
@ -223,8 +216,8 @@ simulated function PostBeginPlay()
// -- Lower starting HL // -- Lower starting HL
ScrnMut.GameRules.HardcoreLevel -= 7; ScrnMut.GameRules.HardcoreLevel -= 7;
ScrnMut.GameRules.HardcoreLevelFloat -= 7; ScrnMut.GameRules.HardcoreLevelFloat -= 7;
// -- Fill-in zed info // -- Fill-in zed info
i = 0;
// - Clot // - Clot
ZedDatabase[0].bNeedsReplacement = bReplaceClot; ZedDatabase[0].bNeedsReplacement = bReplaceClot;
// - Crawler // - Crawler

View File

@ -1,6 +1,9 @@
class NiceSCARMK17Pickup extends NiceWeaponPickup; class NiceSCARMK17Pickup extends NiceWeaponPickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'KFMod.NeonSCARMK17Pickup'
VariantClasses(1)=class'SkinCamoSCARMK17Pickup'
Weight=8.000000 Weight=8.000000
cost=1250 cost=1250
AmmoCost=28 AmmoCost=28
@ -15,7 +18,6 @@ defaultproperties
AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo' AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
CorrespondingPerkIndex=3 CorrespondingPerkIndex=3
EquipmentCategoryID=3 EquipmentCategoryID=3
VariantClasses(0)=Class'KFMod.NeonSCARMK17Pickup'
InventoryType=class'NiceSCARMK17AssaultRifle' InventoryType=class'NiceSCARMK17AssaultRifle'
PickupMessage="You got the SCARMK17" PickupMessage="You got the SCARMK17"
PickupSound=Sound'KF_SCARSnd.SCAR_Pickup' PickupSound=Sound'KF_SCARSnd.SCAR_Pickup'

View File

@ -1,6 +1,9 @@
class NiceDeaglePickup extends NiceSinglePickup; class NiceDeaglePickup extends NiceSinglePickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'SkinExecutionerPickup'
VariantClasses(1)=class'SkinGoldenDeaglePickup'
Weight=2.000000 Weight=2.000000
cost=250 cost=250
AmmoCost=14 AmmoCost=14
@ -13,7 +16,6 @@ defaultproperties
ItemShortName="Deagle" ItemShortName="Deagle"
AmmoItemName=".300 JHP Ammo" AmmoItemName=".300 JHP Ammo"
AmmoMesh=None AmmoMesh=None
VariantClasses(0)=class'SkinGoldenDeaglePickup'
InventoryType=class'NiceDeagle' InventoryType=class'NiceDeagle'
PickupMessage="You got the Desert Eagle" PickupMessage="You got the Desert Eagle"
PickupSound=Sound'KF_HandcannonSnd.50AE_Pickup' PickupSound=Sound'KF_HandcannonSnd.50AE_Pickup'

View File

@ -1,6 +1,9 @@
class NiceDualDeaglePickup extends NiceDualiesPickup; class NiceDualDeaglePickup extends NiceDualiesPickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'SkinDualExecutionerPickup'
VariantClasses(1)=class'SkinGoldenDualDeaglePickup'
Weight=4.000000 Weight=4.000000
cost=500 cost=500
AmmoCost=28 AmmoCost=28
@ -13,7 +16,6 @@ defaultproperties
ItemShortName="Dual Deagles" ItemShortName="Dual Deagles"
AmmoItemName=".300 JHP Ammo" AmmoItemName=".300 JHP Ammo"
AmmoMesh=StaticMesh'KillingFloorStatics.DeagleAmmo' AmmoMesh=StaticMesh'KillingFloorStatics.DeagleAmmo'
VariantClasses(0)=class'SkinGoldenDualDeaglePickup'
InventoryType=class'NiceDualDeagle' InventoryType=class'NiceDualDeagle'
PickupMessage="You found another Handcannon" PickupMessage="You found another Handcannon"
PickupSound=Sound'KF_HandcannonSnd.50AE_Pickup' PickupSound=Sound'KF_HandcannonSnd.50AE_Pickup'

View File

@ -1,6 +1,8 @@
class NiceDualMagnumPickup extends NiceDualiesPickup; class NiceDualMagnumPickup extends NiceDualiesPickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'SkinDualCowboyMagnumPickup'
Weight=4.000000 Weight=4.000000
cost=250 cost=250
AmmoCost=10 AmmoCost=10

View File

@ -1,6 +1,8 @@
class NiceMagnumPickup extends NiceSinglePickup; class NiceMagnumPickup extends NiceSinglePickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'SkinCowboyMagnumPickup'
Weight=2.000000 Weight=2.000000
cost=125 cost=125
AmmoCost=5 AmmoCost=5

View File

@ -1,6 +1,9 @@
class NiceKrissMPickup extends NiceWeaponPickup; class NiceKrissMPickup extends NiceWeaponPickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'KFMod.NeonKrissMPickup'
VariantClasses(1)=class'SkinGoldenKrissPickup'
Weight=4.000000 Weight=4.000000
cost=750 cost=750
AmmoCost=22 AmmoCost=22
@ -15,7 +18,6 @@ defaultproperties
AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo' AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
EquipmentCategoryID=3 EquipmentCategoryID=3
CorrespondingPerkIndex=3 CorrespondingPerkIndex=3
VariantClasses(0)=Class'KFMod.NeonKrissMPickup'
InventoryType=class'NiceKrissMMedicGun' InventoryType=class'NiceKrissMMedicGun'
PickupMessage="You got the KRISS Vector Medic Gun" PickupMessage="You got the KRISS Vector Medic Gun"
PickupSound=Sound'KF_KrissSND.Handling.KF_WEP_KRISS_Handling_Pickup' PickupSound=Sound'KF_KrissSND.Handling.KF_WEP_KRISS_Handling_Pickup'

View File

@ -1,6 +1,8 @@
class NiceM14EBRPickup extends NiceWeaponPickup; class NiceM14EBRPickup extends NiceWeaponPickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'SkinM14EBR2ProPickup'
Weight=8.000000 Weight=8.000000
cost=1000 cost=1000
AmmoCost=25 AmmoCost=25

View File

@ -1,6 +1,8 @@
class NiceMaulerPickup extends NiceWeaponPickup; class NiceMaulerPickup extends NiceWeaponPickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'ScrnSPSniperPickup'
Weight=6.000000 Weight=6.000000
cost=750 cost=750
AmmoCost=22 AmmoCost=22

View File

@ -2,6 +2,7 @@ class NiceWinchesterPickup extends NiceWeaponPickup;
defaultproperties defaultproperties
{ {
VariantClasses(0)=class'SkinRetroLARPickup'
Weight=6.000000 Weight=6.000000
AmmoCost=13 AmmoCost=13
cost=250 cost=250