Skip to content

Commit 7a5f929

Browse files
authored
Merge pull request #161 from Chrezm/4.3.5-dev
4.3.5
2 parents 5732ad0 + 56b20e0 commit 7a5f929

28 files changed

+2014
-425
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -800,3 +800,20 @@
800800
### 220831a (4.3.4-post2)
801801
* Fixed clients sending legitimate split packets being abnormally disconnected
802802
* Fixed character list reloads crashing when someone is in server select
803+
804+
### 220912a (4.3.5)
805+
* Added client version and server version consistently to printed server error messages
806+
* Added support for loading custom background lists without changing `config/backgrounds.yaml` via the `config/background_lists` folder and commands
807+
- /bg_list
808+
- /bg_list_info
809+
* Added support for loading custom character lists without changing `config/characters.yaml` via the `config/character_lists` folder and commands
810+
- /char_list
811+
- /char_list_info
812+
* Updated wording of /area_list and /music_list so that it matches the wording of /bg_list and /char_list on success or failure
813+
* Added /area_list_info and /music_list_info, which returns the name of the current area list and music list respectively
814+
* Added support for changing backgrounds in an area associated with periods via commands
815+
- /bg_period
816+
- /bg_period_end
817+
* Changed console message indicating server address and port to reflect DRO no longer using the old syntax
818+
* Fixed /lasterror providing duplicate error information
819+
* Fixed /clock_period erroring out if a non-numerical invalid hour start or hour length was given.

README.md

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ It is highly recommended you read through all the installation steps first befor
5252
* If everything was set up correctly, you will see something like this appear:
5353

5454
```
55-
[2022-08-21T10:20:20]: Starting...
56-
[2022-08-21T10:20:20]: Launching TsuserverDR 4.3.4 (220821a)...
57-
[2022-08-21T10:20:20]: Loading server configurations...
58-
[2022-08-21T10:20:20]: Server configurations loaded successfully!
59-
[2022-08-21T10:20:20]: Starting a nonlocal server...
60-
[2022-08-21T10:20:20]: Server started successfully!
61-
[2022-08-21T10:20:21]: Server should be now accessible from 192.0.2.0:50000:My First DR Server
55+
[2022-09-12T10:20:20]: Starting...
56+
[2022-09-12T10:20:20]: Launching TsuserverDR 4.3.5 (220912a)...
57+
[2022-09-12T10:20:20]: Loading server configurations...
58+
[2022-09-12T10:20:20]: Server configurations loaded successfully!
59+
[2022-09-12T10:20:20]: Starting a nonlocal server...
60+
[2022-09-12T10:20:20]: Server started successfully!
61+
[2022-09-12T10:20:21]: Server should be now accessible from address 192.0.2.0 and port 50000.
6262
```
6363

6464
* If you are listing your server in the Attorney Online master server, make sure its details are set up correctly. In particular, make sure that your server name and description are correct, as that is how players will find your server. If everything was set up correctly, you will see something like this appear:
6565

6666
```
67-
[2022-08-21T10:20:21]: Attempting to connect to the master server at https://servers.aceattorneyonline.com/servers with the following details:
68-
[2022-08-21T10:20:21]: *Server name: My First DR Server
69-
[2022-08-21T10:20:21]: *Server description: This is my flashy new DR server
70-
[2022-08-21T10:20:22]: Connected to the master server.
67+
[2022-09-12T10:20:21]: Attempting to connect to the master server at https://servers.aceattorneyonline.com/servers with the following details:
68+
[2022-09-12T10:20:21]: *Server name: My First DR Server
69+
[2022-09-12T10:20:21]: *Server description: This is my flashy new DR server
70+
[2022-09-12T10:20:22]: Connected to the master server.
7171
```
7272

