Skip to content

Commit bf12328

Browse files
Fix empty lines etc
1 parent b97c3ab commit bf12328

File tree

4 files changed

+117
-81
lines changed

4 files changed

+117
-81
lines changed

Server/mods/deathmatch/editor.conf

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,37 @@
44
and on Game-Monitor. It is a required parameter. -->
55
<servername>Map Editor Server</servername>
66

7-
<!-- These 'rules' are parameters for the server browser.
8-
They are optional and can be left empty. -->
9-
<!-- description: A brief description of the server. -->
7+
<!-- These rules are optional parameters for the server browser/list (they can be left empty).
8+
Each rule has their own requirements. Read carefully. -->
9+
10+
<!-- A brief description of the server. -->
1011
<rule name="description" value="" />
11-
<!-- languages: A comma separated list of languages that the server supports (e.g. en). -->
12+
13+
<!-- A comma separated list of languages that the server supports (e.g. en). -->
1214
<rule name="languages" value="" />
15+
1316
<!-- tags: A comma separated list of tags that describe the server (e.g. freeroam, roleplay). -->
1417
<rule name="tags" value="" />
15-
<!-- website_url: The URL of the server's website. -->
18+
19+
<!-- The URL of the server's website. -->
1620
<rule name="website_url" value="" />
17-
<!-- icon_url: The URL of the server's icon. Must be uploaded to https://upload.mtasa.com/server-media/ -->
18-
<rule name="icon_url" value="" />
19-
<!-- banner_url: The URL of the server's banner. Must be uploaded to https://upload.mtasa.com/server-media/ -->
20-
<rule name="banner_url" value="" />
2121

22+
<!-- A social media URL #1 (e.g. Discord). -->
23+
<rule name="social1_url" value="" />
24+
25+
<!-- A social media URL #2 (e.g. YouTube). -->
26+
<rule name="social2_url" value="" />
27+
28+
<!-- A social media URL #3 (e.g. Facebook). -->
29+
<rule name="social3_url" value="" />
30+
2231
<!-- This parameter specifies the contact email addresses for the owner(s) of this server.
2332
The email addresses will not be publicly available, and only used by MTA administrators
2433
to contact the server owner.
2534
Note: Missing or incorrect owner_email_address can affect visibility in the master server list.
2635
Values: Comma separated list of email addresses -->
2736
<owner_email_address></owner_email_address>
28-
37+
2938
<!-- ONLY USE THIS PARAMETER IF YOU ARE SURE OF WHAT YOU ARE DOING - it is generally only
3039
needed for professional servers and should be left at the default value otherwise.
3140
This parameter specifies the IP to use for servers that have multiple IP addresses. If set
@@ -38,16 +47,16 @@
3847
<!-- This parameter specifies the UDP port on which the server will be accepting incoming player
3948
connections; default value: 22003. It is a required parameter. -->
4049
<serverport>22010</serverport>
41-
50+
4251
<!-- This parameter specifies the number of maximum player slots available on the server; default
4352
value: 32. It is a required parameter. -->
4453
<maxplayers>1</maxplayers>
45-
54+
4655
<!-- This parameter specifies the TCP port on which the server will be accepting incoming http
4756
connections. It can be set to the same value as <serverport>. It is a required parameter
4857
if <httpserver> is set to 1. -->
4958
<httpport>22011</httpport>
50-
59+
5160
<!-- If set, this parameter specifies the external URL from which clients will be able to download
5261
needed resources ingame. If not set (or the external URL files are incorrect), resource downloads
5362
are switched to the internal http server. -->
@@ -66,7 +75,7 @@
6675
e.g. 88.11.22.33,101.2.3.4 -->
6776
<http_dos_exclude></http_dos_exclude>
6877

69-
<!-- By default, the server will block the use of locally customized gta3.img player skins.
78+
<!-- By default, the server will block the use of locally customized gta3.img player skins.
7079
This setting can be used to allow such mods. Not recommended for competitive servers.
7180
Values: none or peds ; default value: none -->
7281
<allow_gta3_img_mods>none</allow_gta3_img_mods>
@@ -188,17 +197,17 @@
188197
<!-- Specifies the location and name of the file used to log loadstring function calls.
189198
If left blank or not set, no logging is done. -->
190199
<!-- <loadstringfile>logs/loadstring.log</loadstringfile> -->
191-
200+
192201
<!-- This parameter specifies the location and name of the Access Control List settings file. If left
193202
blank, server will use acl.xml file, located in the same folder as this configuration file. -->
194203
<acl>editor_acl.xml</acl>
195204

