34 Commits

Author SHA1 Message Date
3580be6ea7 Merge pull request #9 from GenZmeY/group-names
add mutator group name
2023-06-29 22:35:17 +03:00
09561e64cc Merge pull request #6 from GenZmeY/v1140
Add S12 unlock (update 1140)
2023-06-29 22:34:58 +03:00
69162ab37b Merge pull request #8 from GenZmeY/waiting-gri-limit
add waiting GRI limit
2023-06-29 22:34:35 +03:00
f2bd4d165c add mutator group name 2023-06-03 16:58:39 +03:00
94cf543d41 update .editorconfig 2023-05-14 12:18:35 +03:00
45d327fc81 add waiting GRI limit 2023-05-14 02:20:31 +03:00
6f06033e3c add S12 unlock 2023-05-13 03:01:06 +03:00
0cbd5deb47 Merge pull request #5 from GenZmeY/MegaLinter
Mega linter
2023-05-13 02:41:46 +03:00
d6a64d6932 remove trailing whitespace 2023-05-13 02:38:10 +03:00
406c785cf1 Update README.md 2023-05-13 02:35:43 +03:00
f99b8cdb39 update style 2023-05-13 02:33:32 +03:00
227c5f470f add MegaLinter 2023-05-13 02:23:26 +03:00
d6db549eaa add .editorconfig 2023-05-13 02:22:17 +03:00
cc6482a9ed update build tools to v1.9.2-1-gfb458ac 2023-05-13 02:20:43 +03:00
334fe3e9ba fix UploadTool: Error parsing $Title 2022-12-07 23:36:03 +03:00
94a4368842 Merge pull request #3 from GenZmeY/v1136
Update v1136 (unlock new DLC weapons)
2022-12-07 23:28:50 +03:00
22862616c0 Merge pull request #2 from GenZmeY/RemoveMore
DLC and HRG remove
2022-12-07 23:28:36 +03:00
6c3d9f094e unlock new DLC weapons 2022-11-28 01:00:44 +03:00
8c3ed68acb add remove DLC and HRG 2022-11-27 03:37:26 +03:00
89c7eccb6f update build tools 2022-10-13 22:42:09 +03:00
f7d86b4492 Merge pull request #1 from GenZmeY/v1133
add WeapDef_G36C and WeapDef_Scythe
2022-10-13 22:38:13 +03:00
c25366d207 update description 2022-10-01 20:49:22 +03:00
f9b70d8066 update description 2022-10-01 20:47:38 +03:00
95871b2f89 update description 2022-10-01 20:30:34 +03:00
11768dfbc2 update description 2022-10-01 20:24:18 +03:00
cc55913e5a update description 2022-10-01 20:21:12 +03:00
a87f5bf697 update build tools 2022-09-13 04:36:39 +03:00
eb33a6e1ff add WeapDef_G36C and WeapDef_Scythe 2022-09-12 23:38:09 +03:00
25e9d96b44 update build tools 2022-09-02 16:22:18 +03:00
2d2975b7ed Merge branch 'master' of https://github.com/GenZmeY/KF2-CustomTraderInventory 2022-09-02 15:30:27 +03:00
247eef02aa update build tools 2022-09-02 15:29:52 +03:00
a00d80918f Update description.txt 2022-09-02 11:48:27 +03:00
5e4086c861 fix false "error": "Cant destroy RepInfo" 2022-08-30 09:55:09 +03:00
f92bea7114 fix notify login/logout order 2022-08-30 08:26:40 +03:00
56 changed files with 1783 additions and 1566 deletions

33
.editorconfig Normal file
View File

@ -0,0 +1,33 @@
root = true
# Global
[*]
indent_style = unset
indent_size = 4
tab_width = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = unset
# Unreal Engine 3 / Source
[*.uc]
indent_style = tab
[*.{uci,upkg}]
# Unreal Engine 3 / i18n
[*.{chn,cht,cze,dan,deu,dut,esl,esn,fra,frc,hun,int,ita,jpn,kor,pol,por,ptb,rus,tur,ukr}]
charset = utf-16le
# Other
[*.md]
indent_style = space
trim_trailing_whitespace = false
[*.yml]
indent_style = space
indent_size = 2
[*.{txt,cfg,conf}]
indent_style = tab

72
.github/workflows/mega-linter.yml vendored Normal file
View File

