From b56d5b0c6267b8c707b1abecd244a1d80618297d Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 5 Oct 2021 20:50:32 +0300 Subject: [PATCH] upload --- KFGame/Classes/KFAutoPurchaseHelper.uc | 2 +- .../KFGFxStartGameContainer_FindGame.uc | 15 +++--- KFGame/Classes/KFGFxStoreContainer_Main.uc | 2 + KFGame/Classes/KFGameReplicationInfo.uc | 6 +-- KFGame/Classes/KFGfxMenu_StartGame.uc | 4 ++ KFGame/Classes/KFUnlockManager.uc | 12 ++++- KFGame/Classes/KFWeapDef_BladedPistol.uc | 4 +- KFGame/Classes/KFWeapDef_DualBladed.uc | 4 +- KFGame/Classes/KFWeapDef_HRG_Energy.uc | 2 +- KFGame/Classes/KFWeapDef_ParasiteImplanter.uc | 2 +- .../Classes/KFExplosion_MineReconstructor.uc | 4 +- .../Classes/KFExplosion_ParasiteSeed.uc | 2 +- .../Classes/KFExplosion_ParasiteSeedHuman.uc | 2 +- KFGameContent/Classes/KFGameInfo_Survival.uc | 2 +- .../Classes/KFOutbreakEvent_Weekly.uc | 48 +++++++++---------- KFGameContent/Classes/KFPawn_ZedStalker.uc | 2 + .../Classes/KFProj_Bullet_HRG_Boomy.uc | 2 +- .../KFProj_Bullet_ParasiteImplanterAlt.uc | 2 +- .../Classes/KFSeqCond_IsWeeklyEvent.uc | 40 ++++++++++++++++ .../Classes/KFWeap_Blunt_MedicBat.uc | 2 +- KFGameContent/Classes/KFWeap_HRG_Boomy.uc | 12 ++--- KFGameContent/Classes/KFWeap_HRG_Energy.uc | 6 +-- KFGameContent/Classes/KFWeap_Pistol_Bladed.uc | 10 ++-- .../Classes/KFWeap_Pistol_DualBladed.uc | 13 ++++- 24 files changed, 138 insertions(+), 62 deletions(-) create mode 100644 KFGameContent/Classes/KFSeqCond_IsWeeklyEvent.uc diff --git a/KFGame/Classes/KFAutoPurchaseHelper.uc b/KFGame/Classes/KFAutoPurchaseHelper.uc index 27634df..5217814 100644 --- a/KFGame/Classes/KFAutoPurchaseHelper.uc +++ b/KFGame/Classes/KFAutoPurchaseHelper.uc @@ -539,7 +539,7 @@ function bool AttemptBuyArmorChunk( out int InAutoFillDosh ) InAutoFillDosh -= ChunkCost; PercentArmorBought = (PercentArmorBought > 0.f && PercentArmorBought < 1.f) ? 1.f : PercentArmorBought; - ArmorItem.SpareAmmoCount = FMin(ArmorItem.SpareAmmoCount + (PercentArmorBought / 100.f * ArmorItem.MaxSpareAmmo), ArmorItem.MaxSpareAmmo); + ArmorItem.SpareAmmoCount = FMin(ArmorItem.SpareAmmoCount + PercentArmorBought, ArmorItem.MaxSpareAmmo); BoughtAmmo(PercentArmorBought, ChunkCost, EIT_Armor); } diff --git a/KFGame/Classes/KFGFxStartGameContainer_FindGame.uc b/KFGame/Classes/KFGFxStartGameContainer_FindGame.uc index d8f2f57..264fcdd 100644 --- a/KFGame/Classes/KFGFxStartGameContainer_FindGame.uc +++ b/KFGame/Classes/KFGFxStartGameContainer_FindGame.uc @@ -188,24 +188,27 @@ function FillWhatsNew() item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Spring_Armory_Season_Pass", "ArmorySeasonPass", "https://store.steampowered.com/app/1524820/Killing_Floor_2__Armory_Season_Pass"); WhatsNewItems.AddItem(item); // Featured Time Limited Item - item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_PremiumTicket", "FeaturedEventItem", "https://store.steampowered.com/buyitem/232090/9119"); + item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_PremiumTicket", "FeaturedEventItem", "https://store.steampowered.com/buyitem/232090/4928"); + WhatsNewItems.AddItem(item); +// Featured Full Gear + item=SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_FullGearBundle_DoZ", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9119"); WhatsNewItems.AddItem(item); // Featured Cosmetic Bundle - item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_DoZ", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9120"); - WhatsNewItems.AddItem(item); -// Featured Cosmetic Bundle - item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_Vietnam","FeaturedItemBundle","https://store.steampowered.com/buyitem/232090/9122"); + item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_DoZ_Cosmetics", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9120"); WhatsNewItems.AddItem(item); // Featured Weapon Skin Bundle item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_Hellmark", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9121"); WhatsNewItems.AddItem(item); +// Featured Cosmetic Bundle + item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_Vietnam","FeaturedItemBundle","https://store.steampowered.com/buyitem/232090/9122"); + WhatsNewItems.AddItem(item); // Featured Weapon Bundle item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_PiranhaPistol", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9123"); WhatsNewItems.AddItem(item); // Featured Weapon Bundle item=SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Halloween_CorrupterCarbine", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9124"); WhatsNewItems.AddItem(item); - // Featured Weapon Bundle +// Featured Weapon Bundle item=SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_halloween_Weaponsbundle", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9125"); WhatsNewItems.AddItem(item); // Misc Community Links diff --git a/KFGame/Classes/KFGFxStoreContainer_Main.uc b/KFGame/Classes/KFGFxStoreContainer_Main.uc index 62173e9..33f8400 100644 --- a/KFGame/Classes/KFGFxStoreContainer_Main.uc +++ b/KFGame/Classes/KFGFxStoreContainer_Main.uc @@ -454,6 +454,7 @@ DefaultProperties FeaturedItemIDs[4]=9122 FeaturedItemIDs[5]=9123 FeaturedItemIDs[6]=9124 + FeaturedItemIDs[7]=9125 ConsoleFeaturedItemIDs[0]=7783 //Whatsnew Gold Ticket PSN ConsoleFeaturedItemIDs[1]=9119 @@ -462,6 +463,7 @@ DefaultProperties ConsoleFeaturedItemIDs[4]=9122 ConsoleFeaturedItemIDs[5]=9123 ConsoleFeaturedItemIDs[6]=9124 + ConsoleFeaturedItemIDs[7]=9125 MaxFeaturedItems=5 } \ No newline at end of file diff --git a/KFGame/Classes/KFGameReplicationInfo.uc b/KFGame/Classes/KFGameReplicationInfo.uc index f972c83..85c65b1 100644 --- a/KFGame/Classes/KFGameReplicationInfo.uc +++ b/KFGame/Classes/KFGameReplicationInfo.uc @@ -1113,12 +1113,12 @@ simulated function bool CanOverrideWeeklyMusic() if (WorldInfo.NetMode == NM_Client) { - return !bIsWeeklyMode || class'KFGameEngine'.static.GetWeeklyEventIndexMod() != 12; + return (!bIsWeeklyMode || class'KFGameEngine'.static.GetWeeklyEventIndexMod() != 12 || GetNumPlayersAlive() == 0); } else { KFGI = KFGameInfo(WorldInfo.Game); - return (KFGI == none || KFGI.OutbreakEvent == none || !KFGI.OutbreakEvent.ActiveEvent.bForceWWLMusic); + return (KFGI == none || KFGI.OutbreakEvent == none || !KFGI.OutbreakEvent.ActiveEvent.bForceWWLMusic || GetNumPlayersAlive() == 0); } } @@ -1129,7 +1129,7 @@ simulated function bool IsFinalWave() simulated function bool IsBossWave() { - return WaveNum == WaveMax; + return WaveNum == WaveMax || (bIsWeeklyMode && class'KFGameEngine'.static.GetWeeklyEventIndexMod() == 14); } simulated function bool IsInfiniteWave() diff --git a/KFGame/Classes/KFGfxMenu_StartGame.uc b/KFGame/Classes/KFGfxMenu_StartGame.uc index 1a52db4..06e1a03 100644 --- a/KFGame/Classes/KFGfxMenu_StartGame.uc +++ b/KFGame/Classes/KFGfxMenu_StartGame.uc @@ -1566,6 +1566,8 @@ function bool ShouldUseDifficultyFilter(int GameModeIndex) { //Weekly case 1: + //VSSurvival + case 2: return false; } @@ -1578,6 +1580,8 @@ function bool ShouldUseLengthFilter(int GameModeIndex) { //Weekly case 1: + //VSSurvival + case 2: //Endless case 3: // Objective Mode diff --git a/KFGame/Classes/KFUnlockManager.uc b/KFGame/Classes/KFUnlockManager.uc index fd68b9d..a8ef790 100644 --- a/KFGame/Classes/KFUnlockManager.uc +++ b/KFGame/Classes/KFUnlockManager.uc @@ -29,7 +29,9 @@ enum ESharedContentUnlock SCU_FrostFang, SCU_GravityImploder, SCU_FAMAS, - SCU_Thermite + SCU_Thermite, + SCU_BladedPistol, + SCU_ParasiteImplanter }; @@ -345,4 +347,12 @@ defaultproperties Name=KFWeap_RocketLauncher_ThermiteBore, IconPath="WEP_UI_Thermite_TEX.UI_WeaponSelect_Thermite", ID=8940)} + SharedContentList(SCU_BladedPistol)={( + Name=KFWeap_Pistol_Bladed, + IconPath="WEP_UI_BladedPistol_TEX.UI_WeaponSelect_BladedPistol", + ID=9126)} + SharedContentList(SCU_ParasiteImplanter)={( + Name=KFWeap_Rifle_ParasiteImplanter, + IconPath="WEP_UI_ParasiteImplanter_TEX.UI_WeaponSelect_ParasiteImplanter", + ID=9132)} } diff --git a/KFGame/Classes/KFWeapDef_BladedPistol.uc b/KFGame/Classes/KFWeapDef_BladedPistol.uc index ecddd40..55bdfce 100644 --- a/KFGame/Classes/KFWeapDef_BladedPistol.uc +++ b/KFGame/Classes/KFWeapDef_BladedPistol.uc @@ -13,7 +13,7 @@ DefaultProperties WeaponClassPath="KFGameContent.KFWeap_Pistol_Bladed" BuyPrice=600 - AmmoPricePerMag=32 + AmmoPricePerMag=38 //32 ImagePath="WEP_UI_BladedPistol_TEX.UI_WeaponSelect_BladedPistol" EffectiveRange=25 @@ -22,4 +22,6 @@ DefaultProperties UpgradePrice[1]=1500 UpgradeSellPrice[0]=550 UpgradeSellPrice[1]=1650 + + SharedUnlockId=SCU_BladedPistol } diff --git a/KFGame/Classes/KFWeapDef_DualBladed.uc b/KFGame/Classes/KFWeapDef_DualBladed.uc index 1546e6e..083631a 100644 --- a/KFGame/Classes/KFWeapDef_DualBladed.uc +++ b/KFGame/Classes/KFWeapDef_DualBladed.uc @@ -13,7 +13,7 @@ DefaultProperties WeaponClassPath="KFGameContent.KFWeap_Pistol_DualBladed" BuyPrice=1200 - AmmoPricePerMag=64 + AmmoPricePerMag=76 //64 ImagePath="WEP_UI_Dual_BladedPistol_TEX.UI_WeaponSelect_Dual_BladedPistol" EffectiveRange=50 @@ -23,4 +23,6 @@ DefaultProperties UpgradeSellPrice[0]=525 UpgradeSellPrice[1]=1650 + + SharedUnlockId=SCU_BladedPistol } diff --git a/KFGame/Classes/KFWeapDef_HRG_Energy.uc b/KFGame/Classes/KFWeapDef_HRG_Energy.uc index 62581aa..ae4c93f 100644 --- a/KFGame/Classes/KFWeapDef_HRG_Energy.uc +++ b/KFGame/Classes/KFWeapDef_HRG_Energy.uc @@ -15,7 +15,7 @@ DefaultProperties WeaponClassPath="KFGameContent.KFWeap_HRG_Energy" BuyPrice=1500 //1100 - AmmoPricePerMag=65 + AmmoPricePerMag=70 //65 ImagePath="WEP_UI_HRG_Energy_TEX.UI_WeaponSelect_HRG_Energy" EffectiveRange=50 diff --git a/KFGame/Classes/KFWeapDef_ParasiteImplanter.uc b/KFGame/Classes/KFWeapDef_ParasiteImplanter.uc index 5bac8a5..a354b3d 100644 --- a/KFGame/Classes/KFWeapDef_ParasiteImplanter.uc +++ b/KFGame/Classes/KFWeapDef_ParasiteImplanter.uc @@ -21,5 +21,5 @@ defaultproperties UpgradePrice[0]=1500 UpgradeSellPrice[0]=1125 - // SharedUnlockId=SCU_ParasiteImplanter + SharedUnlockId=SCU_ParasiteImplanter } diff --git a/KFGameContent/Classes/KFExplosion_MineReconstructor.uc b/KFGameContent/Classes/KFExplosion_MineReconstructor.uc index 30c8652..7a6f138 100644 --- a/KFGameContent/Classes/KFExplosion_MineReconstructor.uc +++ b/KFGameContent/Classes/KFExplosion_MineReconstructor.uc @@ -259,8 +259,8 @@ DefaultProperties HealingDamageType=class'KFDT_Healing' HealingAmount=0; - fMinAmmoutHealing=4; - fMaxAmmoutHealing=40 //24; + fMinAmmoutHealing=5; //4; + fMaxAmmoutHealing=50; //40 Interval=0 MaxTime=0.0 diff --git a/KFGameContent/Classes/KFExplosion_ParasiteSeed.uc b/KFGameContent/Classes/KFExplosion_ParasiteSeed.uc index 094f85a..6dde3fb 100644 --- a/KFGameContent/Classes/KFExplosion_ParasiteSeed.uc +++ b/KFGameContent/Classes/KFExplosion_ParasiteSeed.uc @@ -85,7 +85,7 @@ DefaultProperties HealingDamageType=class'KFDT_Healing_ParasiteSeed' HealingAmount=5 //10 Interval=0.5 //1 - MaxTime=5.5 //6.5 //8 + MaxTime=5.0 //5.5 bExplodeMoreThanOnce=false bDoFullDamage=false //true diff --git a/KFGameContent/Classes/KFExplosion_ParasiteSeedHuman.uc b/KFGameContent/Classes/KFExplosion_ParasiteSeedHuman.uc index 52ad356..f4bcf85 100644 --- a/KFGameContent/Classes/KFExplosion_ParasiteSeedHuman.uc +++ b/KFGameContent/Classes/KFExplosion_ParasiteSeedHuman.uc @@ -12,7 +12,7 @@ class KFExplosion_ParasiteSeedHuman extends KFExplosion_MedicGrenade; DefaultProperties { HealingDamageType=class'KFDT_Healing_ParasiteSeed' - HealingAmount=30 //10 + HealingAmount=25 //30 //10 Interval=1.0 //1 MaxTime=0.5 //6.5 //8 diff --git a/KFGameContent/Classes/KFGameInfo_Survival.uc b/KFGameContent/Classes/KFGameInfo_Survival.uc index df92749..b56672e 100644 --- a/KFGameContent/Classes/KFGameInfo_Survival.uc +++ b/KFGameContent/Classes/KFGameInfo_Survival.uc @@ -432,7 +432,7 @@ function UpdateGameSettings() { for( i = 0; i < GameReplicationInfo.PRIArray.Length; i++ ) { - if( !GameReplicationInfo.PRIArray[i].bBot ) + if (!GameReplicationInfo.PRIArray[i].bBot && !GameReplicationInfo.PRIArray[i].bOnlySpectator && PlayerController(GameReplicationInfo.PRIArray[i].Owner) != none) { NumHumanPlayers++; } diff --git a/KFGameContent/Classes/KFOutbreakEvent_Weekly.uc b/KFGameContent/Classes/KFOutbreakEvent_Weekly.uc index 532f1ea..28cd41b 100644 --- a/KFGameContent/Classes/KFOutbreakEvent_Weekly.uc +++ b/KFGameContent/Classes/KFOutbreakEvent_Weekly.uc @@ -594,31 +594,31 @@ defaultproperties )}, ZedsToAdjust={( - (ClassToAdjust=class'KFGameContent.KFPawn_ZedMatriarch',HealthScale=2.0,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedPatriarch',HealthScale=2.0,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedHans',HealthScale=2.0,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedFleshpoundKing',HealthScale=2.0,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedBloatKing',HealthScale=2.0,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedMatriarch',HealthScale=1.75,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.25), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedPatriarch',HealthScale=1.75,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.25), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedHans',HealthScale=1.75,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.25), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedFleshpoundKing',HealthScale=1.75,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.25), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedBloatKing',HealthScale=1.75,DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.25), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedClot_Cyst',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedClot_Alpha',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedClot_AlphaKing',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedClot_Slasher',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedSiren',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedStalker',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedCrawler',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedCrawlerKing',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedGorefast',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedGorefastDualBlade',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedBloat',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedHusk',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedDAR_EMP',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedDAR_Laser',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedDAR_Rocket',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedScrake',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedFleshpound',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedClot_Cyst', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedClot_Alpha', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedClot_AlphaKing', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedClot_Slasher', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedSiren', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedStalker', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedCrawler', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedCrawlerKing', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedGorefast', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedGorefastDualBlade', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedBloat', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedHusk', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedDAR_EMP', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedDAR_Laser', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedDAR_Rocket', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedScrake', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), + (ClassToAdjust=class'KFGameContent.KFPawn_ZedFleshpound', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), (ClassToAdjust=class'KFGameContent.KFPawn_ZedFleshpoundMini',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2), - (ClassToAdjust=class'KFGameContent.KFPawn_ZedBloatKingSubspawn',bStartEnraged=true, DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2) + (ClassToAdjust=class'KFGameContent.KFPawn_ZedBloatKingSubspawn', DamageDealtScale=1.0, InitialGroundSpeedModifierScale=1.2) )}, SpawnReplacementList={( (SpawnEntry=AT_Clot,NewClass=(class'KFGameContent.KFPawn_ZedClot_Alpha'),PercentChance=0.15), @@ -626,7 +626,7 @@ defaultproperties (SpawnEntry=AT_GoreFast,NewClass=(class'KFGameContent.KFPawn_ZedGorefastDualBlade'),PercentChance=0.15), (SpawnEntry=AT_Crawler,NewClass=(class'KFGameContent.KFPawn_ZedCrawlerKing'),PercentChance=0.15), (SpawnEntry=AT_Bloat,NewClass=(class'KFGameContent.KFPawn_ZedScrake'),PercentChance=0.05), - (SpawnEntry=AT_FleshpoundMini,NewClass=(class'KFGameContent.KFPawn_ZedFleshpound'),PercentChance=0.05) + (SpawnEntry=AT_FleshpoundMini,NewClass=(class'KFGameContent.KFPawn_ZedFleshpound'),PercentChance=0.2) )} )} diff --git a/KFGameContent/Classes/KFPawn_ZedStalker.uc b/KFGameContent/Classes/KFPawn_ZedStalker.uc index a177123..33fed3c 100644 --- a/KFGameContent/Classes/KFPawn_ZedStalker.uc +++ b/KFGameContent/Classes/KFPawn_ZedStalker.uc @@ -546,6 +546,8 @@ DefaultProperties CloakedAkComponent=CloakedAkComponent0 Components.Add( CloakedAkComponent0 ) + ZEDCowboyHatAttachName=Hat_Attach + `if(`notdefined(ShippingPC)) DebugRadarTexture=Texture2D'UI_ZEDRadar_TEX.MapIcon_Stalker'; `endif diff --git a/KFGameContent/Classes/KFProj_Bullet_HRG_Boomy.uc b/KFGameContent/Classes/KFProj_Bullet_HRG_Boomy.uc index d38754e..a241802 100644 --- a/KFGameContent/Classes/KFProj_Bullet_HRG_Boomy.uc +++ b/KFGameContent/Classes/KFProj_Bullet_HRG_Boomy.uc @@ -46,7 +46,7 @@ defaultproperties // explosion Begin Object Class=KFGameExplosion Name=ExploTemplate0 Damage=35 //30 - DamageRadius=150 //120 + DamageRadius=200 //150 //120 DamageFalloffExponent=1.f DamageDelay=0.f MomentumTransferScale=10000 diff --git a/KFGameContent/Classes/KFProj_Bullet_ParasiteImplanterAlt.uc b/KFGameContent/Classes/KFProj_Bullet_ParasiteImplanterAlt.uc index 8a7e5db..08dc476 100644 --- a/KFGameContent/Classes/KFProj_Bullet_ParasiteImplanterAlt.uc +++ b/KFGameContent/Classes/KFProj_Bullet_ParasiteImplanterAlt.uc @@ -317,7 +317,7 @@ defaultproperties // explosion Begin Object Class=KFGameExplosion Name=ExploTemplate0 - Damage=400 //250 + Damage=300 //400 DamageRadius=450 DamageFalloffExponent=0.5f //1.f DamageDelay=0.f diff --git a/KFGameContent/Classes/KFSeqCond_IsWeeklyEvent.uc b/KFGameContent/Classes/KFSeqCond_IsWeeklyEvent.uc new file mode 100644 index 0000000..7ed8cdb --- /dev/null +++ b/KFGameContent/Classes/KFSeqCond_IsWeeklyEvent.uc @@ -0,0 +1,40 @@ +//============================================================================= +// KFSeqCond_IsWeeklyEvent +//============================================================================= +// Condition to check if we are in an specified weekly event +//============================================================================= +// Killing Floor 2 +// Copyright (C) 2021 Tripwire Interactive LLC +//============================================================================= +class KFSeqCond_IsWeeklyEvent extends SequenceCondition; + +var() int WeeklyIndex; + +function Activated() +{ + local KFGameInfo KFGI; + KFGI = KFGameInfo(GetWorldInfo().Game); + + if (KFGI != none) + { + if (KFGI.MyKFGRI != none && KFGI.MyKFGRI.bIsWeeklyMode && class'KFGameEngine'.static.GetWeeklyEventIndexMod() == WeeklyIndex) + { + OutputLinks[0].bHasImpulse = true; + OutputLinks[0].bHasImpulse = false; + } + else + { + OutputLinks[0].bHasImpulse = false; + OutputLinks[0].bHasImpulse = true; + } + } +} + +defaultproperties +{ + ObjColor=(R=255,G=0,B=255,A=255) + ObjName="IsWeeklyEvent" + + OutputLinks(0)=(LinkDesc="True") + OutputLinks(1)=(LinkDesc="False") +} \ No newline at end of file diff --git a/KFGameContent/Classes/KFWeap_Blunt_MedicBat.uc b/KFGameContent/Classes/KFWeap_Blunt_MedicBat.uc index 03ac3e6..4f48058 100644 --- a/KFGameContent/Classes/KFWeap_Blunt_MedicBat.uc +++ b/KFGameContent/Classes/KFWeap_Blunt_MedicBat.uc @@ -734,7 +734,7 @@ defaultproperties DamageFalloffExponent=0.f DamageDelay=0.f MyDamageType=class'KFDT_Toxic_MedicBatGas' - HealingAmount=20 //30 + HealingAmount=15 //20 //30 // Damage Effects KnockDownStrength=0 diff --git a/KFGameContent/Classes/KFWeap_HRG_Boomy.uc b/KFGameContent/Classes/KFWeap_HRG_Boomy.uc index 2792ffc..f318b18 100644 --- a/KFGameContent/Classes/KFWeap_HRG_Boomy.uc +++ b/KFGameContent/Classes/KFWeap_HRG_Boomy.uc @@ -115,7 +115,7 @@ defaultproperties // Ammo MagazineCapacity[0]=24 SpareAmmoCapacity[0]=192 - InitialSpareMags[0]=1 + InitialSpareMags[0]=2 //1 bCanBeReloaded=true bReloadFromMagazine=true @@ -152,7 +152,7 @@ defaultproperties InstantHitDamageTypes(DEFAULT_FIREMODE)=class'KFDT_Ballistic_HRG_Boomy' FireInterval(DEFAULT_FIREMODE)=+0.1667 // 360 RPM Spread(DEFAULT_FIREMODE)=0.01 //0.025 - InstantHitDamage(DEFAULT_FIREMODE)=25.0 + InstantHitDamage(DEFAULT_FIREMODE)=30.0 //25.0 FireOffset=(X=30,Y=4.5,Z=-5) // ALT_FIREMODE @@ -162,7 +162,7 @@ defaultproperties WeaponProjectiles(ALTFIRE_FIREMODE)=class'KFProj_Bullet_HRG_Boomy' InstantHitDamageTypes(ALTFIRE_FIREMODE)=class'KFDT_Ballistic_HRG_Boomy' FireInterval(ALTFIRE_FIREMODE)=+0.1667 // 360 RPM - InstantHitDamage(ALTFIRE_FIREMODE)=25.0 + InstantHitDamage(ALTFIRE_FIREMODE)=30.0 //25.0 Spread(ALTFIRE_FIREMODE)=0.01 //0.025 // BASH_FIREMODE @@ -186,7 +186,7 @@ defaultproperties bHasIronSights=true bHasFlashlight=false - WeaponUpgrades[1]=(Stats=((Stat=EWUS_Damage0, Scale=1.15f), (Stat=EWUS_Damage1, Scale=1.15f), (Stat=EWUS_Weight, Add=1))) - WeaponUpgrades[2]=(Stats=((Stat=EWUS_Damage0, Scale=1.3f), (Stat=EWUS_Damage1, Scale=1.3f), (Stat=EWUS_Weight, Add=2))) - WeaponUpgrades[3]=(Stats=((Stat=EWUS_Damage0, Scale=1.45f), (Stat=EWUS_Damage1, Scale=1.45f), (Stat=EWUS_Weight, Add=3))) + WeaponUpgrades[1]=(Stats=((Stat=EWUS_Damage0, Scale=1.2f), (Stat=EWUS_Damage1, Scale=1.15f), (Stat=EWUS_Weight, Add=1))) + WeaponUpgrades[2]=(Stats=((Stat=EWUS_Damage0, Scale=1.4f), (Stat=EWUS_Damage1, Scale=1.3f), (Stat=EWUS_Weight, Add=2))) + WeaponUpgrades[3]=(Stats=((Stat=EWUS_Damage0, Scale=1.6f), (Stat=EWUS_Damage1, Scale=1.45f), (Stat=EWUS_Weight, Add=3))) } diff --git a/KFGameContent/Classes/KFWeap_HRG_Energy.uc b/KFGameContent/Classes/KFWeap_HRG_Energy.uc index 9aa49a1..bd3d3ff 100644 --- a/KFGameContent/Classes/KFWeap_HRG_Energy.uc +++ b/KFGameContent/Classes/KFWeap_HRG_Energy.uc @@ -435,7 +435,7 @@ defaultproperties // Ammo MagazineCapacity[0]=15 - SpareAmmoCapacity[0]=135 + SpareAmmoCapacity[0]=120 //135 InitialSpareMags[0]=2 bCanBeReloaded=true bReloadFromMagazine=true @@ -466,7 +466,7 @@ defaultproperties WeaponProjectiles(DEFAULT_FIREMODE)=class'KFProj_Bullet_HRG_Energy' FireInterval(DEFAULT_FIREMODE)=+0.175 //342 RPM PenetrationPower(DEFAULT_FIREMODE)=1.0 - InstantHitDamage(DEFAULT_FIREMODE)=90.0 //125.0 + InstantHitDamage(DEFAULT_FIREMODE)=80 //90.0 //125.0 InstantHitDamageTypes(DEFAULT_FIREMODE)=class'KFDT_Ballistic_HRG_Energy_Primary' Spread(DEFAULT_FIREMODE)=0.015 FireOffset=(X=20,Y=4.0,Z=-3) @@ -480,7 +480,7 @@ defaultproperties InstantHitDamageTypes(ALTFIRE_FIREMODE)=class'KFDT_Ballistic_HRG_Energy_Secondary' InstantHitMomentum(ALTFIRE_FIREMODE)=1.0 PenetrationPower(ALTFIRE_FIREMODE)=3.0 - InstantHitDamage(ALTFIRE_FIREMODE)=300.0 //475.0 + InstantHitDamage(ALTFIRE_FIREMODE)=120.0 // 300.0 //475.0 PenetrationDamageReductionCurve(ALTFIRE_FIREMODE)=(Points=((InVal=0.f,OutVal=0.f),(InVal=1.f, OutVal=1.f))) AmmoCost(ALTFIRE_FIREMODE)=3 diff --git a/KFGameContent/Classes/KFWeap_Pistol_Bladed.uc b/KFGameContent/Classes/KFWeap_Pistol_Bladed.uc index f89d08e..8805c61 100644 --- a/KFGameContent/Classes/KFWeap_Pistol_Bladed.uc +++ b/KFGameContent/Classes/KFWeap_Pistol_Bladed.uc @@ -109,7 +109,7 @@ defaultproperties // Zooming/Position PlayerViewOffset=(X=-15,Y=12,Z=-6) - IronSightPosition=(X=0,Y=0,Z=1.0) //(X=-3,Y=-0.38,Z=-0.2) + IronSightPosition=(X=0,Y=0.05,Z=-1.2) //(X=0,Y=0,Z=1.0) // Content PackageKey="BladedPistol" @@ -121,7 +121,7 @@ defaultproperties // Ammo MagazineCapacity[0]=6 - SpareAmmoCapacity[0]=72 //96 + SpareAmmoCapacity[0]=66 //72 InitialSpareMags[0]=2 AmmoPickupScale[0]=1.0 //2.0 bCanBeReloaded=true @@ -206,9 +206,9 @@ defaultproperties // default MIC param names BlockEffectsSocketName=BlockEffect // Defensive - BlockDamageMitigation=0.60f - ParryDamageMitigationPercent=0.5 - ParryStrength=4 + BlockDamageMitigation=0.70f //0.60f + ParryDamageMitigationPercent=0.6 //0.5 + ParryStrength=3 //4 BlockHitAnimCooldownTime=0.5f BlockTypes.Add((DmgType=class'KFDT_Bludgeon')) BlockTypes.Add((DmgType=class'KFDT_Slashing')) diff --git a/KFGameContent/Classes/KFWeap_Pistol_DualBladed.uc b/KFGameContent/Classes/KFWeap_Pistol_DualBladed.uc index 24b2a27..479dd0a 100644 --- a/KFGameContent/Classes/KFWeap_Pistol_DualBladed.uc +++ b/KFGameContent/Classes/KFWeap_Pistol_DualBladed.uc @@ -543,6 +543,17 @@ simulated function ANIMNOTIFY_UnLockBolt() BuildEmptyMagNodeWeightList( EmptyMagBlendNode, BonesToLockOnEmpty); } +/** + This weapon only supports akimbo anims. + Overriding bUseAltFireMode that comes from gameplay options by the user + */ +simulated event PostInitAnimTree(SkeletalMeshComponent SkelComp) +{ + super.PostInitAnimTree(SkelComp); + + bUseAltFireMode = false; +} + defaultproperties { // Content @@ -579,7 +590,7 @@ defaultproperties // Ammo MagazineCapacity[0]=12 - SpareAmmoCapacity[0]=72 //96 + SpareAmmoCapacity[0]=66 //72 //96 InitialSpareMags[0]=1 AmmoPickupScale[0]=0.5 //1.0 bCanBeReloaded=true