From 7fc6d92410d948fdf27274b8c8313b73c734dc0b Mon Sep 17 00:00:00 2001 From: Shtoyan Date: Thu, 24 Feb 2022 14:36:29 +0400 Subject: [PATCH] fix kris's skin, better variant class handling --- sources/NicePack.uc | 19 ++++++------------- .../AssaultRifles/SCAR/NiceSCARMK17Pickup.uc | 6 ++++-- .../Pistols/Deagle/NiceDeaglePickup.uc | 6 ++++-- .../Pistols/Deagle/NiceDualDeaglePickup.uc | 6 ++++-- .../Pistols/Magnum/NiceDualMagnumPickup.uc | 4 +++- .../Pistols/Magnum/NiceMagnumPickup.uc | 4 +++- .../Playable/SMG/Kriss/NiceKrissMPickup.uc | 6 ++++-- .../SniperWeapons/M14EBR/NiceM14EBRPickup.uc | 4 +++- .../SniperWeapons/Mauler/NiceMaulerPickup.uc | 4 +++- .../Winchester/NiceWinchesterPickup.uc | 3 ++- 10 files changed, 36 insertions(+), 26 deletions(-) diff --git a/sources/NicePack.uc b/sources/NicePack.uc index 39d6d36..65e2910 100644 --- a/sources/NicePack.uc +++ b/sources/NicePack.uc @@ -167,30 +167,23 @@ function PreBeginPlay() simulated function PostBeginPlay() { - local int i; local ScrnVotingHandlerMut VH; local MeanVoting VO; local NiceFFVoting FFVO; + super.PostBeginPlay(); + class'ScrnLightVestPickup'.default.cost = 50; class'ScrnHorzineVestPickup'.default.weight = 2; class'ScrnHorzineVestPickup'.default.cost = 750; 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 class'NiceAbilityManager'.default.events.static.AddAdapter(class'NiceSharpshooterAbilitiesAdapter', level); class'NiceAbilityManager'.default.events.static.AddAdapter(class'NiceEnforcerAbilitiesAdapter', level); + SetTimer(0.25, true); - if(Role < ROLE_Authority) + if (Role < ROLE_Authority) return; // Create sync node serverStorage = new class'NiceStorageServer'; @@ -223,8 +216,8 @@ simulated function PostBeginPlay() // -- Lower starting HL ScrnMut.GameRules.HardcoreLevel -= 7; ScrnMut.GameRules.HardcoreLevelFloat -= 7; + // -- Fill-in zed info - i = 0; // - Clot ZedDatabase[0].bNeedsReplacement = bReplaceClot; // - Crawler diff --git a/sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc b/sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc index f8be612..6052a53 100644 --- a/sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc @@ -1,6 +1,9 @@ class NiceSCARMK17Pickup extends NiceWeaponPickup; + defaultproperties { + VariantClasses(0)=class'KFMod.NeonSCARMK17Pickup' + VariantClasses(1)=class'SkinCamoSCARMK17Pickup' Weight=8.000000 cost=1250 AmmoCost=28 @@ -15,7 +18,6 @@ defaultproperties AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo' CorrespondingPerkIndex=3 EquipmentCategoryID=3 - VariantClasses(0)=Class'KFMod.NeonSCARMK17Pickup' InventoryType=class'NiceSCARMK17AssaultRifle' PickupMessage="You got the SCARMK17" PickupSound=Sound'KF_SCARSnd.SCAR_Pickup' @@ -23,4 +25,4 @@ defaultproperties StaticMesh=StaticMesh'KF_pickups2_Trip.Rifles.SCAR_Pickup' CollisionRadius=25.000000 CollisionHeight=5.000000 -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc b/sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc index c3faef6..58e0299 100644 --- a/sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc +++ b/sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc @@ -1,6 +1,9 @@ class NiceDeaglePickup extends NiceSinglePickup; + defaultproperties { + VariantClasses(0)=class'SkinExecutionerPickup' + VariantClasses(1)=class'SkinGoldenDeaglePickup' Weight=2.000000 cost=250 AmmoCost=14 @@ -13,9 +16,8 @@ defaultproperties ItemShortName="Deagle" AmmoItemName=".300 JHP Ammo" AmmoMesh=None - VariantClasses(0)=class'SkinGoldenDeaglePickup' InventoryType=class'NiceDeagle' PickupMessage="You got the Desert Eagle" PickupSound=Sound'KF_HandcannonSnd.50AE_Pickup' StaticMesh=StaticMesh'KF_pickups_Trip.pistol.deagle_pickup' -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc b/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc index 8f20e53..98dce8c 100644 --- a/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc +++ b/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc @@ -1,6 +1,9 @@ class NiceDualDeaglePickup extends NiceDualiesPickup; + defaultproperties { + VariantClasses(0)=class'SkinDualExecutionerPickup' + VariantClasses(1)=class'SkinGoldenDualDeaglePickup' Weight=4.000000 cost=500 AmmoCost=28 @@ -13,9 +16,8 @@ defaultproperties ItemShortName="Dual Deagles" AmmoItemName=".300 JHP Ammo" AmmoMesh=StaticMesh'KillingFloorStatics.DeagleAmmo' - VariantClasses(0)=class'SkinGoldenDualDeaglePickup' InventoryType=class'NiceDualDeagle' PickupMessage="You found another Handcannon" PickupSound=Sound'KF_HandcannonSnd.50AE_Pickup' StaticMesh=StaticMesh'KF_pickups_Trip.pistol.deagle_pickup' -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc index a8b251b..4ca0a2d 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc @@ -1,6 +1,8 @@ class NiceDualMagnumPickup extends NiceDualiesPickup; + defaultproperties { + VariantClasses(0)=class'SkinDualCowboyMagnumPickup' Weight=4.000000 cost=250 AmmoCost=10 @@ -17,4 +19,4 @@ defaultproperties PickupMessage="You found another 44 Magnum" PickupSound=Sound'KF_RevolverSnd.foley.WEP_Revolver_Foley_Pickup' StaticMesh=StaticMesh'KF_pickups3_Trip.Pistols.revolver_Pickup' -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc index 08e8141..db4bdee 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc @@ -1,6 +1,8 @@ class NiceMagnumPickup extends NiceSinglePickup; + defaultproperties { + VariantClasses(0)=class'SkinCowboyMagnumPickup' Weight=2.000000 cost=125 AmmoCost=5 @@ -17,4 +19,4 @@ defaultproperties PickupMessage="You got the 44 Magnum" PickupSound=Sound'KF_RevolverSnd.foley.WEP_Revolver_Foley_Pickup' StaticMesh=StaticMesh'KF_pickups3_Trip.Pistols.revolver_Pickup' -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc b/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc index 5729cb8..d8ec776 100644 --- a/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc +++ b/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc @@ -1,6 +1,9 @@ class NiceKrissMPickup extends NiceWeaponPickup; + defaultproperties { + VariantClasses(0)=class'KFMod.NeonKrissMPickup' + VariantClasses(1)=class'SkinGoldenKrissPickup' Weight=4.000000 cost=750 AmmoCost=22 @@ -15,7 +18,6 @@ defaultproperties AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo' EquipmentCategoryID=3 CorrespondingPerkIndex=3 - VariantClasses(0)=Class'KFMod.NeonKrissMPickup' InventoryType=class'NiceKrissMMedicGun' PickupMessage="You got the KRISS Vector Medic Gun" PickupSound=Sound'KF_KrissSND.Handling.KF_WEP_KRISS_Handling_Pickup' @@ -23,4 +25,4 @@ defaultproperties StaticMesh=StaticMesh'KF_pickups6_Trip.Rifles.Kriss_Pickup' CollisionRadius=25.000000 CollisionHeight=5.000000 -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc b/sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc index 6465df0..14a32e4 100644 --- a/sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc @@ -1,6 +1,8 @@ class NiceM14EBRPickup extends NiceWeaponPickup; + defaultproperties { + VariantClasses(0)=class'SkinM14EBR2ProPickup' Weight=8.000000 cost=1000 AmmoCost=25 @@ -22,4 +24,4 @@ defaultproperties StaticMesh=StaticMesh'KF_pickups2_Trip.Rifles.M14_EBR_Pickup' CollisionRadius=25.000000 CollisionHeight=5.000000 -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc index c701fd0..2af1216 100644 --- a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc @@ -1,6 +1,8 @@ class NiceMaulerPickup extends NiceWeaponPickup; + defaultproperties { + VariantClasses(0)=class'ScrnSPSniperPickup' Weight=6.000000 cost=750 AmmoCost=22 @@ -21,4 +23,4 @@ defaultproperties StaticMesh=StaticMesh'NicePackSM.Silver.SniperRifle' CollisionRadius=25.000000 CollisionHeight=5.000000 -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc b/sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc index bc4ca9c..8a94c4c 100644 --- a/sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc @@ -2,6 +2,7 @@ class NiceWinchesterPickup extends NiceWeaponPickup; defaultproperties { + VariantClasses(0)=class'SkinRetroLARPickup' Weight=6.000000 AmmoCost=13 cost=250 @@ -22,4 +23,4 @@ defaultproperties StaticMesh=StaticMesh'KF_pickups_Trip.Rifle.LeverAction_pickup' CollisionRadius=30.000000 CollisionHeight=5.000000 -} +} \ No newline at end of file