@ -0,0 +1,72 @@
---
name: MegaLinter
permissions: read-all
on:
push:
pull_request:
branches: [master]
env:
APPLY_FIXES: none
APPLY_FIXES_EVENT: pull_request
APPLY_FIXES_MODE: commit
DISABLE: SPELL
concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true
jobs:
build:
name: MegaLinter
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
with:
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
- name: MegaLinter
id: ml
uses: oxsecurity/megalinter@v6
env:
VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Archive production artifacts
if: ${{ success() }} || ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: MegaLinter reports
path: |
megalinter-reports
mega-linter.log
- name: Create Pull Request with applied fixes
id: cpr
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
commit-message: "[MegaLinter] Apply linters automatic fixes"
title: "[MegaLinter] Apply linters automatic fixes"
labels: bot
- name: Create PR output
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
run: |
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
- name: Prepare commit
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
run: sudo chown -Rc $UID .git/
- name: Commit and push applied linter fixes
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
uses: stefanzweifel/git-auto-commit-action@v4
with:
branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
commit_message: "[MegaLinter] Apply linters fixes"
commit_user_name: megalinter-bot
commit_user_email: nicolas.vuillamy@ox.security

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*.psd
/ignore

View File

@ -1,7 +1,7 @@
class CTI extends Info
config(CTI);
const LatestVersion = 2;
const LatestVersion = 3;
const CfgRemoveItems = class'RemoveItems';
const CfgAddItems = class'AddItems';
@ -94,6 +94,8 @@ private function PreInit()
case 1:
bOfficialWeaponsList = false;
case 2:
case MaxInt:
`Log_Info("Config updated to version" @ LatestVersion);
break;
@ -180,7 +182,14 @@ private function PostInit()
Preload(AddItems);
}
Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, CfgRemoveItems.default.bAll, LogLevel);
Trader.static.ModifyTrader(
KFGRI,
RemoveItems,
AddItems,
CfgRemoveItems.default.bAll,
CfgRemoveItems.default.bHRG,
CfgRemoveItems.default.bDLC,
LogLevel);
ReadyToSync = true;
@ -253,10 +262,7 @@ public function NotifyLogout(Controller C)
{
`Log_Trace();
if (!DestroyRepInfo(C))
{
`Log_Error("Can't destroy RepInfo of:" @ C);
}
DestroyRepInfo(C);
}
public function bool CreateRepInfo(Controller C)
@ -276,7 +282,9 @@ public function bool CreateRepInfo(Controller C)
LogLevel,
RemoveItems,
AddItems,
CfgRemoveItems.default.bAll);
CfgRemoveItems.default.bAll,
CfgRemoveItems.default.bHRG,
CfgRemoveItems.default.bDLC);
RepInfos.AddItem(RepInfo);
@ -304,8 +312,8 @@ public function bool DestroyRepInfo(Controller C)
{
if (RepInfo.Owner == C)
{
RepInfo.SafeDestroy();
RepInfos.RemoveItem(RepInfo);
RepInfo.SafeDestroy();
return true;
}
}

View File

@ -35,26 +35,26 @@ public function AddMutator(Mutator Mut)
if (Mut == Self) return;
if (Mut.Class == Class)
Mut.Destroy();
CTIMut(Mut).SafeDestroy();
else
Super.AddMutator(Mut);
}
public function NotifyLogin(Controller C)
{
Super.NotifyLogin(C);
CTI.NotifyLogin(C);
Super.NotifyLogin(C);
}
public function NotifyLogout(Controller C)
{
Super.NotifyLogout(C);
CTI.NotifyLogout(C);
Super.NotifyLogout(C);
}
DefaultProperties
{
GroupNames.Add("TraderItems")
}

View File

@ -4,17 +4,14 @@ class CTI_LocalMessage extends Object
var const String SyncItemsDefault;
var private localized String SyncItems;
var const String SyncFinishedDefault;
var private localized String SyncFinished;
var const String WaitingGRIDefault;
var private localized String WaitingGRI;
var const String IncompatibleGRIDefault;
var private localized String IncompatibleGRI;
var const String DisconnectDefault;
var private localized String Disconnect;
var const String IncompatibleGRIWarningDefault;
var private localized String IncompatibleGRIWarning;
var const String SecondsShortDefault;
var private localized String SecondsShort;
@ -22,10 +19,9 @@ var private localized String SecondsShort;
enum E_CTI_LocalMessageType
{
CTI_SyncItems,
CTI_SyncFinished,
CTI_WaitingGRI,
CTI_IncompatibleGRI,
CTI_Disconnect,
CTI_IncompatibleGRIWarning,
CTI_SecondsShort
};
@ -43,17 +39,14 @@ public static function String GetLocalizedString(
case CTI_SyncItems:
return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
case CTI_SyncFinished:
return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
case CTI_WaitingGRI:
return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
case CTI_IncompatibleGRI:
return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault) @ String1;
case CTI_Disconnect:
return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
case CTI_IncompatibleGRIWarning:
return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
case CTI_SecondsShort:
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
@ -65,9 +58,8 @@ public static function String GetLocalizedString(
defaultproperties
{
SyncItemsDefault = "Sync items:"
SyncFinishedDefault = "Sync finished."
WaitingGRIDefault = "Waiting GRI..."
IncompatibleGRIDefault = "Incompatible GRI:"
DisconnectDefault = "Disconnect..."
IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
SecondsShortDefault = "s"
}

View File

@ -10,6 +10,8 @@ var private E_LogLevel LogLevel;
var private Array<class<KFWeaponDefinition> > RemoveItems;
var private Array<class<KFWeaponDefinition> > AddItems;
var private bool ReplaceMode;
var private bool RemoveHRG;
var private bool RemoveDLC;
var private bool PreloadContent;
var private int Recieved;
@ -25,11 +27,12 @@ var private String NotificationRightText;
var private int NotificationPercent;
var private int WaitingGRI;
var private int WaitingGRILimit;
replication
{
if (bNetInitial && Role == ROLE_Authority)
LogLevel, ReplaceMode, SyncSize;
LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
}
public simulated function bool SafeDestroy()
@ -44,7 +47,9 @@ public function PrepareSync(
E_LogLevel _LogLevel,
Array<class<KFWeaponDefinition> > _RemoveItems,
Array<class<KFWeaponDefinition> > _AddItems,
bool _ReplaceMode)
bool _ReplaceMode,
bool _RemoveHRG,
bool _RemoveDLC)
{
`Log_Trace();
@ -53,6 +58,8 @@ public function PrepareSync(
RemoveItems = _RemoveItems;
AddItems = _AddItems;
ReplaceMode = _ReplaceMode;
RemoveHRG = _RemoveHRG;
RemoveDLC = _RemoveDLC;
SyncSize = RemoveItems.Length + AddItems.Length;
}
@ -72,6 +79,39 @@ private simulated function KFPlayerController GetKFPC()
return KFPC;
}
public reliable client function WriteToChatLocalized(
E_CTI_LocalMessageType LMT,
optional String HexColor,
optional String String1,
optional String String2,
optional String String3)
{
`Log_Trace();
WriteToChat(LocalMessage.static.GetLocalizedString(LogLevel, LMT, String1, String2, String3), HexColor);
}
public reliable client function WriteToChat(String Message, optional String HexColor)
{
local KFGFxHudWrapper HUD;
`Log_Trace();
if (GetKFPC() == None) return;
if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
{
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true);
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
}
HUD = KFGFxHudWrapper(KFPC.myHUD);
if (HUD != None && HUD.HUDMovie != None && HUD.HUDMovie.HudChatBox != None)
{
HUD.HUDMovie.HudChatBox.AddChatMessage(Message, HexColor);
}
}
private simulated function SetPartyInGameWidget()
{
`Log_Trace();
@ -194,47 +234,44 @@ private simulated reliable client function ClientSyncFinished()
`Log_Trace();
NotificationLeftText = "";
if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
{
`Log_Debug("ClientSyncFinished: Waiting GRI" @ WaitingGRI);
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
NotificationLeftText = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
NotificationRightText = "";
NotificationPercent = 0;
if (WorldInfo.GRI == None)
{
`Log_Debug("ClientSyncFinished: Waiting GRI");
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
NotificationLeftText = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
NotificationRightText = "";
SetTimer(1.0f, false, nameof(ClientSyncFinished));
return;
}
KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
if (KFGRI == None)
{
`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
ClearTimer(nameof(KeepNotification));
UpdateNotification(
LocalMessage.static.GetLocalizedString(LogLevel, CTI_IncompatibleGRI) @ String(WorldInfo.GRI),
LocalMessage.static.GetLocalizedString(LogLevel, CTI_Disconnect), "", 0);
Cleanup();
ConsoleCommand("Disconnect");
SafeDestroy();
return;
}
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncFinished);
NotificationHeaderText = "";
NotificationLeftText = "";
NotificationRightText = "";
NotificationPercent = 0;
Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, LogLevel);
KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
if (KFGRI != None)
{
`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
}
else
{
`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
WriteToChatLocalized(
CTI_IncompatibleGRI,
class'KFLocalMessage'.default.InteractionColor,
WorldInfo.GRI == None ? "None" : String(WorldInfo.GRI.class));
WriteToChatLocalized(
CTI_IncompatibleGRIWarning,
class'KFLocalMessage'.default.InteractionColor);
}
ClearTimer(nameof(KeepNotification));
ShowReadyButton();
Cleanup();
SafeDestroy();
}
@ -289,4 +326,5 @@ defaultproperties
NotificationPercent = 0
WaitingGRI = 0
WaitingGRILimit = 15
}

View File

@ -0,0 +1,7 @@
class CTI_WeapDef_G36C extends KFWeapDef_G36C
abstract;
defaultproperties
{
SharedUnlockId = SCU_None
}

View File

@ -0,0 +1,7 @@
class CTI_WeapDef_HVStormCannon extends KFWeapDef_HVStormCannon
abstract;
defaultproperties
{
SharedUnlockId = SCU_None
}

View File

@ -0,0 +1,7 @@
class CTI_WeapDef_Scythe extends KFWeapDef_Scythe
abstract;
defaultproperties
{
SharedUnlockId = SCU_None
}

View File

@ -0,0 +1,7 @@
class CTI_WeapDef_Shotgun_S12 extends KFWeapDef_Shotgun_S12
abstract;
defaultproperties
{
SharedUnlockId = SCU_None
}

View File

@ -0,0 +1,7 @@
class CTI_WeapDef_ZedMKIII extends KFWeapDef_ZedMKIII
abstract;
defaultproperties
{
SharedUnlockId = SCU_None
}

View File

@ -3,6 +3,8 @@ class RemoveItems extends Object
config(CTI);
var public config bool bAll;
var public config bool bHRG;
var public config bool bDLC;
var private config Array<String> Item;
public static function InitConfig(int Version, int LatestVersion)
@ -12,6 +14,10 @@ public static function InitConfig(int Version, int LatestVersion)
case `NO_CONFIG:
ApplyDefault();
case 2:
default.bHRG = false;
default.bDLC = false;
default: break;
}
@ -24,6 +30,8 @@ public static function InitConfig(int Version, int LatestVersion)
private static function ApplyDefault()
{
default.bAll = false;
default.bHRG = false;
default.bDLC = false;
default.Item.Length = 0;
default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
}
@ -43,6 +51,15 @@ public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLeve
}
else
{
if (default.bHRG)
{
`Log_Info("Remove all HRG items");
}
if (default.bDLC)
{
`Log_Info("Remove all DLC items");
}
foreach default.Item(ItemRaw, Line)
{
ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));

