From b0727dd6779d6a670c2b3c609acd0de959f39f58 Mon Sep 17 00:00:00 2001
From: GenZmeY <genzmey@gmail.com>
Date: Sat, 21 May 2022 00:31:35 +0300
Subject: [PATCH] more sugar

---
 ZedSpawner/Classes/Spawn.uc                 | 21 +++++++++------------
 ZedSpawner/Classes/SpawnListBossWaves.uc    |  4 ++--
 ZedSpawner/Classes/SpawnListRegular.uc      |  2 +-
 ZedSpawner/Classes/SpawnListSpecialWaves.uc |  4 ++--
 ZedSpawner/Classes/ZedSpawner.uc            | 20 +++++++++-----------
 5 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/ZedSpawner/Classes/Spawn.uc b/ZedSpawner/Classes/Spawn.uc
index 3696a59..7d843aa 100644
--- a/ZedSpawner/Classes/Spawn.uc
+++ b/ZedSpawner/Classes/Spawn.uc
@@ -2,18 +2,15 @@ class Spawn extends Object
 	dependson(ZedSpawner)
 	config(ZedSpawner);
 
-var config bool  bCyclicalSpawn;
-var config bool  bShadowSpawn;
-
-var config float ZedTotalMultiplier;
-var config float SpawnTotalPlayerMultiplier;
-var config float SpawnTotalCycleMultiplier;
-
-var config float SingleSpawnLimitMultiplier;
-var config float SingleSpawnLimitPlayerMultiplier;
-var config float SingleSpawnLimitCycleMultiplier;
-
-var config int   AliveSpawnLimit;
+var public config bool  bCyclicalSpawn;
+var public config bool  bShadowSpawn;
+var public config float ZedTotalMultiplier;
+var public config float SpawnTotalPlayerMultiplier;
+var public config float SpawnTotalCycleMultiplier;
+var public config float SingleSpawnLimitMultiplier;
+var public config float SingleSpawnLimitPlayerMultiplier;
+var public config float SingleSpawnLimitCycleMultiplier;
+var public config int   AliveSpawnLimit;
 
 public static function InitConfig(int Version, int LatestVersion)
 {
diff --git a/ZedSpawner/Classes/SpawnListBossWaves.uc b/ZedSpawner/Classes/SpawnListBossWaves.uc
index e4412e1..3cfc901 100644
--- a/ZedSpawner/Classes/SpawnListBossWaves.uc
+++ b/ZedSpawner/Classes/SpawnListBossWaves.uc
@@ -13,8 +13,8 @@ struct S_SpawnEntryCfg
 	var bool    bSpawnAtPlayerStart;
 };
 
-var config bool bStopRegularSpawn;
-var config Array<S_SpawnEntryCfg> Spawn;
+var public  config bool bStopRegularSpawn;
+var private config Array<S_SpawnEntryCfg> Spawn;
 
 public static function InitConfig(int Version, int LatestVersion, KFGI_Access KFGIA)
 {
diff --git a/ZedSpawner/Classes/SpawnListRegular.uc b/ZedSpawner/Classes/SpawnListRegular.uc
index 982d13f..b3ce269 100644
--- a/ZedSpawner/Classes/SpawnListRegular.uc
+++ b/ZedSpawner/Classes/SpawnListRegular.uc
@@ -14,7 +14,7 @@ struct S_SpawnEntryCfg
 	var bool    bSpawnAtPlayerStart;
 };
 
-var config Array<S_SpawnEntryCfg> Spawn;
+var public config Array<S_SpawnEntryCfg> Spawn;
 
 public static function InitConfig(int Version, int LatestVersion, KFGI_Access KFGIA)
 {
diff --git a/ZedSpawner/Classes/SpawnListSpecialWaves.uc b/ZedSpawner/Classes/SpawnListSpecialWaves.uc
index 36e84ad..a6ee204 100644
--- a/ZedSpawner/Classes/SpawnListSpecialWaves.uc
+++ b/ZedSpawner/Classes/SpawnListSpecialWaves.uc
@@ -14,8 +14,8 @@ struct S_SpawnEntryCfg
 	var bool    bSpawnAtPlayerStart;
 };
 
-var config bool bStopRegularSpawn;
-var config Array<S_SpawnEntryCfg> Spawn;
+var public  config bool bStopRegularSpawn;
+var private config Array<S_SpawnEntryCfg> Spawn;
 
 public static function InitConfig(int Version, int LatestVersion)
 {
diff --git a/ZedSpawner/Classes/ZedSpawner.uc b/ZedSpawner/Classes/ZedSpawner.uc
index ad6dd3c..febf896 100644
--- a/ZedSpawner/Classes/ZedSpawner.uc
+++ b/ZedSpawner/Classes/ZedSpawner.uc
@@ -40,8 +40,8 @@ struct S_SpawnEntry
 	var bool  SpawnAtPlayerStart;
 };
 
-var config int        Version;
-var config E_LogLevel LogLevel;
+var private config int        Version;
+var private config E_LogLevel LogLevel;
 
 var private Array<S_SpawnEntry> SpawnListR;
 var private Array<S_SpawnEntry> SpawnListBW;
@@ -49,26 +49,24 @@ var private Array<S_SpawnEntry> SpawnListSW;
 
 var private KFGameInfo_Survival KFGIS;
 var private KFGameInfo_Endless  KFGIE;
-
-var private KFGI_Access KFGIA;
+var private KFGI_Access         KFGIA;
 
 var private int CurrentWave;
+var private int SpecialWave;
 var private int CurrentCycle;
 var private int CycleWaveShift;
 var private int CycleWaveSize;
-
 var private int WaveTotalAI;
-var private class<KFPawn_Monster> CurrentBossClass;
-var private int SpecialWave;
-
-var private String SpawnTimerLastMessage;
 
+var private class<KFPawn_Monster>         CurrentBossClass;
 var private Array<class<KFPawn_Monster> > BossClassCache;
 var private Array<class<KFPawn_Monster> > CustomZeds;
 
+var private String SpawnTimerLastMessage;
+
 delegate bool WaveCondition(S_SpawnEntry SE);
 
-event PreBeginPlay()
+public event PreBeginPlay()
 {
 	`ZS_Trace(`Location);
 	
@@ -82,7 +80,7 @@ event PreBeginPlay()
 	Super.PreBeginPlay();
 }
 
-event PostBeginPlay()
+public event PostBeginPlay()
 {
 	`ZS_Trace(`Location);