196205
<!-- Specifies the location and name of the debugscript log file. If left blank, server won't be saving this file. -->
197-
<scriptdebuglogfile>logs/editor_scripts.log</scriptdebuglogfile>
198-
206+
<scriptdebuglogfile>logs/editor_scripts.log</scriptdebuglogfile>
207+
199208
<!-- Specifies the level of the debugscript log file. Available values: 0, 1, 2, 3. When not set, defaults to 0. -->
200209
<scriptdebugloglevel>0</scriptdebugloglevel>
201-
210+
202211
<!-- Specifies the level of the html debug. Available values: 0, 1, 2, 3. When not set, defaults to 0. -->
203212
<htmldebuglevel>0</htmldebuglevel>
204213

@@ -212,12 +221,12 @@
212221
<!-- This parameter specifies whether or not to enable player voice chat in-game
213222
Values: 0 - disabled , 1 - enabled -->
214223
<voice>0</voice>
215-
224+
216225
<!-- This parameter specifies the sample rate for voice chat. 'voice' parameter must be set to 1 for this to be effective.
217226
Higher settings use more bandwidth and increase the sampling quality of voice chat
218227
Values: 0 - Narrowband (8kHz), 1 - Wideband (16kHz), 2 - Ultrawideband (32kHz). Default - 1 -->
219228
<voice_samplerate>1</voice_samplerate>
220-
229+
221230
<!-- This parameter specifies the voice quality for voice chat. 'voice' parameter must be set to 1 for this to be effective.
222231
Higher settings use more bandwidth and increase the the overall quality of voice chat
223232
Available range: 0 to 10. Default - 4 -->
@@ -283,7 +292,7 @@
283292
parameter(s). Optional parameter. -->
284293
<!-- <module src="sample_win32.dll"/> -->
285294
<!-- <module src="sample_linux.so"/> -->
286-
295+
287296
<!-- Specifies resources that are loaded when the server starts and/or which are protected from being stopped.
288297
To specify several resources, add more <resource> parameter(s). -->
289298

@@ -293,5 +302,5 @@
293302
<resource src="mapmanager" startup="1" protected="0"/>
294303
<resource src="ipb" startup="1" protected="0"/>
295304
<resource src="parachute" startup="1" protected="0"/>
296-
297-
</config>
305+
306+
</config>

Server/mods/deathmatch/local.conf

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,30 @@
44
and on Game-Monitor. It is a required parameter. -->
55
<servername>Default MTA Server</servername>
66

7-
<!-- These 'rules' are parameters for the server browser.
8-
They are optional and can be left empty. -->
9-
<!-- description: A brief description of the server. -->
7+
<!-- These rules are optional parameters for the server browser/list (they can be left empty).
8+
Each rule has their own requirements. Read carefully. -->
9+
10+
<!-- A brief description of the server. -->
1011
<rule name="description" value="" />
11-
<!-- languages: A comma separated list of languages that the server supports (e.g. en). -->
12+
13+
<!-- A comma separated list of languages that the server supports (e.g. en). -->
1214
<rule name="languages" value="" />
15+
1316
<!-- tags: A comma separated list of tags that describe the server (e.g. freeroam, roleplay). -->
1417
<rule name="tags" value="" />
15-
<!-- website_url: The URL of the server's website. -->
18+
19+
<!-- The URL of the server's website. -->
1620
<rule name="website_url" value="" />
17-
<!-- icon_url: The URL of the server's icon. Must be uploaded to https://upload.mtasa.com/server-media/ -->
18-
<rule name="icon_url" value="" />
19-
<!-- banner_url: The URL of the server's banner. Must be uploaded to https://upload.mtasa.com/server-media/ -->
20-
<rule name="banner_url" value="" />
2121

22+
<!-- A social media URL #1 (e.g. Discord). -->
23+
<rule name="social1_url" value="" />
24+
25+
<!-- A social media URL #2 (e.g. YouTube). -->
26+
<rule name="social2_url" value="" />
27+
28+
<!-- A social media URL #3 (e.g. Facebook). -->
29+
<rule name="social3_url" value="" />
30+
2231
<!-- This parameter specifies the contact email addresses for the owner(s) of this server.
2332
The email addresses will not be publicly available, and only used by MTA administrators
2433
to contact the server owner.
@@ -38,16 +47,16 @@
3847
<!-- This parameter specifies the UDP port on which the server will be accepting incoming player
3948
connections; default value: 22003. It is a required parameter. -->
4049
<serverport>22010</serverport>
41-
50+
4251
<!-- This parameter specifies the number of maximum player slots available on the server; default
4352
value: 32. It is a required parameter. -->
4453
<maxplayers>32</maxplayers>
45-
54+
4655
<!-- This parameter specifies the TCP port on which the server will be accepting incoming http
4756
connections. It can be set to the same value as <serverport>. It is a required parameter
4857
if <httpserver> is set to 1. -->
4958
<httpport>22011</httpport>
50-
59+
5160
<!-- If set, this parameter specifies the external URL from which clients will be able to download
5261
needed resources ingame. If not set (or the external URL files are incorrect), resource downloads
5362
are switched to the internal http server. -->
@@ -66,7 +75,7 @@
6675
e.g. 88.11.22.33,101.2.3.4 -->
6776
<http_dos_exclude></http_dos_exclude>
6877

