-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Whitespace Cleanup #16
Open
jupster
wants to merge
4
commits into
16AA-Milsim:main
Choose a base branch
from
jupster:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
admins[] = { | ||
"76561198042251903", // Mueller | ||
"76561198042251903", // Mueller | ||
"76561198006649815", // Frederiksen | ||
"76561198022993301", // Hogg | ||
"76561198022993301" // Hogg | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
admins[] = { | ||
"76561198042251903", // Mueller | ||
"76561198042251903", // Mueller | ||
"76561198006649815", // Frederiksen | ||
"76561198022993301", // Hogg | ||
"76561197990800411", // Karlsson | ||
"76561198043763186", // Rabbit | ||
"76561198037954698", // MD | ||
"76561198037954698" // MD | ||
|
||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
// GENERAL SETTINGS | ||
maxPlayers = 128; // Maximum amount of players, including headless clients. Anybody who joins the server is considered a player, regardless of their role or team. | ||
persistent = 0; // If set to 1, missions will continue to run after all players have disconnected; required if you want to use the -autoInit startup parameter | ||
requiredBuild = 133741; // From 1.60 Patchlog: requiredBuild=xxxxx; in server.cfg preventing obsolete clients to connect. Since 95691 the required version is limited to the server version. | ||
forceRotorLibSimulation = 0; // Enforces the Advanced Flight Model on the server. Default = 0 (up to the player). 1 - forced AFM, 2 - forced SFM. | ||
requiredBuild = 133741; // From 1.60 Patchlog: requiredBuild=xxxxx; in server.cfg preventing obsolete clients to connect. Since 95691 the required version is limited to the server version. | ||
forceRotorLibSimulation = 0; // Enforces the Advanced Flight Model on the server. Default = 0 (up to the player). 1 - forced AFM, 2 - forced SFM. | ||
forcedDifficulty = "Custom"; // Force difficulty | ||
steamProtocolMaxDataSize = 10000; // Max size of data sent to steam. Default 10000. Increase if you have a lot of mods and are getting steam errors. | ||
// missionsToServerRestart = 1; // Restart the server after every mission | ||
// missionsToServerRestart = 1; // Restart the server after every mission | ||
|
||
// VOICE CHAT | ||
disableVoN = 1; // If set to 1, voice chat will be disabled | ||
|
@@ -17,40 +17,43 @@ vonCodecQuality = 3; // Supports range 1-30; 1-10 is 8kHz (narrowband), 11-20 | |
motdInterval = 3; // Number of seconds between each message | ||
|
||
// SECURITY | ||
BattlEye = 0; // If set to 1, BattlEye Anti-Cheat will be enabled on the server (default: 1, recommended: 1) | ||
verifySignatures = 0; // If set to 2, players with unknown or unsigned mods won't be allowed join (default: 0, recommended: 2) | ||
kickDuplicate = 1; // If set to 1, players with an ID that is identical to another player will be kicked (recommended: 1) | ||
upnp = 0; // Automatically creates port mapping on UPNP/IGD enabled router. This option allows you to create a server behind NAT (your router must have public IP and support UPNP/IGD protocol) | ||
allowedFilePatching = 1; //Prevent or allow file patching for the clients (including the HC) (since Arma 3 1.49+) (0 is no clients (default),1 is Headless Clients only, 2 is all clients) | ||
BattlEye = 0; // If set to 1, BattlEye Anti-Cheat will be enabled on the server (default: 1, recommended: 1) | ||
verifySignatures = 0; // If set to 2, players with unknown or unsigned mods won't be allowed join (default: 0, recommended: 2) | ||
kickDuplicate = 1; // If set to 1, players with an ID that is identical to another player will be kicked (recommended: 1) | ||
upnp = 0; // Automatically creates port mapping on UPNP/IGD enabled router. This option allows you to create a server behind NAT (your router must have public IP and support UPNP/IGD protocol) | ||
allowedFilePatching = 1; // Prevent or allow file patching for the clients (including the HC) (since Arma 3 1.49+) (0 is no clients (default),1 is Headless Clients only, 2 is all clients) | ||
|
||
// EVENT SCRIPTS (see http://community.bistudio.com/wiki/ArmA:_Server_Side_Scripting) | ||
onUserConnected = ""; // command to run when a player connects | ||
onUserDisconnected = ""; // command to run when a player disconnects | ||
onUserConnected = ""; // command to run when a player connects | ||
onUserDisconnected = ""; // command to run when a player disconnects | ||
doubleIdDetected = "kick (_this select 0)"; // command to run if a player has the same ID as another player in the server | ||
onUnsignedData = "kick (_this select 0)"; // command to run if a player has unsigned files | ||
onHackedData = "kick (_this select 0)"; // command to run if a player has tampered files | ||
|
||
// HEADLESS CLIENT | ||
headlessClients[] = {"127.0.0.1"}; | ||
localClient[] = {"127.0.0.1"}; | ||
briefingTimeOut = -1; | ||
roleTimeOut = -1; | ||
votingTimeOut = -1; | ||
debriefingTimeOut = -1; | ||
lobbyIdleTimeout = -1; | ||
kickTimeout[] = {{0, 1}, {1, 1}, {2, 1}, {3, 1}}; | ||
|
||
disconnectTimeout = 15; //Time to wait before disconnecting a user which temporarily lost connection. Range is 5 to 90 seconds. | ||
maxDesync = 200; //Max desync value until server kick the user | ||
maxPing= 500; //Max ping value until server kick the user | ||
maxPacketLoss= 50; //Max packetloss value until server kick the user | ||
kickClientsOnSlowNetwork[] = {1,1,1,1}; //Defines if {<MaxPing>, <MaxPacketLoss>, <MaxDesync>, <DisconnectTimeout>} will be logged (0) or kicked (1) | ||
logFile = "server_console.log"; //Saves the output of the server console window itself, useful | ||
headlessClients[] = {"127.0.0.1"}; | ||
localClient[] = {"127.0.0.1"}; | ||
|
||
// TIME OUT | ||
briefingTimeOut = -1; // Briefing timeout Default 60 | ||
roleTimeOut = -1; // Role selection timout Default 90 | ||
votingTimeOut = -1; // Voting timeout Default 60 | ||
debriefingTimeOut = -1; // Debriefing timeout Default 45 | ||
lobbyIdleTimeout = -1; // Lobby idle timeout Default time if 0 = 300 | ||
kickTimeout[] = {{0, 1}, {1, 1}, {2, 1}, {3, 1}}; // Default { { 0, 60 }, { 1, 60 }, { 2, 60 }, { 3, 60 } }; | ||
disconnectTimeout = 15; // Time to wait before disconnecting a user which temporarily lost connection. Range is 5 to 90 seconds. | ||
|
||
// NETWORK | ||
maxDesync = 200; // Max desync value until server kick the user | ||
maxPing = 500; // Max ping value until server kick the user | ||
maxPacketLoss = 50; // Max packetloss value until server kick the user | ||
kickClientsOnSlowNetwork[] = {1,1,1,1}; // Defines if {<MaxPing>, <MaxPacketLoss>, <MaxDesync>, <DisconnectTimeout>} will be logged (0) or kicked (1) | ||
logFile = "server_console.log"; // Saves the output of the server console window itself, useful | ||
|
||
class AdvancedOptions | ||
{ | ||
LogObjectNotFound = false; // (default true, logging enabled) | ||
SkipDescriptionParsing = false; // (default false, parse description.ext) | ||
ignoreMissionLoadErrors = false; | ||
queueSizeLogG = 1000000; | ||
LogObjectNotFound = false; // (default true, logging enabled) | ||
SkipDescriptionParsing = false; // (default false, parse description.ext) | ||
ignoreMissionLoadErrors = false; // (default false, Mission will load no matter errors) | ||
queueSizeLogG = 1000000; // (default 1000000, if `#monitor` is running dumps messages from player if over queue size) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also could write these different obviously |
||
}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could move
UPNP
down toNetwork