7373
- The server will make a single ping to [ipify](https://api.ipify.org) in order to obtain its public IP address. If it fails to do that, it will let you know that, as it means there is probably something wrong with your internet connection and that other players may not be able to connect to your server.
@@ -76,9 +76,9 @@ It is highly recommended you read through all the installation steps first befor
7676
* To stop the server, press Ctrl+C once from your terminal. This will initiate a shutdown sequence and notify you when it is done. If the shutdown finished successfully, you will see something like this appear:
7777

7878
```
79-
[2022-08-21T22:23:04]: You have initiated a server shut down.
80-
[2022-08-21T22:23:04]: Kicking 12 remaining clients.
81-
[2022-08-21T22:23:04]: Server has successfully shut down.
79+
[2022-09-12T22:23:04]: You have initiated a server shut down.
80+
[2022-09-12T22:23:04]: Kicking 12 remaining clients.
81+
[2022-09-12T22:23:04]: Server has successfully shut down.
8282
```
8383

8484
* If you do not see anything after a few seconds of starting a shutdown, you can try spamming Ctrl+C to try and force a shutdown or directly close out your terminal. This is not recommended due to the cleanup process not finishing correctly but it is doable.
@@ -186,6 +186,8 @@ Additional notes are listed at the end of the command list. Unless otherwise spe
186186
- Returns the server's Message of the Day.
187187
* **music_list** "music list name"
188188
- Sets your music list to the given one, or restores the original one if not given any.
189+
* **music_list_info**
190+
- Returns your current music list.
189191
* **music_lists**
190192
- Lists all available music lists as established in `config/music_lists.yaml`.
191193
* **notecard** "content"
@@ -355,6 +357,10 @@ GMs can:
355357
- Sets the current area to have bloodtrails leading to the listed areas. If no areas are given, the area is set to have an unconnected pool of blood.
356358
* **bloodtrail_smear** "area 1", "area 2", ...
357359
- Smears the blood trails in the given areas (or the current one if not given any areas).
360+
* **bg_period** "period name" "bg name"
361+
- Sets the special background to be displayed in the area whenever there is a clock in the area with the given period.
362+
* **bg_period_end** "period name"
363+
- Removes the special background to be displayed in the area whenever there is a clock in the area with the given period, so that it instead displays the normal background of the area.
358364
* **can_passagelock**
359365
- Changes the current area's setting to allow non-staff members to change passages starting in the area with /bilock or /unilock. By default area setting is indicated in the server's area list.
360366
* **can_rollp**
@@ -668,13 +674,25 @@ GMs can:
668674
- If not given a target area, it will use the server's default area (usually area 0).
669675
* **area_list** "area list"
670676
- Sets the server's current area list.
671-
- If not given an area list, it will restore the original area list as it was on server bootup.
677+
- If not given an area list, it will use the default file `config/areas.yaml`.
678+
* **area_list_info**
679+
- Returns the server's current area list.
672680
* **area_lists**
673681
- Lists all available area lists as established in `config/area_lists.yaml`.
682+
* **bg_list** "list"
683+
- Sets the server's current background list.
684+
- If not given a background list, it will use the default file `config/backgrounds.yaml`.
685+
* **bg_list_info**
686+
- Returns the server's current background list.
674687
* **blockdj** "ID/IPID"
675688
- Mutes the target from changing music.
676689
* **charlog** "ID/IPID"
677690
- Lists all character changes (including iniswaps and character name changes) a target has gone through since connecting, including the time they were changed.
691+
* **char_list** "list"
692+
- Sets the server's current character list.
693+
- If not given a character list, it will use the default file `config/characters.yaml`.
694+
* **char_list_info**
695+
- Returns the server's current character list.
678696
* **cleargm** "ID"
679697
- Logs out the target from their GM rank, or all GMs in the server if not given a target, and puts them in RP mode if needed.
680698
* **g** "message"

config_sample/README.md

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,30 @@
33
## Before you get started...
44
With your copy of this software, you should check that you have the following files in `\config_sample\`:
55

6-
* `config.yaml`
7-
* `area_lists.yaml`
8-
* `area_templates.yaml`
9-
* `areas.yaml`
10-
* `backgrounds.yaml`
6+
* `config.yaml`
7+
* `area_lists.yaml`
8+
* `area_templates.yaml`
9+
* `areas.yaml`
10+
* `backgrounds.yaml`
1111
* `gimp.yaml`
12-
* `iniswaps.yaml`
13-
* `music.yaml`
14-
* `music_lists.yaml`
12+
* `iniswaps.yaml`
13+
* `music.yaml`
14+
* `music_lists.yaml`
1515

16-
As well as two folders:
16+
As well as these folders:
1717

18-
* `area_lists`
19-
* `music_lists`
18+
* `area_lists`
19+
* `background_lists`
20+
* `character_lists`
21+
* `music_lists`
2022

2123
Make sure you have all of the above inside this folder (otherwise, the server may hang or crash while starting).
2224

23-
In order to customize your server, you would be modifying the files in this configuration folder. You should be able to edit these files with any text editor, including Notepad, Notepad++, Nano, Vim, etc.
25+
In order to customize your server, you would be modifying the files in this configuration folder. You should be able to edit these files with any text editor, including Notepad, Notepad++, Nano, Vim, etc.
2426

2527
### YAML
2628

27-
* The configuration files follow YAML syntax. YAML is a human-readable markup language, so you should be able to pick up the syntax rather quickly. However, if you feel like a short tutorial could come handy, the guide from [Rollout](https://rollout.io/blog/yaml-tutorial-everything-you-need-get-started/) is a great starting point. You can also use external YAML linters such as the one [here](https://codebeautify.org/yaml-validator) in order to check if your YAML syntax is valid.
29+
* The configuration files follow YAML syntax. YAML is a human-readable markup language, so you should be able to pick up the syntax rather quickly. However, if you feel like a short tutorial could come handy, the guide from [Rollout](https://rollout.io/blog/yaml-tutorial-everything-you-need-get-started/) is a great starting point. You can also use external YAML linters such as the one [here](https://codebeautify.org/yaml-validator) in order to check if your YAML syntax is valid.
2830
* By convention, TsuserverDR uses two spaces to indent (not tabulations).
2931
* **As long as some configuration files have invalid YAML syntax or attributes TsuserverDR does not like, your server will very likely not start.** The server will try its best to let you know what is wrong, but this is not guaranteed.
3032

@@ -36,7 +38,7 @@ Each file contains an example configuration. Further instructions should be loca
3638
- Contains server configuration attributes such as server name, player limit, the port it should use to listen to connections, whether it should be advertised in the AO master server list, etc.
3739

3840
* **area_lists.yaml**
39-
- Lists the area lists the server supports.
41+
- Lists the area lists the server supports.
4042
- This is the list that is returned when moderators use `/area_lists`. No validation is performed to check if some area list is in this list of area lists.
4143

4244
* **area_templates.yaml**
@@ -45,14 +47,14 @@ Each file contains an example configuration. Further instructions should be loca
4547
* **areas.yaml**
4648
- Contains the default server area list.
4749
- This is the area list that is loaded when the server starts, as well as the area list the server falls back to when moderators use `/area_list` on its own.
48-
50+
4951
* **backgrounds.yaml**
5052
- Lists the background names the server supports.
5153
- This is the list that is used to validate attempts from regular players to change the background with `/bg`.
5254

5355
* **gimp.yaml**
5456
- Lists a pool of messages. If a player is gimped, their messages will be replaced with a randomly chosen message from this list.
55-
57+
5658
* **iniswaps.yaml**
5759
- Lists the allowed iniswapping combinations.
5860
- This is the list the server uses to check in areas that prevent iniswapping to check if they should allow a particular iniswap to exist.

config_sample/area_lists/.gitkeep

Whitespace-only changes.

config_sample/background_lists/.gitkeep

Whitespace-only changes.

config_sample/character_lists/.gitkeep

Whitespace-only changes.

config_sample/music_lists/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)