Skip to content

Commit

Permalink
more style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
GenZmeY committed May 14, 2023
1 parent bababdc commit 9c72778
Show file tree
Hide file tree
Showing 19 changed files with 98 additions and 98 deletions.
22 changes: 11 additions & 11 deletions ServerExt/Classes/ExtAutoPurchaseHelper.uc
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ function SellOffPerkWeapons()

function InitializeOwnedItemList()
{
local Inventory Inv;
local KFWeapon KFW;
local Inventory Inv;
local KFWeapon KFW;
local KFPawn_Human KFP;
local Ext_PerkBase EP;

Expand All @@ -142,14 +142,14 @@ function InitializeOwnedItemList()
// init armor purchase values
ArmorItem.SpareAmmoCount = KFP.Armor;
ArmorItem.MaxSpareAmmo = KFP.GetMaxArmor();
ArmorItem.AmmoPricePerMagazine = TraderItems.ArmorPrice * ActivePerkManager.GetArmorDiscountMod();
ArmorItem.DefaultItem.WeaponDef = TraderItems.ArmorDef;
ArmorItem.AmmoPricePerMagazine = TraderItems.ArmorPrice * ActivePerkManager.GetArmorDiscountMod();
ArmorItem.DefaultItem.WeaponDef = TraderItems.ArmorDef;

// init grenade purchase values
GrenadeItem.SpareAmmoCount = MyKFIM.GrenadeCount;
GrenadeItem.MaxSpareAmmo = ActivePerkManager.MaxGrenadeCount;
GrenadeItem.AmmoPricePerMagazine = TraderItems.GrenadePrice;
GrenadeItem.DefaultItem.WeaponDef = EP.GrenadeWeaponDef;
GrenadeItem.AmmoPricePerMagazine = TraderItems.GrenadePrice;
GrenadeItem.DefaultItem.WeaponDef = EP.GrenadeWeaponDef;

// @temp: fill in stuff that is normally serialized in the archetype
GrenadeItem.DefaultItem.AssociatedPerkClasses[0] = CurrentPerk.Class;
Expand All @@ -161,7 +161,7 @@ function InitializeOwnedItemList()
{
// Set the weapon information and add it to the OwnedItemList
SetWeaponInformation(KFW);
}
}
}

if (MyGfxManager != none && MyGfxManager.TraderMenu != none)
Expand Down Expand Up @@ -217,18 +217,18 @@ function int AddItemByPriority(out SItemInformation WeaponInfo)

// Add secondary ammo immediately after the main weapon
if (WeaponInfo.DefaultItem.WeaponDef.static.UsesSecondaryAmmo())
{
WeaponInfo.bIsSecondaryAmmo = true;
{
WeaponInfo.bIsSecondaryAmmo = true;
WeaponInfo.SellPrice = 0;
OwnedItemList.InsertItem(BestIndex + 1, WeaponInfo);
}
}

if (MyGfxManager != none && MyGfxManager.TraderMenu != none)
{
MyGfxManager.TraderMenu.OwnedItemList = OwnedItemList;
}

return BestIndex;
return BestIndex;
}