View File

@ -91,6 +91,8 @@ public static simulated function ModifyTrader(
Array<class<KFWeaponDefinition> > RemoveItems,
Array<class<KFWeaponDefinition> > AddItems,
bool ReplaceMode,
bool RemoveHRG,
bool RemoveDLC,
E_LogLevel LogLevel)
{
local KFGFxObject_TraderItems TraderItems;
@ -110,6 +112,8 @@ public static simulated function ModifyTrader(
{
if (Item.WeaponDef != None
&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
&& (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
&& (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None))
&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
{
WeapDefs.AddItem(Item.WeaponDef);

View File

@ -169,27 +169,32 @@ private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
defaultproperties
{
WeapDefDLCReplacements(0) = class'CTI_WeapDef_AutoTurret'
WeapDefDLCReplacements(1) = class'CTI_WeapDef_BladedPistol'
WeapDefDLCReplacements(2) = class'CTI_WeapDef_Blunderbuss'
WeapDefDLCReplacements(3) = class'CTI_WeapDef_ChainBat'
WeapDefDLCReplacements(4) = class'CTI_WeapDef_ChiappaRhino'
WeapDefDLCReplacements(5) = class'CTI_WeapDef_ChiappaRhinoDual'
WeapDefDLCReplacements(6) = class'CTI_WeapDef_CompoundBow'
WeapDefDLCReplacements(7) = class'CTI_WeapDef_Doshinegun'
WeapDefDLCReplacements(8) = class'CTI_WeapDef_DualBladed'
WeapDefDLCReplacements(9) = class'CTI_WeapDef_FAMAS'
WeapDefDLCReplacements(10) = class'CTI_WeapDef_G18'
WeapDefDLCReplacements(11) = class'CTI_WeapDef_GravityImploder'
WeapDefDLCReplacements(12) = class'CTI_WeapDef_IonThruster'
WeapDefDLCReplacements(13) = class'CTI_WeapDef_Mine_Reconstructor'
WeapDefDLCReplacements(14) = class'CTI_WeapDef_Minigun'
WeapDefDLCReplacements(15) = class'CTI_WeapDef_MosinNagant'
WeapDefDLCReplacements(16) = class'CTI_WeapDef_ParasiteImplanter'
WeapDefDLCReplacements(17) = class'CTI_WeapDef_Pistol_DualG18'
WeapDefDLCReplacements(18) = class'CTI_WeapDef_Pistol_G18C'
WeapDefDLCReplacements(19) = class'CTI_WeapDef_Rifle_FrostShotgunAxe'
WeapDefDLCReplacements(20) = class'CTI_WeapDef_ShrinkRayGun'
WeapDefDLCReplacements(21) = class'CTI_WeapDef_ThermiteBore'
WeapDefDLCReplacements(22) = class'CTI_WeapDef_Zweihander'
WeapDefDLCReplacements.Add(class'CTI_WeapDef_AutoTurret')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_BladedPistol')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Blunderbuss')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChainBat')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhino')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhinoDual')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_CompoundBow')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Doshinegun')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_DualBladed')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_FAMAS')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_G18')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_G36C')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_GravityImploder')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_HVStormCannon')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_IonThruster')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Mine_Reconstructor')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Minigun')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_MosinNagant')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ParasiteImplanter')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_DualG18')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_G18C')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Rifle_FrostShotgunAxe')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Scythe')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Shotgun_S12')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ShrinkRayGun')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ThermiteBore')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ZedMKIII')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Zweihander')
}

