update build tools

add WeapDef_G36C and WeapDef_Scythe

.gitignore

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

CTI/Classes/CTI.uc

@@ -253,10 +253,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)
@@ -304,8 +301,8 @@ public function bool DestroyRepInfo(Controller C)
 	{
 		if (RepInfo.Owner == C)
 		{
-			RepInfo.SafeDestroy();
 			RepInfos.RemoveItem(RepInfo);
+			RepInfo.SafeDestroy();
 			return true;
 		}
 	}

CTI/Classes/CTIMut.uc

@@ -42,16 +42,16 @@ public function AddMutator(Mutator 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

CTI/Classes/CTI_WeapDef_G36C.uc

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

CTI/Classes/CTI_WeapDef_Scythe.uc

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

CTI/Classes/Unlocker.uc

@@ -169,27 +169,29 @@ 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_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_ShrinkRayGun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ThermiteBore')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Zweihander')
 }

PublicationContent/description.txt

@@ -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.
 
@@ -57,19 +69,14 @@ example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
 [*]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]
+[url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]

builder.cfg

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