function bool CanCarry(const out STraderItem Item, optional int OverrideLevelValue = INDEX_NONE)
Expand Down
8 changes: 4 additions & 4 deletions ServerExt/Classes/ExtCharacterInfo.uc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static final function SetCharacterMeshFromArch(KFCharacterInfo_Human C, KFPawn K
if (KFPRI == none)
{
`Warn("Does not have a KFPRI" @ C);
return;
return;
}
EPRI = ExtPlayerReplicationInfo(KFPRI);
bCustom = (EPRI!=None ? EPRI.UsesCustomChar() : false);
Expand Down Expand Up @@ -341,7 +341,7 @@ static final function SetAttachmentMeshAndSkin(KFCharacterInfo_Human C,
// Since cosmetic attachments are optional, do not choose index 0 if none is
// specified unlike the the head and body meshes
if (C.CosmeticVariants.Length > 0 &&
CurrentAttachmentMeshIndex < C.CosmeticVariants.Length)
CurrentAttachmentMeshIndex < C.CosmeticVariants.Length)
{
if (KFPRI.StartLoadCosmeticContent(C, ECOSMETICTYPE_Attachment, CurrentAttachmentMeshIndex))
{
Expand Down Expand Up @@ -531,7 +531,7 @@ static final function DetachConflictingAttachments(KFCharacterInfo_Human C, int
return;

if (C.CosmeticVariants.length > 0 &&
NewAttachmentMeshIndex < C.CosmeticVariants.length)
NewAttachmentMeshIndex < C.CosmeticVariants.length)
{
// The socket that this attachment requires
NewAttachmentSocketName = C.CosmeticVariants[NewAttachmentMeshIndex].AttachmentItem.SocketName;
Expand Down Expand Up @@ -580,7 +580,7 @@ static final function SetFirstPersonArmsFromArch(KFCharacterInfo_Human C, KFPawn
if (KFPRI == none)
{
`Warn("Does not have a KFPRI" @ C);
return;
return;
}
EPRI = ExtPlayerReplicationInfo(KFPRI);
bCustom = (EPRI!=None ? EPRI.UsesCustomChar() : false);
Expand Down
2 changes: 1 addition & 1 deletion ServerExt/Classes/ExtPerkManager.uc
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ simulated function float GetPenetrationModifier(byte Level, class<KFDamageType>

simulated function float GetTightChokeModifier()
{
return (CurrentPerk!=None ? CurrentPerk.GetTightChokeModifier() : 1.f);
return (CurrentPerk!=None ? CurrentPerk.GetTightChokeModifier() : 1.f);
}

// SwitchSpeed
Expand Down
12 changes: 6 additions & 6 deletions ServerExt/Classes/ExtPerksContainer_Details.uc
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ final function ExUpdateDetails(Ext_PerkBase PerkClass)

DetailsProvider = CreateObject("Object");

KFPC = KFPlayerController(GetPC());
KFPC = KFPlayerController(GetPC());

if (KFPC != none)
{
KFGRI = KFGameReplicationInfo(KFPC.WorldInfo.GRI);

DetailsProvider.SetString("ExperienceMessage", ExperienceString @ PerkClass.CurrentEXP);

if (KFGRI != none)
Expand All @@ -31,12 +31,12 @@ final function ExUpdateDetails(Ext_PerkBase PerkClass)

for (i = 0; i < WeaponNames.length; i++)
{
DetailsProvider.SetString("WeaponName" $ i, WeaponNames[i]);
DetailsProvider.SetString("WeaponImage" $ i, "img://"$WeaponSources[i]);
DetailsProvider.SetString("WeaponName" $ i, WeaponNames[i]);
DetailsProvider.SetString("WeaponImage" $ i, "img://"$WeaponSources[i]);
}

DetailsProvider.SetString("EXPAction1", "Kill zombies");
//DetailsProvider.SetString("EXPAction2", PerkClass.default.EXPAction2);
//DetailsProvider.SetString("EXPAction2", PerkClass.default.EXPAction2);

SetObject("detailsData", DetailsProvider);
}
Expand All @@ -53,7 +53,7 @@ final function ExUpdatePassives(Ext_PerkBase PerkClass)
{
PassiveObject = CreateObject("Object");
PassiveObject.SetString("PassiveTitle", PerkClass.GetStatUIStr(i));
PassiveObject.SetString("PerkBonusModifier", "");
PassiveObject.SetString("PerkBonusModifier", "");
PassiveObject.SetString("PerkBonusAmount", "");
PassivesProvider.SetElementObject(i, PassiveObject);
}
Expand Down
4 changes: 2 additions & 2 deletions ServerExt/Classes/ExtPerksContainer_Selection.uc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var localized string PerkChangeWarning;

function UpdatePerkSelection(byte SelectedPerkIndex)
{
local int i;
local int i;
local GFxObject DataProvider;
local GFxObject TempObj;
local ExtPlayerController KFPC;
Expand All @@ -14,7 +14,7 @@ function UpdatePerkSelection(byte SelectedPerkIndex)

if (KFPC!=none && KFPC.ActivePerkManager!=None)
{
DataProvider = CreateArray();
DataProvider = CreateArray();

for (i = 0; i < KFPC.ActivePerkManager.UserPerks.Length; i++)
{
Expand Down
2 changes: 1 addition & 1 deletion ServerExt/Classes/ExtProj_SUPERGrenade.uc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ simulated function PostBeginPlay()
{
InstigatorPerk = InstigatorPawn.GetPerk();
if (InstigatorPerk != none)
bExplodeOnContact = InstigatorPerk.IsOnContactActive();
bExplodeOnContact = InstigatorPerk.IsOnContactActive();
}

Super.PostBeginPlay();
Expand Down
2 changes: 1 addition & 1 deletion ServerExt/Classes/ExtTraderContainer_Filter.uc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function SetPerkFilterData(byte FilterIndex)
SetString("filterText", OffPerkString);
}

DataProvider = CreateArray();
DataProvider = CreateArray();
for (i = 0; i < PrM.UserPerks.Length; i++)
{
FilterObject = CreateObject("Object");
Expand Down
8 changes: 4 additions & 4 deletions ServerExt/Classes/ExtTraderContainer_PlayerInfo.uc
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ function SetPerkInfo()
if (KFPC!=none && KFPC.ActivePerkManager!=None && KFPC.ActivePerkManager.CurrentPerk!=None)
{
CurrentPerk = KFPC.ActivePerkManager.CurrentPerk;
SetString("perkName", CurrentPerk.PerkName);
SetString("perkIconPath", CurrentPerk.GetPerkIconPath(CurrentPerk.CurrentLevel));
SetInt("perkLevel", CurrentPerk.CurrentLevel);
SetString("perkName", CurrentPerk.PerkName);
SetString("perkIconPath", CurrentPerk.GetPerkIconPath(CurrentPerk.CurrentLevel));
SetInt("perkLevel", CurrentPerk.CurrentLevel);
V = CurrentPerk.GetProgressPercent()*100.f;
SetInt("xpBarValue", int(V));
SetInt("xpBarValue", int(V));
}
}

Expand Down
2 changes: 1 addition & 1 deletion ServerExt/Classes/ExtTraderContainer_Store.uc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function bool IsItemFiltered(STraderItem Item, optional bool bDebug)
if ( Item.WeaponDef.default.PlatformRestriction != PR_All && class'KFUnlockManager'.static.IsPlatformRestricted( Item.WeaponDef.default.PlatformRestriction ) )
return true;

return false;
return false;
}

function RefreshWeaponListByPerk(byte FilterIndex, const out array<STraderItem> ItemList)
Expand Down
Loading

0 comments on commit 9c72778

Please sign in to comment.