69-
<!-- By default, the server will block the use of locally customized gta3.img player skins.
78+
<!-- By default, the server will block the use of locally customized gta3.img player skins.
7079
This setting can be used to allow such mods. Not recommended for competitive servers.
7180
Values: none or peds ; default value: none -->
7281
<allow_gta3_img_mods>none</allow_gta3_img_mods>
@@ -188,17 +197,17 @@
188197
<!-- Specifies the location and name of the file used to log loadstring function calls.
189198
If left blank or not set, no logging is done. -->
190199
<!-- <loadstringfile>logs/local_loadstring.log</loadstringfile> -->
191-
200+
192201
<!-- This parameter specifies the location and name of the Access Control List settings file. If left
193202
blank, server will use acl.xml file, located in the same folder as this configuration file. -->
194203
<acl>acl.xml</acl>
195204

196205
<!-- Specifies the location and name of the debugscript log file. If left blank, server won't be saving this file. -->
197-
<scriptdebuglogfile>logs/local_scripts.log</scriptdebuglogfile>
198-
206+
<scriptdebuglogfile>logs/local_scripts.log</scriptdebuglogfile>
207+
199208
<!-- Specifies the level of the debugscript log file. Available values: 0, 1, 2, 3. When not set, defaults to 0. -->
200209
<scriptdebugloglevel>0</scriptdebugloglevel>
201-
210+
202211
<!-- Specifies the level of the html debug. Available values: 0, 1, 2, 3. When not set, defaults to 0. -->
203212
<htmldebuglevel>0</htmldebuglevel>
204213

@@ -212,12 +221,12 @@
212221
<!-- This parameter specifies whether or not to enable player voice chat in-game
213222
Values: 0 - disabled , 1 - enabled -->
214223
<voice>0</voice>
215-
224+
216225
<!-- This parameter specifies the sample rate for voice chat. 'voice' parameter must be set to 1 for this to be effective.
217226
Higher settings use more bandwidth and increase the sampling quality of voice chat
218227
Values: 0 - Narrowband (8kHz), 1 - Wideband (16kHz), 2 - Ultrawideband (32kHz). Default - 1 -->
219228
<voice_samplerate>1</voice_samplerate>
220-
229+
221230
<!-- This parameter specifies the voice quality for voice chat. 'voice' parameter must be set to 1 for this to be effective.
222231
Higher settings use more bandwidth and increase the the overall quality of voice chat
223232
Available range: 0 to 10. Default - 4 -->
@@ -283,7 +292,7 @@
283292
parameter(s). Optional parameter. -->
284293
<!-- <module src="sample_win32.dll"/> -->
285294
<!-- <module src="sample_linux.so"/> -->
286-
295+
287296
<!-- Specifies resources that are loaded when the server starts and/or which are protected from being stopped.
288297
To specify several resources, add more <resource> parameter(s). -->
289298

@@ -304,8 +313,8 @@
304313
<resource src="voice" startup="1" protected="0" />
305314
<resource src="votemanager" startup="1" protected="0"/>
306315
<resource src="webadmin" startup="1" protected="0"/>
307-
316+
308317
<!-- play is the default freeroam gamemode. Remove the following line to prevent it from starting. -->
309318
<resource src="play" startup="1" protected="0"/>
310-
311-
</config>
319+
320+
</config>

Server/mods/deathmatch/mtaserver.conf

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,29 @@
44
and on Game-Monitor. It is a required parameter. -->
55
<servername>Default MTA Server</servername>
66