Binary file not shown.

Binary file not shown.

View File

@ -16,7 +16,7 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
[olist]
[*]Subscribe to this mutator;
[*]Start KF2;
[*]Open console (`) and input:
[*]Open console (~) and input:
[b]open KF-BioticsLab?Mutator=CTI.CTIMut[/b]
(replace the map and add the parameters you need)
[*]<Enter>.
@ -34,8 +34,20 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
[*]Add mutator to server start parameters: [b]?Mutator=CTI.CTIMut[/b] and restart the server.
[/olist]
[h1]Important setup information[/h1]
The config should be created on first start, but now the game contains a bug that initializes the config values randomly if they are not explicitly set. Thus, the config may have incorrect values or not be created at all.
So if you are using this mutator for the first time, I highly recommend doing the following:
[olist]
[*]Create (modify) [b]KFCTI.ini[/b] manually. Put the following content there:
[b][CTI.CTI]
Version=0[/b]
[*]Start the game/server with CTI to generate the contents of the config.
[*]Close the game/server.
[/olist]
[b]Right now this is the only way to correctly create the default config.[/b]
Unfortunately I can't do anything about it because it's a game problem (not mutator). I hope TWI fixes this someday.
[h1]Setup (KFCTI.ini)[/h1]
Config will be created at the first start[b]*[/b].
[list]
[*]Set [b]bPreloadContent=True[/b] to load weapon models in advance and have no lags during the game.
@ -53,23 +65,20 @@ Config will be created at the first start[b]*[/b].
example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
[*]Set [b]bAll=True[/b] if you want to remove all items (can be useful if you want to set the entire sale list in the [b][CTI.AddItems][/b] section yourself).
[*]Set [b]bHRG=True[/b] to remove HRG items.
[*]Set [b]bDLC=True[/b] to remove DLC items.
[*]Use [b][CTI.AddItems][/b] to add items to the trader inventory.
example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
[/list]
[h1]🔗 [url=https://steamcommunity.com/workshop/filedetails/discussion/2830826239/3409804177172972154]Weapon Packs Items[/url][/h1]
❗️ Note that if you need an empty list anywhere (for example, you don't want to delete some of the traders's weapons), leave at least one line there:
[b]Item=[/b]
This is necessary to explicitly initialize the list (because of the bug I wrote about above) to avoid initialization with random values.
[h1]Notes[/h1]
📌 Mutator does not contain custom weapons. You must have the required weapon packs in your subscriptions to be able to add them to the trader.
📌 If you are using this mutator to add weapons, you should [b]not[/b] use mutators from weapon packs (just having them in subscriptions is enough).
[h1]Troubleshooting[/h1]
[b](*)[/b] If your config is not created for some reason, create it manually with the following content:
[b][CTI.CTI]
Version=0
[/b]
Then start the server and check the file again - config content should be generated.
[h1]Sources[/h1]
[url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]

View File

@ -3,24 +3,24 @@
[![Steam Workshop](https://img.shields.io/static/v1?message=workshop&logo=steam&labelColor=gray&color=blue&logoColor=white&label=steam%20)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
[![Steam Downloads](https://img.shields.io/steam/downloads/2830826239)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
[![Steam Favorites](https://img.shields.io/steam/favorites/2830826239)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
[![Steam Update Date](https://img.shields.io/steam/update-date/2830826239)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
[![MegaLinter](https://github.com/GenZmeY/KF2-CustomTraderInventory/actions/workflows/mega-linter.yml/badge.svg?branch=master)](https://github.com/GenZmeY/KF2-CustomTraderInventory/actions/workflows/mega-linter.yml)
[![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-CustomTraderInventory)](https://github.com/GenZmeY/KF2-CustomTraderInventory/tags)
[![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-CustomTraderInventory)](LICENSE)
# Description
## Description
Add/Remove Items in the Trader's Inventory
# Features
## Features
- remove/add items to trader;
- can preload weapon models (no lags when buying weapons);
- unlock DLC weapons;
- correct items sorting (by price);
- don't have to worry about adding new guns after each Tripware update.
# Usage & Setup
## Usage & Setup
[See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
# Build
## Build
**Note:** If you want to build/test/brew/publish a mutator without git-bash and/or scripts, follow [these instructions](https://tripwireinteractive.atlassian.net/wiki/spaces/KF2SW/pages/26247172/KF2+Code+Modding+How-to) instead of what is described here.
1. Install [Killing Floor 2](https://store.steampowered.com/app/232090/Killing_Floor_2/), Killing Floor 2 - SDK and [git for windows](https://git-scm.com/download/win);
2. open git-bash and go to any folder where you want to store sources:
@ -34,16 +34,9 @@ Add/Remove Items in the Trader's Inventory
5. The compiled files will be here:
`C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`
# Testing
Open git-bash in the source folder and run command:
`./tools/builder -t`
(or `./tools/builder -ct` if you haven't compiled the mutator yet)
A local single-user test will be launched with parameters from `builder.cfg` (edit this file if you want to test mutator with different parameters).
# Bug reports
## Bug reports
If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-CustomTraderInventory/issues) and check if there is a description of your bug. If not, create a new issue.
Describe what the bug looks like and how reproduce it.
# License
[GNU GPLv3](LICENSE)
## License
[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)

View File

@ -11,6 +11,15 @@ StripSource="True"
PackageBuildOrder="CTI"
### Brew parameters ###
# Packages you want to brew using @peelz's patched KFEditor.
# Useful for cases where regular brew doesn't put *.upk inside the package.
# Specify them with a space as a separator,
# The order doesn't matter
PackagePeelzBrew=""
### Steam Workshop upload parameters ###
# Mutators that will be uploaded to the workshop
@ -30,7 +39,7 @@ Map="KF-Nuked"
# Endless: KFGameContent.KFGameInfo_Endless
# Objective: KFGameContent.KFGameInfo_Objective
# Versus: KFGameContent.KFGameInfo_VersusSurvival
Game="KFGameContent.KFGameInfo_Endless"
Game="KFGameContent.KFGameInfo_Survival"
# Difficulty:
# Normal: 0

2
tools

Submodule tools updated: 2f173aad7a...fb458ac61f