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

upload

Browse Source
This commit is contained in:
GenZmeY
2022-06-14 18:52:40 +03:00
parent df19937a54
commit 513c60070e
17 changed files with 159 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
KFGame/Classes/KFGFxStartGameContainer_FindGame.uc
View File

@ -184,14 +184,32 @@ function FillWhatsNew()
// Latest Update
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_TidalTerror", "LatestUpdate", "http://www.tripwireinteractive.com/redirect/KF2LatestUpdate/");
WhatsNewItems.AddItem(item);
// Featured Ultimate Edition
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_UltimateEdition_Upgrade", "FeaturedItemBundle", "https://store.steampowered.com/app/1914560/KF2__Ultimate_Edition_Upgrade_DLC/");
WhatsNewItems.AddItem(item);
// KF2 Armory Season Pass 2022
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_ArmorySeasonPassII", "ArmorySeasonPass", "https://store.steampowered.com/app/1914490/KF2__Season_Pass_2022");
WhatsNewItems.AddItem(item);
// KF2 Armory Season Pass 2021
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 Weapon Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_Weaponsbundle", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9369");
WhatsNewItems.AddItem(item);
// Featured Weapon
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_ReductoRay", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9367");
WhatsNewItems.AddItem(item);
// Featured Weapon
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_Sentinel","FeaturedItemBundle","https://store.steampowered.com/buyitem/232090/9368");
WhatsNewItems.AddItem(item);
// Featured Outfit Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_DeepSea_Explorer_Uniforms", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9366");
WhatsNewItems.AddItem(item);
// Featured Time Limited Item
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_SS_PremiumTicket", "FeaturedEventItem", "https://store.steampowered.com/buyitem/232090/4928");
WhatsNewItems.AddItem(item);
// Featured Full Gear
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_UltimateEdition", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9283");
// Featured Weapon Skin Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_DeepSea_Weapon_Skin", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9364");
WhatsNewItems.AddItem(item);
// Featured Weapon Skin Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_NeonMKVIII_Weapon_Skin", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9362");
@ -199,24 +217,9 @@ function FillWhatsNew()
// Featured Weapon Skin Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_Classic_Weapon_Skin", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9363");
WhatsNewItems.AddItem(item);
// Featured Weapon Skin Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_DeepSea_Weapon_Skin", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9364");
WhatsNewItems.AddItem(item);
// Featured Weapon Skin Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_Chameleon_Weapon_Skin", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9365");
WhatsNewItems.AddItem(item);
// Featured Outfit Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_DeepSea_Explorer_Uniforms", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9366");
WhatsNewItems.AddItem(item);
// Featured Weapon
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_ReductoRay", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9367");
WhatsNewItems.AddItem(item);
// Featured Weapon
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_Sentinel","FeaturedItemBundle","https://store.steampowered.com/buyitem/232090/9368");
WhatsNewItems.AddItem(item);
// Featured Weapon Bundle
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2022_Weaponsbundle", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9369");
WhatsNewItems.AddItem(item);
// Misc Community Links
item=SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_CommunityHub", "Jaegorhorn", "https://steamcommunity.com/app/232090");
WhatsNewItems.AddItem(item);

2
KFGame/Classes/KFGFxStoreContainer_Main.uc
View File

