diff --git a/src/main/java/swg/entity/SwgConfiguration.java b/src/main/java/swg/entity/SwgConfiguration.java index abe2417..b1f0fcc 100644 --- a/src/main/java/swg/entity/SwgConfiguration.java +++ b/src/main/java/swg/entity/SwgConfiguration.java @@ -1007,9 +1007,11 @@ public class SwgConfiguration { private int pvpGuildWarCoolDownPeriodTimeMs; private boolean reportAiWarnings; private int resourceTimeScale; + private RareLoot rls; private int secondsPerResourceTick; private boolean sendBreadcrumbs; private boolean shipsEnabled; + private SpaceGcw spaceGcw; private boolean spawnAllResources; private int unclaimedAuctionItemDestroyTimeSec; private int debugMode; @@ -1141,9 +1143,11 @@ public class SwgConfiguration { output += "\npvpGuildWarCoolDownPeriodTimeMs=" + pvpGuildWarCoolDownPeriodTimeMs; output += "\nreportAiWarnings=" + reportAiWarnings; output += "\nresourceTimeScale=" + resourceTimeScale; + output += rls.toString(); output += "\nsecondsPerResourceTick=" + secondsPerResourceTick; output += "\nsendBreadcrumbs=" + sendBreadcrumbs; output += "\nshipsEnabled=" + shipsEnabled; + output += spaceGcw.toString(); output += "\nspawnAllResources=" + spawnAllResources; output += "\ndebugMode=" + debugMode; output += "\nserverLoadLevel=" + serverLoadLevel; @@ -1202,6 +1206,440 @@ public class SwgConfiguration { return output + "\n\n"; } + public static class SpaceGcw { + private float spaceGcwLengthOfBattle; + private float spaceGcwPrepatoryTime; + private int spaceGcwMaxSupportShips; + private int spaceGcwTotalSupportSpawn; + private boolean spaceGcwTatooineActive; + private boolean spaceGcwCorelliaActive; + private boolean spaceGcwDantooineActive; + private boolean spaceGcwLokActive; + private boolean spaceGcwNabooActive; + private int spaceGcwTatooineDelay; + private int spaceGcwCorelliaDelay; + private int spaceGcwDantooineDelay; + private int spaceGcwLokDelay; + private int spaceGcwNabooDelay; + private int spaceGcwTatooineStagger; + private int spaceGcwCorelliaStagger; + private int spaceGcwDantooineStagger; + private int spaceGcwLokStagger; + private int spaceGcwNabooStagger; + private int spaceGcwPobPlayerCeiling; + private int spaceGcwGunshipPlayerCeiling; + private int spaceGcwTokenAward; + private float spaceGcwPvETokenModifier; + private float spaceGcwPvPTokenModifier; + private float spaceGcwLossTokenModifier; + private float spaceGcwWinTokenModifier; + private int spaceGcwPointAward; + private float spaceGcwPvEPointModifier; + private float spaceGcwPvPPointModifier; + private float spaceGcwLossPointModifier; + private float spaceGcwWinPointModifier; + + SpaceGcw() {} + + public String toString() { + String output = "\nspaceGcwLengthOfBattle=" + spaceGcwLengthOfBattle; + output += "\nspaceGcwPrepatoryTime=" + spaceGcwPrepatoryTime; + output += "\nspaceGcwMaxSupportShips=" + spaceGcwMaxSupportShips; + output += "\nspaceGcwTotalSupportSpawn=" + spaceGcwTotalSupportSpawn; + output += "\nspaceGcwTatooineActive=" + spaceGcwTatooineActive; + output += "\nspaceGcwCorelliaActive=" + spaceGcwCorelliaActive; + output += "\nspaceGcwDantooineActive=" + spaceGcwDantooineActive; + output += "\nspaceGcwLokActive=" + spaceGcwLokActive; + output += "\nspaceGcwNabooActive=" + spaceGcwNabooActive; + output += "\nspaceGcwTatooineDelay=" + spaceGcwTatooineDelay; + output += "\nspaceGcwCorelliaDelay=" + spaceGcwCorelliaDelay; + output += "\nspaceGcwDantooineDelay=" + spaceGcwDantooineDelay; + output += "\nspaceGcwLokDelay=" + spaceGcwLokDelay; + output += "\nspaceGcwNabooDelay=" + spaceGcwNabooDelay; + output += "\nspaceGcwTatooineStagger=" + spaceGcwTatooineStagger; + output += "\nspaceGcwCorelliaStagger=" + spaceGcwCorelliaStagger; + output += "\nspaceGcwDantooineStagger=" + spaceGcwDantooineStagger; + output += "\nspaceGcwLokStagger=" + spaceGcwLokStagger; + output += "\nspaceGcwNabooStagger=" + spaceGcwNabooStagger; + output += "\nspaceGcwPobPlayerCeiling=" + spaceGcwPobPlayerCeiling; + output += "\nspaceGcwGunshipPlayerCeiling=" + spaceGcwGunshipPlayerCeiling; + output += "\nspaceGcwTokenAward=" + spaceGcwTokenAward; + output += "\nspaceGcwLossTokenModifier=" + spaceGcwLossTokenModifier; + output += "\nspaceGcwWinTokenModifier=" + spaceGcwWinTokenModifier; + output += "\nspaceGcwPointAward=" + spaceGcwPointAward; + output += "\nspaceGcwPvETokenModifier=" + spaceGcwPvETokenModifier; + output += "\nspaceGcwPvPTokenModifier=" + spaceGcwPvPTokenModifier; + output += "\nspaceGcwPvEPointModifier=" + spaceGcwPvEPointModifier; + output += "\nspaceGcwPvPPointModifier=" + spaceGcwPvPPointModifier; + output += "\nspaceGcwLossPointModifier=" + spaceGcwLossPointModifier; + output += "\nspaceGcwWinPointModifier=" + spaceGcwWinPointModifier; + return output; + } + + public float getSpaceGcwPvETokenModifier() { + return spaceGcwPvETokenModifier; + } + + public void setSpaceGcwPvETokenModifier(float spaceGcwPvETokenModifier) { + this.spaceGcwPvETokenModifier = spaceGcwPvETokenModifier; + } + + public float getSpaceGcwPvPTokenModifier() { + return spaceGcwPvPTokenModifier; + } + + public void setSpaceGcwPvPTokenModifier(float spaceGcwPvPTokenModifier) { + this.spaceGcwPvPTokenModifier = spaceGcwPvPTokenModifier; + } + + public float getSpaceGcwLengthOfBattle() { + return spaceGcwLengthOfBattle; + } + + public void setSpaceGcwLengthOfBattle(float spaceGcwLengthOfBattle) { + this.spaceGcwLengthOfBattle = spaceGcwLengthOfBattle; + } + + public float getSpaceGcwPrepatoryTime() { + return spaceGcwPrepatoryTime; + } + + public void setSpaceGcwPrepatoryTime(float spaceGcwPrepatoryTime) { + this.spaceGcwPrepatoryTime = spaceGcwPrepatoryTime; + } + + public int getSpaceGcwMaxSupportShips() { + return spaceGcwMaxSupportShips; + } + + public void setSpaceGcwMaxSupportShips(int spaceGcwMaxSupportShips) { + this.spaceGcwMaxSupportShips = spaceGcwMaxSupportShips; + } + + public int getSpaceGcwTotalSupportSpawn() { + return spaceGcwTotalSupportSpawn; + } + + public void setSpaceGcwTotalSupportSpawn(int spaceGcwTotalSupportSpawn) { + this.spaceGcwTotalSupportSpawn = spaceGcwTotalSupportSpawn; + } + + public boolean isSpaceGcwTatooineActive() { + return spaceGcwTatooineActive; + } + + public void setSpaceGcwTatooineActive(boolean spaceGcwTatooineActive) { + this.spaceGcwTatooineActive = spaceGcwTatooineActive; + } + + public boolean isSpaceGcwCorelliaActive() { + return spaceGcwCorelliaActive; + } + + public void setSpaceGcwCorelliaActive(boolean spaceGcwCorelliaActive) { + this.spaceGcwCorelliaActive = spaceGcwCorelliaActive; + } + + public boolean isSpaceGcwDantooineActive() { + return spaceGcwDantooineActive; + } + + public void setSpaceGcwDantooineActive(boolean spaceGcwDantooineActive) { + this.spaceGcwDantooineActive = spaceGcwDantooineActive; + } + + public boolean isSpaceGcwLokActive() { + return spaceGcwLokActive; + } + + public void setSpaceGcwLokActive(boolean spaceGcwLocActive) { + this.spaceGcwLokActive = spaceGcwLocActive; + } + + public boolean isSpaceGcwNabooActive() { + return spaceGcwNabooActive; + } + + public void setSpaceGcwNabooActive(boolean spaceGcwNabooActive) { + this.spaceGcwNabooActive = spaceGcwNabooActive; + } + + public int getSpaceGcwTatooineDelay() { + return spaceGcwTatooineDelay; + } + + public void setSpaceGcwTatooineDelay(int spaceGcwTatooineDelay) { + this.spaceGcwTatooineDelay = spaceGcwTatooineDelay; + } + + public int getSpaceGcwCorelliaDelay() { + return spaceGcwCorelliaDelay; + } + + public void setSpaceGcwCorelliaDelay(int spaceGcwCorelliaDelay) { + this.spaceGcwCorelliaDelay = spaceGcwCorelliaDelay; + } + + public int getSpaceGcwDantooineDelay() { + return spaceGcwDantooineDelay; + } + + public void setSpaceGcwDantooineDelay(int spaceGcwDantooineDelay) { + this.spaceGcwDantooineDelay = spaceGcwDantooineDelay; + } + + public int getSpaceGcwLokDelay() { + return spaceGcwLokDelay; + } + + public void setSpaceGcwLokDelay(int spaceGcwLokDelay) { + this.spaceGcwLokDelay = spaceGcwLokDelay; + } + + public int getSpaceGcwNabooDelay() { + return spaceGcwNabooDelay; + } + + public void setSpaceGcwNabooDelay(int spaceGcwNabooDelay) { + this.spaceGcwNabooDelay = spaceGcwNabooDelay; + } + + public int getSpaceGcwTatooineStagger() { + return spaceGcwTatooineStagger; + } + + public void setSpaceGcwTatooineStagger(int spaceGcwTatooineStagger) { + this.spaceGcwTatooineStagger = spaceGcwTatooineStagger; + } + + public int getSpaceGcwCorelliaStagger() { + return spaceGcwCorelliaStagger; + } + + public void setSpaceGcwCorelliaStagger(int spaceGcwCorelliaStagger) { + this.spaceGcwCorelliaStagger = spaceGcwCorelliaStagger; + } + + public int getSpaceGcwDantooineStagger() { + return spaceGcwDantooineStagger; + } + + public void setSpaceGcwDantooineStagger(int spaceGcwDantooineStagger) { + this.spaceGcwDantooineStagger = spaceGcwDantooineStagger; + } + + public int getSpaceGcwLokStagger() { + return spaceGcwLokStagger; + } + + public void setSpaceGcwLokStagger(int spaceGcwLokStagger) { + this.spaceGcwLokStagger = spaceGcwLokStagger; + } + + public int getSpaceGcwNabooStagger() { + return spaceGcwNabooStagger; + } + + public void setSpaceGcwNabooStagger(int spaceGcwNabooStagger) { + this.spaceGcwNabooStagger = spaceGcwNabooStagger; + } + + public int getSpaceGcwPobPlayerCeiling() { + return spaceGcwPobPlayerCeiling; + } + + public void setSpaceGcwPobPlayerCeiling(int spaceGcwPobPlayerCeiling) { + this.spaceGcwPobPlayerCeiling = spaceGcwPobPlayerCeiling; + } + + public int getSpaceGcwGunshipPlayerCeiling() { + return spaceGcwGunshipPlayerCeiling; + } + + public void setSpaceGcwGunshipPlayerCeiling(int spaceGcwGunshipPlayerCeiling) { + this.spaceGcwGunshipPlayerCeiling = spaceGcwGunshipPlayerCeiling; + } + + public int getSpaceGcwTokenAward() { + return spaceGcwTokenAward; + } + + public void setSpaceGcwTokenAward(int spaceGcwTokenAward) { + this.spaceGcwTokenAward = spaceGcwTokenAward; + } + + public float getSpaceGcwLossTokenModifier() { + return spaceGcwLossTokenModifier; + } + + public void setSpaceGcwLossTokenModifier(float spaceGcwLossTokenModifier) { + this.spaceGcwLossTokenModifier = spaceGcwLossTokenModifier; + } + + public float getSpaceGcwWinTokenModifier() { + return spaceGcwWinTokenModifier; + } + + public void setSpaceGcwWinTokenModifier(float spaceGcwWinTokenModifier) { + this.spaceGcwWinTokenModifier = spaceGcwWinTokenModifier; + } + + public int getSpaceGcwPointAward() { + return spaceGcwPointAward; + } + + public void setSpaceGcwPointAward(int spaceGcwPointAward) { + this.spaceGcwPointAward = spaceGcwPointAward; + } + + public float getSpaceGcwPvEPointModifier() { + return spaceGcwPvEPointModifier; + } + + public void setSpaceGcwPvEPointModifier(float spaceGcwPvEPointModifier) { + this.spaceGcwPvEPointModifier = spaceGcwPvEPointModifier; + } + + public float getSpaceGcwPvPPointModifier() { + return spaceGcwPvPPointModifier; + } + + public void setSpaceGcwPvPPointModifier(float spaceGcwPvPPointModifier) { + this.spaceGcwPvPPointModifier = spaceGcwPvPPointModifier; + } + + public float getSpaceGcwLossPointModifier() { + return spaceGcwLossPointModifier; + } + + public void setSpaceGcwLossPointModifier(float spaceGcwLossPointModifier) { + this.spaceGcwLossPointModifier = spaceGcwLossPointModifier; + } + + public float getSpaceGcwWinPointModifier() { + return spaceGcwWinPointModifier; + } + + public void setSpaceGcwWinPointModifier(float spaceGcwWinPointModifier) { + this.spaceGcwWinPointModifier = spaceGcwWinPointModifier; + } + } + + public static class RareLoot { + private boolean rlsEnabled; + private float rlsDropChance; + private int rlsMaxLevelsBelowPlayerLevel; + private int rlsMaxLevelsAbovePlayerLevel; + private float rlsRareDropChance; + private float rlsExceptionalDropChance; + private float rlsLegendaryDropChance; + private int rlsMinDistanceFromLastLoot; + private int rlsMinTimeBetweenAwards; + + RareLoot() {} + + public String toString() { + String output = "\nrlsEnabled=" + rlsEnabled; + output += "\nrlsDropChance=" + rlsDropChance; + output += "\nrlsMaxLevelsBelowPlayerLevel=" + rlsMaxLevelsBelowPlayerLevel; + output += "\nrlsMaxLevelsAbovePlayerLevel=" + rlsMaxLevelsAbovePlayerLevel; + output += "\nrlsRareDropChance=" + rlsRareDropChance; + output += "\nrlsExceptionalDropChance=" + rlsExceptionalDropChance; + output += "\nrlsLegendaryDropChance=" + rlsLegendaryDropChance; + output += "\nrlsMinDistanceFromLastLoot=" + rlsMinDistanceFromLastLoot; + output += "\nrlsMinTimeBetweenAwards=" + rlsMinTimeBetweenAwards; + return output; + } + + public boolean isRlsEnabled() { + return rlsEnabled; + } + + public void setRlsEnabled(boolean rlsEnabled) { + this.rlsEnabled = rlsEnabled; + } + + public float getRlsDropChance() { + return rlsDropChance; + } + + public void setRlsDropChance(float rlsDropChance) { + this.rlsDropChance = rlsDropChance; + } + + public int getRlsMaxLevelsBelowPlayerLevel() { + return rlsMaxLevelsBelowPlayerLevel; + } + + public void setRlsMaxLevelsBelowPlayerLevel(int rlsMaxLevelsBelowPlayerLevel) { + this.rlsMaxLevelsBelowPlayerLevel = rlsMaxLevelsBelowPlayerLevel; + } + + public int getRlsMaxLevelsAbovePlayerLevel() { + return rlsMaxLevelsAbovePlayerLevel; + } + + public void setRlsMaxLevelsAbovePlayerLevel(int rlsMaxLevelsAbovePlayerLevel) { + this.rlsMaxLevelsAbovePlayerLevel = rlsMaxLevelsAbovePlayerLevel; + } + + public float getRlsRareDropChance() { + return rlsRareDropChance; + } + + public void setRlsRareDropChance(float rlsRareDropChance) { + this.rlsRareDropChance = rlsRareDropChance; + } + + public float getRlsExceptionalDropChance() { + return rlsExceptionalDropChance; + } + + public void setRlsExceptionalDropChance(float rlsExceptionalDropChance) { + this.rlsExceptionalDropChance = rlsExceptionalDropChance; + } + + public float getRlsLegendaryDropChance() { + return rlsLegendaryDropChance; + } + + public void setRlsLegendaryDropChance(float rlsLegendaryDropChance) { + this.rlsLegendaryDropChance = rlsLegendaryDropChance; + } + + public int getRlsMinDistanceFromLastLoot() { + return rlsMinDistanceFromLastLoot; + } + + public void setRlsMinDistanceFromLastLoot(int rlsMinDistanceFromLastLoot) { + this.rlsMinDistanceFromLastLoot = rlsMinDistanceFromLastLoot; + } + + public int getRlsMinTimeBetweenAwards() { + return rlsMinTimeBetweenAwards; + } + + public void setRlsMinTimeBetweenAwards(int rlsMinTimeBetweenAwards) { + this.rlsMinTimeBetweenAwards = rlsMinTimeBetweenAwards; + } + } + + public SpaceGcw getSpaceGcw() { + return spaceGcw; + } + + public void setSpaceGcw(SpaceGcw spaceGcw) { + this.spaceGcw = spaceGcw; + } + + public RareLoot getRls() { + return rls; + } + + public void setRls(RareLoot rls) { + this.rls = rls; + } + public boolean isEnableOneYearAnniversary() { return enableOneYearAnniversary; } diff --git a/src/main/resources/swg-defaults.yml b/src/main/resources/swg-defaults.yml index cd8257d..90deabe 100644 --- a/src/main/resources/swg-defaults.yml +++ b/src/main/resources/swg-defaults.yml @@ -209,8 +209,50 @@ gameServer: pvpGuildWarCoolDownPeriodTimeMs: 60000 reportAiWarnings: false resourceTimeScale: 86400 + rls: + rlsEnabled: true + rlsDropChance: 0.5 + rlsMaxLevelsBelowPlayerLevel: 6 + rlsMaxLevelsAbovePlayerLevel: 6 + rlsRareDropChance: 70 + rlsExceptionalDropChance: 25 + rlsLegendaryDropChance: 5 + rlsMinDistanceFromLastLoot: 5 + rlsMinTimeBetweenAwards: 900 secondsPerResourceTick: 60 shipsEnabled: true + spaceGcw: + spaceGcwLengthOfBattle: 3600.0 + spaceGcwPrepatoryTime: 900.0 + spaceGcwMaxSupportShips: 30 + spaceGcwTotalSupportSpawn: 60 + spaceGcwTatooineActive: true + spaceGcwCorelliaActive: true + spaceGcwDantooineActive: true + spaceGcwLokActive: true + spaceGcwNabooActive: true + spaceGcwTatooineDelay: 3 + spaceGcwCorelliaDelay: 3 + spaceGcwDantooineDelay: 3 + spaceGcwLokDelay: 3 + spaceGcwNabooDelay: 3 + spaceGcwTatooineStagger: 0 + spaceGcwCorelliaStagger: 2 + spaceGcwDantooineStagger: 0 + spaceGcwLokStagger: 2 + spaceGcwNabooStagger: 4 + spaceGcwPobPlayerCeiling: 4 + spaceGcwGunshipPlayerCeiling: 10 + spaceGcwTokenAward: 25 + spaceGcwLossTokenModifier: 1.0 + spaceGcwWinTokenModifier: 2.0 + spaceGcwPointAward: 2500 + spaceGcwPvETokenModifier: 1.0 + spaceGcwPvPTokenModifier: 2.0 + spaceGcwPvEPointModifier: 1.0 + spaceGcwPvPPointModifier: 2.0 + spaceGcwLossPointModifier: 1.0 + spaceGcwWinPointModifier: 2.0 unclaimedAuctionItemDestroyTimeSec: 2592000 veteranRewardTradeInWaitPeriodSeconds: 2592000 weatherUpdateSeconds: 900