KillingFloor2/KF2-Dev-Scripts
1
0
Fork 0
Code Activity

upload

Browse Source
This commit is contained in:
GenZmeY
2021-10-05 20:50:32 +03:00
parent 248ed28e6d
commit b56d5b0c62
24 changed files with 138 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
KFGame/Classes/KFAutoPurchaseHelper.uc
View File

@ -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);
}

15
KFGame/Classes/KFGFxStartGameContainer_FindGame.uc
View File

@ -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

2
KFGame/Classes/KFGFxStoreContainer_Main.uc
View File

@ -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
}

6
KFGame/Classes/KFGameReplicationInfo.uc
View File

@ -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()

4
KFGame/Classes/KFGfxMenu_StartGame.uc
View File

@ -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

12
KFGame/Classes/KFUnlockManager.uc
View File

@ -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)}
}

4
KFGame/Classes/KFWeapDef_BladedPistol.uc
View File

@ -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
}

4
KFGame/Classes/KFWeapDef_DualBladed.uc
View File

@ -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
}

2
KFGame/Classes/KFWeapDef_HRG_Energy.uc
View File

@ -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

2
KFGame/Classes/KFWeapDef_ParasiteImplanter.uc
View File

@ -21,5 +21,5 @@ defaultproperties
UpgradePrice[0]=1500
UpgradeSellPrice[0]=1125
// SharedUnlockId=SCU_ParasiteImplanter
SharedUnlockId=SCU_ParasiteImplanter
}