@ -207,7 +207,7 @@ function SendItems(const out Array<ItemProperties> StoreItemArray)
}
else if (CurrentStoreFilter == EStore_Featured)
{
if (class'WorldInfo'.static.IsConsoleBuild())
if (class'WorldInfo'.static.IsConsoleBuild() || class'WorldInfo'.static.IsEOSBuild())
{
for (j = 0; j < ConsoleFeaturedItemIDs.length; j++)
{

1
KFGame/Classes/KFGFxWeeklyObjectivesContainer.uc
View File

@ -64,7 +64,6 @@ function bool PopulateData()
DataObject.SetString("label", WeeklyInfo.FriendlyName);
if(WeeklyInfo.ModifierDescriptions.length > 0)
{
`Log("SETTING DESCRIPTION: " $WeeklyInfo.DescriptionStrings[0]);
DataObject.SetString("description", WeeklyInfo.DescriptionStrings[0]);
}
DataObject.SetString("iconPath", "img://"$WeeklyInfo.IconPath);

6
KFGame/Classes/KFGameReplicationInfo.uc
View File

@ -2268,6 +2268,12 @@ simulated function NotifyWeeklyEventIndex(int EventIndex)
bNetDirty = true;
}
simulated function bool IsGunGameMode()
{
return bIsWeeklyMode && CurrentWeeklyIndex == 16;
}
defaultproperties
{
TraderItemsPath="GP_Trader_ARCH.DefaultTraderItems"

8
KFGame/Classes/KFInventoryManager.uc
View File

@ -500,7 +500,7 @@ function bool ClassNameIsInInventory(name ItemClassName, out Inventory out_Inven
*/
simulated function Weapon GetBestWeapon( optional bool bForceADifferentWeapon, optional bool allow9mm )
{
local KFWeapon W, BestWeapon;
local KFWeapon W, BestWeapon, BackupGun;
local float Rating, BestRating;
ForEach InventoryActors( class'KFWeapon', W )
@ -521,6 +521,7 @@ simulated function Weapon GetBestWeapon( optional bool bForceADifferentWeapon, o
{
if (W.bIsBackupWeapon && !W.IsMeleeWeapon())
{
BackupGun = W;
continue;
}
}
@ -554,6 +555,11 @@ simulated function Weapon GetBestWeapon( optional bool bForceADifferentWeapon, o
}
}
if (BestWeapon != none && BestWeapon.bIsBackupWeapon && BestWeapon.IsMeleeWeapon() && BackupGun != none)
{
BestWeapon = BackupGun;
}
return BestWeapon;
}

67
KFGame/Classes/KFPickupFactory_Item.uc
View File

@ -51,23 +51,22 @@ replication
function bool CanUsePickup()
{
local KFGameInfo KFGI;
local int i;
local bool has_armour;
local KFGameReplicationInfo KFGRI;
KFGI = KFGameInfo( WorldInfo.Game );
KFGRI = KFGameReplicationInfo( WorldInfo.GRI );
if (KFGI != none && KFGI.OutbreakEvent != none)
if (KFGRI != none && KFGRI.IsGunGameMode())
{
if (KFGI.OutbreakEvent.ActiveEvent.bOnlyArmorItemPickup)
has_armour = false;
for (i = 0 ; i < ItemPickups.Length ; i++)
{
for (i = 0 ; i < ItemPickups.Length ; i++)
if (ItemPickups[i].ItemClass.Name == ArmorClassName)
{
if (ItemPickups[i].ItemClass.Name == ArmorClassName)
{
has_armour = true;
break;
}
has_armour = true;
break;
}
}
@ -182,23 +181,23 @@ function int ChooseWeaponPickup()
local int i, DesiredItemIdx;
local float Weight, TotalWeight, RandomWeight;
local array<int> IndexList;
local KFGameInfo KFGI;
local KFGameReplicationInfo KFGRI;
KFGI = KFGameInfo(WorldInfo.Game);
KFGRI = KFGameReplicationInfo( WorldInfo.GRI );
DesiredItemIdx = 255;
if (KFGRI != none && KFGRI.IsGunGameMode())
{
DesiredItemIdx = 255;
}
// Add up the total weight for all valid attacks
for(i = 0; i < ItemPickups.Length; i++)
{
if (KFGI != none && KFGI.OutbreakEvent != none)
if (KFGRI != none && KFGRI.IsGunGameMode())
{
if (KFGI.OutbreakEvent.ActiveEvent.bOnlyArmorItemPickup)
if (ItemPickups[i].ItemClass.Name != 'KFInventory_Armor')
{
if (ItemPickups[i].ItemClass.Name != 'KFInventory_Armor')
{
continue;
}
continue;
}
}
@ -240,23 +239,20 @@ simulated native function GetPickupMesh(class<KFWeapon> ItemClass);
/** Use the pickups static mesh for this factory */
simulated function SetPickupMesh()
{
local KFGameInfo KFGI;
local KFGameReplicationInfo KFGRI;
if (PickupIndex >= ItemPickups.Length)
{
return;
}
KFGI = KFGameInfo(WorldInfo.Game);
KFGRI = KFGameReplicationInfo( WorldInfo.GRI );
if (KFGI != none && KFGI.OutbreakEvent != none)
if (KFGRI != none && KFGRI.IsGunGameMode())
{
if (KFGI.OutbreakEvent.ActiveEvent.bOnlyArmorItemPickup)
if (ItemPickups[PickupIndex].ItemClass.Name != ArmorClassName)
{
if (ItemPickups[PickupIndex].ItemClass.Name != ArmorClassName)
{
return;
}
return;
}
}
@ -367,17 +363,16 @@ function GiveWeapon( Pawn P )
function ActivateNewPickup(Pawn P)
{
local KFGameInfo KFGI;
local KFGameReplicationInfo KFGRI;
KFGI = KFGameInfo( WorldInfo.Game );
if (KFGI != none && KFGI.OutbreakEvent != none)
KFGRI = KFGameReplicationInfo( WorldInfo.GRI );
KFGI = KFGameInfo(WorldInfo.Game);
if (KFGRI != none && KFGRI.IsGunGameMode())
{
if (KFGI.OutbreakEvent.ActiveEvent.bOnlyArmorItemPickup)
if (ItemPickups[PickupIndex].ItemClass.Name != ArmorClassName)
{
if (ItemPickups[PickupIndex].ItemClass.Name != ArmorClassName)
{
return;
}
return;
}
}