7-
<!-- These 'rules' are parameters for the server browser.
8-
They are optional and can be left empty. -->
9-
<!-- description: A brief description of the server. -->
7+
<!-- These rules are optional parameters for the server browser/list (they can be left empty).
8+
Each rule has their own requirements. Read carefully. -->
9+
10+
<!-- A brief description of the server. -->
1011
<rule name="description" value="" />
11-
<!-- languages: A comma separated list of languages that the server supports (e.g. en). -->
12+
13+
<!-- A comma separated list of languages that the server supports (e.g. en). -->
1214
<rule name="languages" value="" />
15+
1316
<!-- tags: A comma separated list of tags that describe the server (e.g. freeroam, roleplay). -->
1417
<rule name="tags" value="" />
15-
<!-- website_url: The URL of the server's website. -->
18+
19+
<!-- The URL of the server's website. -->
1620
<rule name="website_url" value="" />
17-
<!-- icon_url: The URL of the server's icon. Must be uploaded to https://upload.mtasa.com/server-media/ -->
18-
<rule name="icon_url" value="" />
19-
<!-- banner_url: The URL of the server's banner. Must be uploaded to https://upload.mtasa.com/server-media/ -->
20-
<rule name="banner_url" value="" />
21+
22+
<!-- A social media URL #1 (e.g. Discord). -->
23+
<rule name="social1_url" value="" />
24+
25+
<!-- A social media URL #2 (e.g. YouTube). -->
26+
<rule name="social2_url" value="" />
27+
28+
<!-- A social media URL #3 (e.g. Facebook). -->
29+
<rule name="social3_url" value="" />
2130

2231
<!-- This parameter specifies the contact email addresses for the owner(s) of this server.
2332
The email addresses will not be publicly available, and only used by MTA administrators
@@ -38,16 +47,16 @@
3847
<!-- This parameter specifies the UDP port on which the server will be accepting incoming player
3948
connections; default value: 22003. It is a required parameter. -->
4049
<serverport>22003</serverport>
41-
50+
4251
<!-- This parameter specifies the number of maximum player slots available on the server; default
4352
value: 32. It is a required parameter. -->
4453
<maxplayers>32</maxplayers>
45-
54+
4655
<!-- This parameter specifies the TCP port on which the server will be accepting incoming http
4756
connections. It can be set to the same value as <serverport>. It is a required parameter
4857
if <httpserver> is set to 1. -->
4958
<httpport>22005</httpport>
50-
59+
5160
<!-- If set, this parameter specifies the external URL from which clients will be able to download
5261
needed resources ingame. If not set (or the external URL files are incorrect), resource downloads
5362
are switched to the internal http server. -->
@@ -192,7 +201,7 @@
192201
<!-- Specifies the location and name of the file used to log loadstring function calls.
193202
If left blank or not set, no logging is done. -->
194203
<!-- <loadstringfile>logs/loadstring.log</loadstringfile> -->
195-
204+
196205
<!-- This parameter specifies the location and name of the Access Control List settings file. If left
197206
blank, server will use acl.xml file, located in the same folder as this configuration file. -->
198207
<acl>acl.xml</acl>
@@ -216,12 +225,12 @@
216225
<!-- This parameter specifies whether or not to enable player voice chat in-game
217226
Values: 0 - disabled , 1 - enabled -->
218227
<voice>0</voice>
219-
228+
220229
<!-- This parameter specifies the sample rate for voice chat. 'voice' parameter must be set to 1 for this to be effective.
221230
Higher settings use more bandwidth and increase the sampling quality of voice chat
222231
Values: 0 - Narrowband (8kHz), 1 - Wideband (16kHz), 2 - Ultrawideband (32kHz). Default - 1 -->
223232
<voice_samplerate>1</voice_samplerate>
224-
233+
225234
<!-- This parameter specifies the voice quality for voice chat. 'voice' parameter must be set to 1 for this to be effective.
226235
Higher settings use more bandwidth and increase the the overall quality of voice chat
227236
Available range: 0 to 10. Default - 4 -->
@@ -294,7 +303,7 @@
294303
parameter(s). Optional parameter. -->
295304
<!-- <module src="sample_win32.dll"/> -->
296305
<!-- <module src="sample_linux.so"/> -->
297-
306+
298307
<!-- Specifies resources that are loaded when the server starts and/or which are protected from being stopped.
299308
To specify several resources, add more <resource> parameter(s). -->
300309

@@ -317,9 +326,9 @@
317326
<resource src="votemanager" startup="1" protected="0"/>
318327
<resource src="webadmin" startup="1" protected="0"/>
319328
<resource src="playercolors" startup="1" protected="0"/>
320-
329+
321330
<!-- play is the default freeroam gamemode. Remove the following line to prevent it from starting. -->
322331
<resource src="play" startup="1" protected="0"/>
332+
323333

324-
325-
</config>
334+
</config>

0 commit comments

Comments
 (0)