Compare commits

..
Author SHA1 Message Date
miniduikboot 3ae24d549c Fix regression in game started detection
In Impostor 1.9.x games only started when all players had a role set.
Currently games will start when the first role is assigned, with all
other players defaulting to Crewmate, ignoring the other SetRole
commands that Impostor has not yet processed.

This commit reverts to the previous correct behaviour where SetRole
needs to be called for all players. Also ignore RoleType when
deserializing, as Vanilla roles are not nullable
2024-07-19 20:01:36 +02:00
miniduikboot 99cf2243bd Add new option to full config example
Some people were confused by config-full.json, thinking that this file
should be edited too. This is not the case and the values in this file
don't apply as it was only meant as an example, so rename the file to
make that more clear.
2024-07-09 22:50:02 +02:00
miniduikboot 80c1d53337 Add compatibility option to allow host authority
There are various bugs in the current implementation of host-authoritive
multiplayer such that I can't recommend players to use it. Fixing these
issues on the server side is impossible, and I can't smell remotely if
clients have applied the necessary fixes. The currently known bugs
include at least:

- Unable to join more than 8 players in a room
- Unable for new players to join if host switched from host authoritive
  to server authoritive
- Host is unable to kill if it is in a host authoritive game while it
  thinks it is in server authoritive mode

If Innersloth fixes this mode in future game patches, this option may be
reconsidered.
2024-07-09 22:46:04 +02:00
miniduikboot 276f634074 Bump to released Dumpostor version 2024-07-09 21:13:30 +02:00
miniduikboot 609c30ffb4 Refactor SetColor/Name anticheat
Turns out they were broken when I disabled them as I wasn't tracking
playerinfo's properly, but this is now fixed, so the checks can be
re-enabled.

One issue with the ColorLimits checks is that it didn't account for mods
that add extra colors, this is fixed by checking if the route followed
is plausible instead of mimicking client logic and only accepting a
single answer that it expected. A false negative is possible where the
host decides to wrap back to the front but there are still custom colors
available at the end of the list. This is acceptable because Impostor
doesn't currently know the amount of colors available and this issue
isn't major enough to ask all mod authors to declare their custom color
amount to the server.

As extra colors should now be handled by this code, it makes sense to
change the category of the unknown colors check to ProtocolExtensions.
For these mods an exemption of the ColorLimits category is no longer
necessary.

Note that mods that allow duplicate colors that do not use a custom rpc
to set colors can only be supported by disabling the ColorLimits
category, this was already the case and I don't think it can be unified
with the existing check.
2024-07-07 23:44:35 +02:00
miniduikboot 5afb2ca810 Enumize RulesPresets and SpecialGameModes 2024-07-04 23:09:15 +02:00
miniduikboot 79a9f7d5dc Improve debug rpc log to log for all types 2024-07-03 23:05:46 +02:00
miniduikboot 97ed6cb83c Mark players as dead when they get a ghost role
Oversight
2024-07-03 23:04:21 +02:00
miniduikboot b3865a27e5 Let hosts handle exiles
Previously Impostor liked to kill exiled players server side to raise an
event, however as PlayerInfo is now networked, it also killed players
client side. This caused meetings to immediately conclude if the final
impostor was voted out, ruining the cutscene.

So wait for hosts to actually kill the player
2024-07-03 23:01:51 +02:00
miniduikboot d7744a2ec6 Stop hardcoding Spawn Ids 2024-07-03 21:32:11 +02:00
miniduikboot 6d1d1f4ad6 Remove too verbose log statements 2024-07-03 21:31:58 +02:00
miniduikboot a123690cdd Fix MessageWriter disposal 2024-07-03 07:10:42 +02:00
miniduikboot 8f6da3dc87 Add Message24EndGameHostMigration serialization
Looks like Innersloth added this but hasn't actually used this. Weird..

When sent it makes the new host perform a full rejoin, which gums up
Impostor's spawning logic. Fixing that causes the client to gum itself
up. Sigh.

After some testing it seems like host migration still works fine, so
this investigation wasn't needed. Comitting for posterity.
2024-06-30 23:33:29 +02:00
miniduikboot 91bc4d33fa Add extra log statements
I've been carrying these in a stash for a while. They only show up when
the Debug verbosity is shown, which is intended to prevent spamming
production logs
2024-06-30 23:29:01 +02:00
miniduikboot 7e8fc850ff Change GameDataTag to an enum
Not being an enum would be inconsistent with RpcCalls
2024-06-30 20:15:09 +02:00
miniduikboot 6fa8c965cf Refactor object (de)spawn/data fns on new base
This reduces the amount of boilerplate writer management needed
2024-06-30 14:28:46 +02:00
miniduikboot 7d8974b622 Refactor Start/FinishRpc to add GameData methods
Rpc's are a specific sort of GameData packets, so it makes sense to
split and extract a method for sending GameData packets from these functions.
2024-06-30 14:21:54 +02:00
miniduikboot 988e3f71f0 Merge pull request #601 from NikoCat233/Add-phantom-rpc-support
Add Phantom Rpcs support
2024-06-27 00:52:21 +02:00
miniduikboot 76c2e3df1f Clean up PR
- Added {} in switch/case to open a scope per item
- Reworded comments to be more in line with the other comments in this
file
2024-06-25 22:44:29 +02:00
Niko233 4f5cf7837c Make my pr's page looks nice 2024-06-24 18:07:58 +08:00
Niko233 eeab337c75 Add handler for phantom rpcs 2024-06-24 18:00:09 +08:00
Niko233 2860ef6d6f Add Phantom Rpcs support 2024-06-24 16:54:33 +08:00
miniduikboot fd94b0f732 Reset PlayerInfo on lobby return
Players get a fresh player control, so this is the perfect moment to
discharge them from their former duties
2024-06-23 00:34:56 +02:00
miniduikboot 94f30ef87d fixup! Spawn PlayerInfo's if host is not authoritive 2024-06-22 13:07:54 +02:00
miniduikboot 5cac18723d Handle SetRole properly 2024-06-22 12:53:02 +02:00
miniduikboot 19f4821c2a Sync over tasks 2024-06-21 23:05:07 +02:00
miniduikboot c48c6b3bde Sync dirty objects 2024-06-21 21:17:17 +02:00
miniduikboot cceecb0c36 Clean up owned playerinfo's when disconnecting 2024-06-20 22:26:16 +02:00
miniduikboot 01eb7bb375 Sync all server owned objects 2024-06-20 21:12:15 +02:00
miniduikboot 913b86df19 Fix compile warnings 2024-06-20 19:28:33 +02:00
miniduikboot 043549702f Set PlayerId correctly 2024-06-20 19:14:49 +02:00
miniduikboot a072d5234a Add NetId to SetName and SetColor 2024-06-20 18:37:10 +02:00
miniduikboot 264ed110a5 small cleanups 2024-06-20 18:15:24 +02:00
miniduikboot ae50126729 Spawn PlayerInfo's if host is not authoritive 2024-06-20 18:14:02 +02:00
miniduikbootandNiko233 19046daf24 Fix InnerPlayerInfo serialization
Co-Authored-By: Niko233 <139348239+NikoCat233@users.noreply.github.com>
2024-06-20 18:03:46 +02:00
miniduikboot beaf77fdbb Don't DC the client if they send an unknown flag 2024-06-19 22:45:47 +02:00
miniduikboot 0343235f0d Demote InnerGameData, promote InnerPlayerInfo
Creating a game is now possible for players that request client authority
2024-06-19 20:42:18 +02:00
miniduikboot 3856aeed03 Add sequence id's to playeroutfit 2024-06-19 20:33:53 +02:00
miniduikboot 96dbd88ef7 Implement GameOptions V8 2024-06-18 19:45:17 +02:00
miniduikboot 753f17586a Rerun Dumpostor
Will rerun later as this is a dev build. Even Dumpostor broke because of
this patch.
2024-06-18 18:07:02 +02:00
miniduikboot 520e9080f4 Prepare for 2024.6.18 update
Major changes are incoming, this doesn't yet work.
2024-06-18 17:30:44 +02:00
133 changed files with 712 additions and 64309 deletions

No files matched your search

-8
View File
@@ -8,14 +8,6 @@ The Impostor project is a reverse engineered and open source server for the game
Yes, Impostor can be used with both the Android and iOS versions of the game. You can add a custom server via a link, you can do this using the [site](https://impostor.github.io/Impostor)
## Can this be used with the console version of the game?
Sadly not, as these don't allow adding custom servers.
## Can this be used with Among Us 3D/VR?
No, it's an entirely different game with a completely different network stack. So we'd need to develop another server completely from scratch. We're currently not interested in doing this.
## How can I get started?
See [Setting up your Server](Running-the-server.md) for more information on running the server and [Client Setup](https://impostor.github.io/Impostor/) for helping your friends join in!
+10 -25
View File
@@ -1,13 +1,19 @@
# HTTP Server
Since Impostor 1.9.0 a HTTP service is included for matchmaking, which is required for clients to connect to the Impostor server.
Since Impostor 1.9.0 a HTTP service is included for matchmaking. Recent versions of Among Us require this service in order to connect correctly and not kick players after a round.
Starting from Among Us 16.0.5, you need to set up HTTPS for players to connect to your server.
Unfortunately Impostor doesn't handle SSL certificates, so you need to set up a reverse proxy.
Depending on whether you want to support mobile players, you can set up the HTTP server in one of two ways:
- Directly expose the HTTP server. Simpler, but only works if you don't want to support mobile players.
- Use a reverse proxy to expose the HTTP server. More complex, but allows mobile players to connect.
## Directly expose the HTTP server.
In config.json, set "ListenIp" to "0.0.0.0" in the "HttpServer" section. If you don't have this section, look in the example [config.json](https://github.com/Impostor/Impostor/blob/master/src/Impostor.Server/config.json)
## Use a reverse proxy
A reverse proxy allows you to forward HTTP requests from users to multiple services. If you already have one, you should configure it to add Impostor.
A reverse proxy allows you to forward HTTP requests from users to multiple services. If you already have one, you should configure it to add Impostor. This page contains an Nginx configuration you can use for reference.
If you have never set up a reverse proxy before, we recommend you to set up [Caddy](https://caddyserver.com/). It is easy to set up and comes with support for requesting SSL certificates out of the box.
@@ -59,24 +65,3 @@ server {
```
</details>
## Stop exposing Impostor's HTTP server to the internet directly
To only allow connections to Impostor's HTTP servers via the reverse proxy, we recommend to set the ListenIp of the HTTP server to 127.0.0.1:
```json
{
// NOTE: merge this snippet into the rest of your configuration
"HttpServer": {
"ListenIp": "127.0.0.1"
}
}
```
Or if you're configuring Impostor with environment variables:
```sh
IMPOSTOR_HttpServer__ListenIp=127.0.0.1
```
For more information on server configuration, see [Server-configuration.md](Server Configuration).
+9 -12
View File
@@ -10,9 +10,7 @@ To connect to the server, you need to configure and install a region file on htt
Among Us connects to the server using two network services: the (TCP) HTTP service points Among Us to the UDP service, then the UDP service hosts the actual game traffic. Because of this, Impostor uses port 22023 using **both** the TCP and UDP protocols.
To connect to your Among Us version from another PC, you need to set up a HTTP reverse proxy to support HTTPS. If you're just running a version of Impostor for testing Setup instructions for this are in the [Http Server documentation](Http-server.md).
If you want to test if your Among Us HTTP server is working, open `http://localhost:22023` (assuming you're using the default settings, change the IP and port respectively) in a browser
As the phone version of Among Us requires this HTTP connection to be secure, we recommend using a HTTP reverse proxy to terminate SSL on the HTTP service. Setup instructions for this are in the [Http Server documentation](Http-server.md).
Depending on your host you may also need to port forward Impostor to the internet or pass Impostor traffic by your firewall. Port 22023 UDP needs to be accessible for everyone that wants to play on the server, then you also need to portforward your HTTP reverse proxy or port 22023 TCP if you don't use a reverse proxy. As port forwarding changes per host or router configuration, port forwarding is not covered by this guide.
@@ -23,9 +21,8 @@ Depending on your host you may also need to port forward Impostor to the interne
3. Extract the zip.
4. Modify `config.json` to your liking. Documentation can be found [here](Server-configuration.md). You need to at least change `PublicIp` to the address people will connect to your server to.
5. Run `Impostor.Server` (Linux/macOS) or `Impostor.Server.exe` (Windows)
6. Set up a reverse proxy to support HTTPS, so you can connect to your server from another device. See [reverse proxy configuration](Http-server.md)
7. (OPTIONAL - Linux) Configure a systemd definition file and enable the service to start on boot, see [systemd configuration](Server-configuration.md#systemd)
6. (OPTIONAL - Linux) Configure a systemd definition file and enable the service to start on boot, see [systemd configuration](Server-configuration.md#systemd)
7. (OPTIONAL) Set up a reverse proxy to support HTTPS, so mobile phones can connect, see [reverse proxy configuration](Http-server.md)
## Using Docker
@@ -37,7 +34,7 @@ Docker is a program that allows you to run programs like Impostor in a container
After installing Docker, you can just start a Docker container with `docker run`:
```
docker run -p 127.0.0.1:22023:22023/tcp -p 22023:22023/udp -e IMPOSTOR_Server__PublicIp=your.public.ip.here aeonlucid/impostor:nightly
docker run -p 22023:22023/tcp -p 22023:22023/udp -e IMPOSTOR_Server__PublicIp=your.public.ip.here aeonlucid/impostor:nightly
```
Please replace `your.public.ip.here` with the public IP address of your server. This is the address Among Us will try to reach your server at.
@@ -46,7 +43,7 @@ To configure the docker container, either use environment variables or mount con
## Using Docker Compose
Docker Compose allows you to start a Docker container using a predefined configuration. This is an example configuration you can continue on:
Docker Compose allows you to start a Docker container using a prefined configuration. This is an example configuration you can continue on:
```
version: '3.4'
@@ -56,12 +53,12 @@ services:
image: aeonlucid/impostor:nightly
container_name: impostor
ports:
- 127.0.0.1:22023:22023/tcp # Set up your own reverse proxy to terminate HTTPS
- 22023:22023/tcp # Add "127.0.0.1:" if you're using a reverse proxy to terminate HTTPS
- 22023:22023/udp
environment: # Either configure Impostor using environment variables or mount config.json in your container
environment: # Either configure Impostor using environment variables or mount a copy of config.json
- IMPOSTOR_Server__PublicIp=your.public.ip.here
volumes:
- /path/to/local/config.json:/app/config.json # Mount config.json
- /path/to/local/config.json:/app/config.json # For easy editing of the config
- /path/to/local/plugins:/app/plugins # Only needed if using plugins
- /path/to/local/libraries:/app/libraries # Only needed if using external libraries (some plugins may need this)
- /path/to/local/libraries:/app/libraries # Only needed if using external libraries
```
+18 -21
View File
@@ -1,5 +1,7 @@
# Server configuration
Some information about all the possible configurations. Click [here](https://github.com/Impostor/Impostor/blob/master/src/Impostor.Server/full-config-example.json) to see all the possible config options.
## Options
### Required Server Configuration
@@ -25,25 +27,20 @@ Impostor has an Http Server that is used by recent versions of Among Us to conne
Impostor has an Anticheat that makes it possible to kick cheaters from games automatically. Note that the anticheat is tuned on the vanilla version of the game, so client-side modifications could trigger the Anticheat if you're playing with them.
| Key | Default | Value |
|-------------------------------|---------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **Enabled** | `true` | Whether the anticheat should be enabled. |
| **BanIpFromGame** | `true` | When anticheat is enabled and a player is caught hacking, they will be kicked from the server. If this value is set to `true`, the player will be banned instead and will not be able to rejoin that specific game. |
| **AllowCheatingHosts** | `"Never"` | Configure whether hosts are allowed to cheat. "Never" forbids it, "Always" allows it. "IfRequested" allows hosts to cheat if they connect with the DisableServerAuthorityFlag set. |
| **AllowHostOnlyExtensions** | "IfRequested" | Configure whether [Host-Only extensions](https://github.com/Innersloth-LLC/AmongUsModdingInformation#host-only-mods) are allowed in all games ("Always"), +25 games only ("IfRequested") or by nobody ("Never") |
| **EnableGameFlowChecks** | `true` | Enable checks that check if certain actions are done in the appropriate order or at the appropriate moment in the game. This includes changing cosmetics while in game or murdering too fast. |
| **EnableInvalidObjectChecks** | `true` | Enables checks that check if network objects are spawned properly. Disabling this option also implies disabling EnableRoleChecks. |
| **EnableMustBeHostChecks** | `true` | Enables checks that check if players are the host before they can do actions that require them to be host of the game. This includes starting the game and spawning objects. |
| **EnableColorLimitChecks** | `true` | Enables checks that checks if players request colors that are already in use. |
| **EnableNameLimitChecks** | `true` | Enables checks that checks if player names have a length that is possible to set using the user interface. |
| **EnableItemLimitChecks** | `true` | Enables checks for item counts that cannot be exceeded in the official clients. |
| **EnableOwnershipChecks** | `true` | Enables checks that check if players are allowed to perform a certain action on themself or another player. |
| **EnableRoleChecks** | `true` | Enables checks that check if players have the correct role when performing certain role abilities like venting or murdering. |
| **EnableTargetChecks** | `true` | Enables checks that check if certain packets to everyone that should only have been sent to certain players or vice versa. This includes sending votes or network objects. |
| **EnableIdentifierChecks** | `true` | Enables checks that verify if the friendcode and puid a host claims for a player in their PlayerInfo match the ones known for that player. |
| **ForbidProtocolExtensions** | `true` | If disabled allows players to send network packets that go beyond the network packets sent by the vanilla game. This is necessary for most mods that need all players to install it. |
| **EnablePacketSizeChecks** | `true` | Enables checks that verify if network messages exceed the maximum allowed size. |
| **PacketSizeLimit** | `1203` | The maximum allowed size (in bytes) for a network message. The official servers of Among Us requires that a Hazel packet is < 1204 bytes, excluding headers. |
| Key | Default | Value |
|----------------------------|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **Enabled** | `true` | Whether the anticheat should be enabled. |
| **BanIpFromGame** | `true` | When anticheat is enabled and a player is caught hacking, they will be kicked from the server. If this value is set to `true`, the player will be banned instead and will not be able to rejoin that specific game. |
| **AllowCheatingHosts** | `"Never"` | Configure whether hosts are allowed to cheat. "Never" forbids it, "Always" allows it. "IfRequested" allows hosts to cheat if they connect with the DisableServerAuthorityFlag set. |
| **EnableGameFlowChecks** | `true` | Enable checks that check if certain actions are done in the appropriate order or at the appropriate moment in the game. This includes changing cosmetics while in game or murdering too fast. |
| **EnableMustBeHostChecks** | `true` | Enables checks that check if players are the host before they can do actions that require them to be host of the game. This includes starting the game and spawning objects. |
| **EnableColorLimitChecks** | `true` | Enables checks that checks if players request colors that are already in use. |
| **EnableNameLimitChecks** | `true` | Enables checks that checks if player names have a length that is possible to set using the user interface. |
| **EnableOwnershipChecks** | `true` | Enables checks that check if players are allowed to perform a certain action on themself or another player. |
| **EnableRoleChecks** | `true` | Enables checks that check if players have the correct role when performing certain role abilities like venting or murdering. |
| **EnableTargetChecks** | `true` | Enables checks that check if certain packets to everyone that should only have been sent to certain players or vice versa. This includes sending votes or network objects. |
| **ForbidProtocolExtensions** | `true` | If disabled allows players to send network packets that go beyond the network packets sent by the vanilla game. This is necessary for most mods that need all players to install it. |
### Compatibility
@@ -103,11 +100,11 @@ Other Serilog sinks are also supported, but are out of scope for this documentat
### File
The `config.json` file contains all the configurable options.
The simplest option to configure is by using the `config.json` file next to the server executable. For all possible options see the [full-config-example.json](https://github.com/Impostor/Impostor/blob/master/src/Impostor.Server/full-config-example.json) file.
### Environment variables
If you're unable to edit the `config.json` file, you can instead set Environment variables to configure Impostor. The general pattern for each variable is `IMPOSTOR_SectionName__VariableName`. For example, to disable the anticheat, you can set the environment variable `IMPOSTOR_AntiCheat__Enabled=false`. Here are some more examples:
If you're unable to edit the config.json file, you can instead set Environment variables to configure Impostor. The general pattern for each variable is `IMPOSTOR_SectionName__VariableName`. For example, to disable the anticheat, you can set the environment variable `IMPOSTOR_AntiCheat__Enabled=false`. Here are some more examples:
```
IMPOSTOR_Server__PublicIp=127.0.0.1
-6
View File
@@ -47,12 +47,6 @@ Also check if the port Impostor (ListenPort) is listening on is correctly port-f
Please check that you only have **working** plugins in the `plugins` folder.
This error can be caused by non-plugin files or plugins that are not working correctly.
## Disconnected with `You disconnected from the server. If this happens often, check your network strength. This may also be a server issue`
Usually this means that Among Us couldn't connect to Impostor's HTTP server.
Open the address of your server in a web browser, it should show you a small page confirming that Impostor is available.
## My question is not yet answered and I'm still having problems!
That's unfortunate. Join the [Impostor Discord](https://discord.gg/Mk3w6Tb), ask your question there and we'll try to help you out. Note that we're not always available, so it may take some time to get an answer. To make answering your question easier, please add the following details:
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>11</LangVersion>
<VersionPrefix>1.10.9</VersionPrefix>
<VersionPrefix>1.10.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<EnforceCodeStyleInBuild Condition="$(MSBuildProjectName)!='Hazel'">true</EnforceCodeStyleInBuild>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
@@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
<PackageReference Include="System.Text.Json" Version="8.0.5" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="System.Text.Json" Version="8.0.0" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" PrivateAssets="all" GeneratePathProperty="true" />
@@ -85,14 +85,6 @@ public sealed class SourceGenerator : IIncrementalGenerator
enumGenerator.Generate("SystemTypes", underlyingType: CSharpEnumUnderlyingType.Byte);
enumGenerator.Generate("Language", sourceName: "SupportedLangs");
enumGenerator.Generate("TaskTypes");
enumGenerator.Generate("BoolOptionNames", "Impostor.Api.Innersloth.GameFilters");
enumGenerator.Generate("ByteOptionNames", "Impostor.Api.Innersloth.GameFilters");
enumGenerator.Generate("CategorizedOptionNames", "Impostor.Api.Innersloth.GameFilters");
enumGenerator.Generate("FloatArrayOptionNames", "Impostor.Api.Innersloth.GameFilters");
enumGenerator.Generate("FloatOptionNames", "Impostor.Api.Innersloth.GameFilters");
enumGenerator.Generate("Int32ArrayOptionNames", "Impostor.Api.Innersloth.GameFilters");
enumGenerator.Generate("Int32OptionNames", "Impostor.Api.Innersloth.GameFilters");
enumGenerator.Generate("UInt32OptionNames", "Impostor.Api.Innersloth.GameFilters");
enumGenerator.Generate("RpcCalls", "Impostor.Api.Net.Inner", underlyingType: CSharpEnumUnderlyingType.Byte);
@@ -60,9 +60,9 @@
},
"System.Text.Json": {
"type": "Direct",
"requested": "[8.0.5, )",
"resolved": "8.0.5",
"contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==",
"requested": "[8.0.0, )",
"resolved": "8.0.0",
"contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "8.0.0",
"System.Buffers": "4.5.1",
@@ -152,6 +152,6 @@
}
}
},
".NETStandard,Version=v2.0/win-x64": {}
".NETStandard,Version=v2.0/linux-x64": {}
}
}
-16
View File
@@ -1,14 +1,10 @@
namespace Impostor.Api;
// NOTE: when adding items to this enum, add them to the bottom for API stability
public enum CheatCategory
{
/// <summary>A packet used a part of the network protocol that is unknown to Impostor, like a custom RPC.</summary>
ProtocolExtension,
/// <summary>A host-only mod extension is used outside of host-authoritive mode.</summary>
HostOnlyExtension,
/// <summary>A packet was sent at an inappropriate moment.</summary>
GameFlow,
@@ -30,18 +26,6 @@ public enum CheatCategory
/// <summary>A packet was sent to a player that should be broadcasted, or vice versa.</summary>
Target,
/// <summary>A packet was sent on an invalid network object, like a PlayerControl without PlayerInfo.</summary>
InvalidObject,
/// <summary>A packet was sent that exceeded the maximum allowed RPC size.</summary>
PacketSize,
/// <summary>Legacy category for unsorted anticheat checks.</summary>
Other,
/// <summary>A packet was sent with more items than possible in the game.</summary>
ItemLimits,
/// <summary>A packet contained an identifier (friendcode or puid) that does not match the one known for that player.</summary>
Identifiers,
}
+1 -13
View File
@@ -1,4 +1,4 @@
namespace Impostor.Api.Config
namespace Impostor.Api.Config
{
public class AntiCheatConfig
{
@@ -10,32 +10,20 @@ namespace Impostor.Api.Config
public CheatingHostMode AllowCheatingHosts { get; set; } = CheatingHostMode.Never;
public CheatingHostMode AllowHostOnlyExtensions { get; set; } = CheatingHostMode.IfRequested;
public bool EnableGameFlowChecks { get; set; } = true;
public bool EnableMustBeHostChecks { get; set; } = true;
public bool EnableInvalidObjectChecks { get; set; } = true;
public bool EnableColorLimitChecks { get; set; } = true;
public bool EnableNameLimitChecks { get; set; } = true;
public bool EnableItemLimitChecks { get; set; } = true;
public bool EnableOwnershipChecks { get; set; } = true;
public bool EnableRoleChecks { get; set; } = true;
public bool EnableTargetChecks { get; set; } = true;
public bool EnableIdentifierChecks { get; set; } = true;
public bool ForbidProtocolExtensions { get; set; } = true;
public bool EnablePacketSizeChecks { get; set; } = true;
public int PacketSizeLimit { get; set; } = 1203;
}
}
+1 -1
View File
@@ -13,7 +13,7 @@ namespace Impostor.Api.Config
public ushort PublicPort { get; set; } = 22023;
public string ListenIp { get; set; } = "0.0.0.0";
public string ListenIp { get; set; } = "127.0.0.1";
public ushort ListenPort { get; set; } = 22023;
@@ -1,4 +1,4 @@
using Impostor.Api.Net.Inner.Objects;
using Impostor.Api.Net.Inner.Objects;
namespace Impostor.Api.Events.Meeting
{
@@ -13,15 +13,5 @@ namespace Impostor.Api.Events.Meeting
/// Gets a value indicating whether meeting result is a tie.
/// </summary>
bool IsTie { get; }
/// <summary>
/// Gets a value indicating whether a Judge overruled the vote result.
/// </summary>
bool WasOverruled { get; }
/// <summary>
/// Gets the nonce of the winning Judge overrule, or 0 if the meeting wasn't overruled.
/// </summary>
ushort OverrideId { get; }
}
}
@@ -1,4 +1,4 @@
namespace Impostor.Api.Events.Player
namespace Impostor.Api.Events.Player
{
public interface IPlayerChatEvent : IPlayerEvent, IEventCancelable
{
@@ -6,12 +6,5 @@ namespace Impostor.Api.Events.Player
/// Gets the message sent by the player.
/// </summary>
string Message { get; }
/// <summary>
/// Gets or sets a value indicating whether the message is sent to
/// all players (true) or only to the host (false).
/// To not send this message at all, cancel this event instead.
/// </summary>
bool SendToAllPlayers { get; set; }
}
}
+5 -30
View File
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Net;
using System.Threading.Tasks;
using Impostor.Api.Innersloth;
@@ -48,11 +47,6 @@ namespace Impostor.Api.Games
/// </remarks>
bool IsHostAuthoritive { get; }
/// <summary>
/// Gets the mod GUID that the game was registered with through the AMCI.
/// </summary>
Guid? ModGuid { get; }
IClientPlayer? GetClientPlayer(int clientId);
T? FindObjectByNetId<T>(uint netId)
@@ -107,41 +101,22 @@ namespace Impostor.Api.Games
/// <returns>A <see cref="ValueTask" /> representing the asynchronous operation.</returns>
ValueTask SendToAsync(IMessageWriter writer, int id);
/// <summary>
/// Start a GameData(To) message.
/// </summary>
/// <remarks>Use with caution, recommended only for advanced developers.</remarks>
/// <param name="targetClientId">The client to target if needed, `null` if the message should be sent to all players.</param>
/// <param name="type">Message type of the message.</param>
/// <returns>A <see cref="IMessageWriter" /> that you can fill and send using <see cref="FinishGameDataAsync"/>.</returns>
IMessageWriter StartGameData(int? targetClientId = null, MessageType type = MessageType.Reliable);
/// <summary>
/// Finishes GameData message and sends it to either the target or all players.
/// </summary>
/// <remarks>Use with caution, recommended only for advanced developers.</remarks>
/// <param name="writer">MessageWriter received from <see cref="StartGameData"/>.</param>
/// <param name="targetClientId">Same target ClientId passed to StartGameData.</param>
/// <returns>Task that sends the packet.</returns>
ValueTask FinishGameDataAsync(IMessageWriter writer, int? targetClientId = null);
/// <summary>
/// Creates a MessageWriter with GameData header.
/// </summary>
/// <remarks>Use with caution, recommended only for advanced developers.</remarks>
/// <param name="targetNetId">Net id of the InnerNetObject.</param>
/// <param name="callId">Rpc id of the message.</param>
/// <param name="targetClientId">The client to target if needed, `null` if the message should be sent to all players.</param>
/// <param name="targetClientId">Client id of GameDataTo's target.</param>
/// <param name="type">Message type of the message.</param>
/// <returns>A <see cref="IMessageWriter" /> that you can fill with rpc data and send using <see cref="FinishRpcAsync"/>.</returns>
IMessageWriter StartRpc(uint targetNetId, RpcCalls callId, int? targetClientId = null, MessageType type = MessageType.Reliable);
IMessageWriter StartRpc(uint targetNetId, RpcCalls callId, int? targetClientId, MessageType type = MessageType.Reliable);
/// <summary>
/// Finishes rpc message and sends it to either the target or all players.
/// Finishes rpc message and sends it to the target.
/// </summary>
/// <remarks>Use with caution, recommended only for advanced developers.</remarks>
/// <param name="writer">Message writer of the rpc.</param>
/// <param name="targetClientId">Same target client id passed to <see cref="StartRpc"/>.</param>
/// <param name="targetClientId">Id of the receiving client.</param>
/// <returns>A <see cref="ValueTask" /> representing the asynchronous operation.</returns>
ValueTask FinishRpcAsync(IMessageWriter writer, int? targetClientId = null);
}
+1 -1
View File
@@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
<PackageReference Include="Impostor.Hazel.Abstractions" Version="1.0.1" />
<PackageReference Include="Impostor.Hazel.Abstractions" Version="1.0.0" />
<ProjectReference Include="..\Impostor.Api.Innersloth.Generator\Impostor.Api.Innersloth.Generator.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
<AdditionalFiles Include="Innersloth/Data/**/*.json" />
@@ -2,13 +2,8 @@ namespace Impostor.Api.Innersloth.Customization
{
public class PlayerOutfit
{
// Magic value that is assigned by default when the outfit is initially created. This is not
// `null` because existing API already exposed this magic value. It's also not 0 (which is
// the value exposed when serializing) because SetColor anticheat checks exist.
private const ColorType UnknownColor = (ColorType)(-1);
private string _playerName = string.Empty;
private ColorType _color = UnknownColor;
private ColorType _color = (ColorType)(-1);
private string _hatId = "missing";
private string _petId = "missing";
private string _skinId = "missing";
@@ -20,74 +15,72 @@ namespace Impostor.Api.Innersloth.Customization
public string PlayerName
{
get => _playerName;
internal set => SetField(ref _playerName, value);
set => SetField(ref _playerName, value);
}
public ColorType Color
{
get => _color;
internal set => SetField(ref _color, value);
set => SetField(ref _color, value);
}
public string HatId
{
get => _hatId;
internal set => SetField(ref _hatId, value);
set => SetField(ref _hatId, value);
}
public string PetId
{
get => _petId;
internal set => SetField(ref _petId, value);
set => SetField(ref _petId, value);
}
public string SkinId
{
get => _skinId;
internal set => SetField(ref _skinId, value);
set => SetField(ref _skinId, value);
}
public string VisorId
{
get => _visorId;
internal set => SetField(ref _visorId, value);
set => SetField(ref _visorId, value);
}
public string NamePlateId
{
get => _namePlateId;
internal set => SetField(ref _namePlateId, value);
set => SetField(ref _namePlateId, value);
}
internal byte HatSequenceId { get; set; } = 0;
public byte HatSequenceId { get; internal set; } = 0;
internal byte PetSequenceId { get; set; } = 0;
public byte PetSequenceId { get; internal set; } = 0;
internal byte SkinSequenceId { get; set; } = 0;
public byte SkinSequenceId { get; internal set; } = 0;
internal byte VisorSequenceId { get; set; } = 0;
public byte VisorSequenceId { get; internal set; } = 0;
internal byte NamePlateSequenceId { get; set; } = 0;
public byte NamePlateSequenceId { get; internal set; } = 0;
/// <summary>
/// Gets a value indicating whether a player outfit is complete or whether it needs to receive additional cosmetics.
/// </summary>
/// <returns>true if the outfit is incomplete, false if the outfit is complete.</returns>
public bool IsIncomplete => string.IsNullOrEmpty(PlayerName)
|| Color == UnknownColor
|| HatId == "missing"
|| PetId == "missing"
|| SkinId == "missing"
|| VisorId == "missing"
|| NamePlateId == "missing";
public bool IsIncomplete
{
get
{
if (!string.IsNullOrEmpty(PlayerName) && Color != (ColorType)(-1) && HatId != "missing" && PetId != "missing" && SkinId != "missing" && VisorId != "missing")
{
return NamePlateId == "missing";
}
return true;
}
}
public void Serialize(IMessageWriter writer)
{
writer.Write(PlayerName);
// Follow officials by not sending a color value that is out of range. Sending -1 can cause exceptions on the client side.
writer.WritePacked(Color == UnknownColor ? 0 : (int)Color);
writer.WritePacked((int)Color);
writer.Write(HatId);
writer.Write(PetId);
writer.Write(SkinId);
File diff suppressed because it is too large. Load diff
@@ -5,7 +5,7 @@
"4": "PlayerControl",
"5": "MiraShipStatus",
"6": "PolusShipStatus",
"7": "SkeldShipStatus",
"7": "ShipStatus",
"8": "AirshipStatus",
"9": "HideAndSeekManager",
"10": "NormalGameManager",
@@ -1,17 +0,0 @@
{
"Invalid": 0,
"VisualTasks": 1,
"GhostsDoTasks": 2,
"ConfirmImpostor": 3,
"AnonymousVotes": 4,
"IsDefaults": 5,
"UseFlashlight": 6,
"SeekerFinalVents": 7,
"SeekerFinalMap": 8,
"SeekerPings": 9,
"ShowCrewmateNames": 10,
"Roles": 11,
"ShapeshifterLeaveSkin": 1000,
"ImpostorsCanSeeProtect": 1100,
"NoisemakerImpostorAlert": 1300
}
@@ -1,4 +0,0 @@
{
"Invalid": 0,
"MapId": 1
}
@@ -1,14 +0,0 @@
{
"KillCooldown": 0,
"PlayerSpeed": 1,
"EmergencyMeetingCount": 2,
"EmergencyMeetingCooldown": 3,
"DiscussionTime": 4,
"VotingTime": 5,
"CrewmateVision": 6,
"HidingTime": 7,
"MaxTimeInVent": 8,
"ImposterVision": 9,
"FinalHideTime": 10,
"FinalHideImposterSpeed": 11
}
@@ -1,4 +0,0 @@
{
"Invalid": 0,
"KillDistances": 1
}
@@ -1,32 +0,0 @@
{
"Invalid": 0,
"KillCooldown": 1,
"PlayerSpeedMod": 2,
"ImpostorLightMod": 3,
"CrewLightMod": 4,
"CrewmateTimeInVent": 100,
"FinalEscapeTime": 101,
"EscapeTime": 102,
"SeekerFinalSpeed": 103,
"MaxPingTime": 104,
"CrewmateFlashlightSize": 105,
"ImpostorFlashlightSize": 106,
"ShapeshifterCooldown": 1000,
"ShapeshifterDuration": 1001,
"ProtectionDurationSeconds": 1100,
"GuardianAngelCooldown": 1101,
"ScientistCooldown": 1200,
"ScientistBatteryCharge": 1201,
"EngineerCooldown": 1300,
"EngineerInVentMaxTime": 1301,
"PhantomCooldown": 1500,
"PhantomDuration": 1501,
"TrackerCooldown": 1550,
"TrackerDuration": 1551,
"TrackerDelay": 1552,
"NoisemakerAlertDuration": 1600,
"ViperDissolveTime": 1601,
"DetectiveSuspectLimit": 1602,
"JudgeTaskRequirementPercentage": 1620,
"SpiritGuideCooldownSeconds": 1640
}
@@ -1,11 +1,11 @@
{
"CrewmatesByVote": 0,
"CrewmatesByTask": 1,
"ImpostorsByVote": 2,
"ImpostorsByKill": 3,
"ImpostorsBySabotage": 4,
"HumansByVote": 0,
"HumansByTask": 1,
"ImpostorByVote": 2,
"ImpostorByKill": 3,
"ImpostorBySabotage": 4,
"ImpostorDisconnect": 5,
"CrewmateDisconnect": 6,
"HideAndSeek_CrewmatesByTimer": 7,
"HideAndSeek_ImpostorsByKills": 8
"HumansDisconnect": 6,
"HideAndSeek_ByTimer": 7,
"HideAndSeek_ByKills": 8
}
@@ -1,5 +0,0 @@
{
"Invalid": 0,
"MaxImpostors": 1,
"MinPlayers": 2
}
@@ -1,21 +0,0 @@
{
"Invalid": 0,
"NumImpostors": 1,
"KillDistance": 2,
"NumEmergencyMeetings": 3,
"EmergencyCooldown": 4,
"DiscussionTime": 5,
"VotingTime": 6,
"MaxImpostors": 7,
"MinPlayers": 8,
"MaxPlayers": 9,
"NumCommonTasks": 10,
"NumShortTasks": 11,
"NumLongTasks": 12,
"TaskBarMode": 13,
"Tag": 14,
"CrewmatesRemainingForVitals": 100,
"CrewmateVentUses": 101,
"ImpostorPlayerID": 102,
"RulePreset": 200
}
@@ -9,9 +9,5 @@
"ImpostorGhost": 7,
"Noisemaker": 8,
"Phantom": 9,
"Tracker": 10,
"Detective": 12,
"Viper": 18,
"Judge": 19,
"SpiritGuide": 21
"Tracker": 10
}
@@ -8,15 +8,15 @@
"SetName": 6,
"CheckColor": 7,
"SetColor": 8,
"SetHat_Deprecated": 9,
"SetSkin_Deprecated": 10,
"SetHat": 9,
"SetSkin": 10,
"ReportDeadBody": 11,
"MurderPlayer": 12,
"SendChat": 13,
"StartMeeting": 14,
"SetScanner": 15,
"SendChatNote": 16,
"SetPet_Deprecated": 17,
"SetPet": 17,
"SetStartCounter": 18,
"EnterVent": 19,
"ExitVent": 20,
@@ -33,8 +33,8 @@
"SendQuickChat": 33,
"BootFromVent": 34,
"UpdateSystem": 35,
"SetVisor_Deprecated": 36,
"SetNamePlate_Deprecated": 37,
"SetVisor": 36,
"SetNamePlate": 37,
"SetLevel": 38,
"SetHatStr": 39,
"SetSkinStr": 40,
@@ -59,7 +59,5 @@
"CheckVanish": 62,
"StartVanish": 63,
"CheckAppear": 64,
"StartAppear": 65,
"QueueOverruleVotes": 66,
"SpiritGuideMessage": 67
"StartAppear": 65
}
@@ -626,14 +626,6 @@
"SanctionSelfHarmPromotion": 1720,
"SanctionRepeatOffender10": 1721,
"SanctionUnknown": 1722,
"ReplicatorAbility": 1800,
"ReplicatorRole": 1801,
"ReplicatorBlurb": 1802,
"ReplicatorBlurbMed": 1803,
"ReplicatorBlurbLong": 1804,
"ReplicatorCooldown": 1805,
"ReplicatorDuration": 1806,
"ReplicatorQuantity": 1807,
"ScreenShakeOption": 1900,
"FeaturedItems": 1901,
"FeaturedBundles": 1902,
@@ -1387,9 +1379,6 @@
"MissingGuardianEmailText": 3325,
"AprilFoolsModeToggle": 3326,
"LobbyChangeSettingNotification": 3327,
"LoadingBarLoading": 3328,
"LoadingBarGameStart": 3329,
"LoadingBarGameStartWaitingPlayers": 3330,
"ImpostorsCategory": 3350,
"RolesCategory": 3351,
"MeetingsCategory": 3352,
@@ -1416,10 +1405,6 @@
"StandardRulesPresetDescriptionHideAndSeek": 3373,
"GameModeStandardSeek": 3374,
"HostYouLabel": 3375,
"GamePresetsPopupTitle": 3376,
"GamePresetsPopupText": 3377,
"GamePresetsPopupContinue": 3378,
"GamePresetsPopupBack": 3379,
"MiningPit": 3400,
"Jungle": 3401,
"BuildSandcastle": 3402,
@@ -1454,9 +1439,6 @@
"CookFish": 3431,
"PrepVegetables": 3432,
"MushroomMixupName": 3433,
"EosAccountSilentMergeFail": 3434,
"AskForEosAccount": 3435,
"KwsCreateFail": 3436,
"GameType": 3500,
"GameTypeError": 3501,
"GameTypeClassic": 3502,
@@ -1497,192 +1479,5 @@
"QCLobbyRolePhantoms": 3537,
"QCSelfWasTracking": 3538,
"QCSelfGoingToNoisemaker": 3539,
"QCSelfSawRoleInLocation": 3540,
"QCCoreSettings": 3541,
"QCRolesGalore": 3542,
"QCPitchDark": 3543,
"QCFlashlight": 3544,
"QCPleaseWait": 3545,
"QCWaitMinute": 3546,
"QCLobbyClosing": 3547,
"QCChangeCosmetics": 3548,
"QCWaitingPlayers": 3549,
"QCLetsWaitPlayers": 3550,
"ServerLabel": 3551,
"JoinLobby": 3552,
"ChatLabel": 3553,
"ToolTipDefault": 3554,
"LevelLabel": 3555,
"NoneLowercaseLabel": 3556,
"ToolTipClassic": 3557,
"ToolTipHide": 3558,
"ToolTipMap": 3559,
"ToolTipCapacity": 3560,
"ToolTipLevel": 3561,
"ToolTipServer": 3562,
"ToolTipCrossplay": 3563,
"ToolTipNoCrossplay": 3564,
"ToolTipLanguage": 3565,
"ConfirmSettings": 3566,
"ConfirmSettingsTooltip": 3567,
"EnterCodeElipsis": 3568,
"ToolTipChatTab": 3569,
"DropshipsLabel": 3570,
"FiltersActive": 3571,
"ClearFilters": 3572,
"MoreLabel": 3573,
"HostNounEmpty": 3574,
"ToolTipSkeld": 3575,
"ToolTipMIRA": 3576,
"ToolTipPolus": 3577,
"ToolTipAirship": 3578,
"ToolTipFungle": 3579,
"FilterLow": 3580,
"FilterMed": 3581,
"FilterHigh": 3582,
"FilterVeryHigh": 3583,
"FilterLong": 3584,
"FilterNone": 3585,
"FilterPlayerLevel": 3586,
"RefreshLabel": 3587,
"JoinGameLabel": 3588,
"FilterClearText": 3589,
"MatchesFoundLabel": 3590,
"FilterGameTooltip": 3591,
"FilterMapTooltip": 3592,
"FilterImpostorTooltip": 3593,
"FilterRoleTooltip": 3594,
"FilterSpeedTooltip": 3595,
"FilterKillCDTooltip": 3596,
"FilterVotingTooltip": 3597,
"FilterVisualTaskTooltip": 3598,
"FilterAnonVotesTooltip": 3599,
"FilterConfirmEjectTooltip": 3600,
"FilterLevelTooltip": 3601,
"FilterCrossplayTooltip": 3602,
"FilterDefaultTooltip": 3603,
"FilterFlashlightTooltip": 3604,
"FilterHidingTimeTooltip": 3605,
"FilterFinalTimeTooltip": 3606,
"FilterMaxVentTooltip": 3607,
"FilterBeginner": 3608,
"FilterIntermediate": 3609,
"FilterExpert": 3610,
"FilterTag": 3611,
"FilterTagTooltip": 3612,
"TooltipTag": 3613,
"SelectedLabel": 3614,
"TooltipSpeedInfo": 3615,
"TooltipKillCDInfo": 3616,
"TooltipVotingInfo": 3617,
"TooptipHidingTimeInfo": 3618,
"TooltipFinalTimeInfo": 3619,
"FilterNoMaps": 3620,
"MaxFilters": 3621,
"XboxCommsMultiplayerError": 3700,
"XboxCommsUGError": 3701,
"XboxCommsCreateGameError": 3702,
"XboxCommsSearchError": 3703,
"XboxCommsJoinError": 3704,
"WatchAdBody": 3800,
"WatchAdTitle": 3801,
"WatchAd": 3802,
"RewardAdTitle": 3803,
"RewardAdBody1": 3804,
"RewardAdBody2": 3805,
"WatchAdErrorBody": 3806,
"WatchAdErrorTitle": 3807,
"DetectiveRole": 4000,
"DetectiveAbility": 4001,
"DetectiveAbilityNotes": 4002,
"DetectiveBlurb": 4003,
"DetectiveBlurbMed": 4004,
"DetectiveBlurbLong": 4005,
"DetectiveNotesEmpty": 4006,
"DetectiveNotesFoundDead": 4007,
"DetectiveNotesSuspectInfo": 4008,
"DetectiveNearLocation": 4009,
"DetectiveNotesKiller": 4010,
"StatsDetectiveQuestioned": 4011,
"StatsDetectiveCasesFilled": 4012,
"DetectiveSuspectLimit": 4013,
"RolesHelp_Detective_01": 4014,
"RolesHelp_Detective_02": 4015,
"ViperRole": 4037,
"ViperBlurb": 4038,
"ViperBlurbMed": 4039,
"ViperBlurbLong": 4040,
"ViperDissolveTime": 4041,
"ViperAbility": 4042,
"StatsViperBodiesDissolved": 4043,
"RolesHelp_Viper_01": 4044,
"RolesHelp_Viper_02": 4045,
"QCWhereWasDead": 4060,
"QCInterrogateCrew": 4061,
"QCInterrogated": 4062,
"QCBodyDissolved": 4063,
"QCBodyVeryDissolved": 4064,
"QCBodyAlmostDissolved": 4065,
"QCDetectives": 4066,
"QCVipers": 4067,
"DetectiveNotesTitleVictim": 4068,
"DetectiveNotesTitleFoundDead": 4069,
"DetectiveNotesTitleKiller": 4070,
"DetectiveNotesTitleSuspects": 4071,
"DetectiveNotesTitleLocationsAtTimeOfDeath": 4072,
"DetectiveNotesPromptPreposition": 4073,
"DetectiveNotesPromptLocation": 4074,
"DetectiveNotesPromptImpostor": 4075,
"DetectiveNotesPromptSuspect": 4076,
"DetectiveNotesPrepositionIn": 4077,
"DetectiveNotesPrepositionBy": 4078,
"DetectiveNotesPrepositionMaybe": 4079,
"DetectiveNotesTitlePostIt": 4080,
"DetectiveNotesPostIt": 4081,
"DetectiveNotesSuspectNumber": 4082,
"AprilFoolsMode": 4083,
"MatchInfoGuideTitle": 4084,
"MatchInfoGuidePlayersLabel": 4085,
"MatchInfoGuideNoRolesMessage": 4086,
"JudgeRole": 4090,
"JudgeAbility": 4091,
"JudgeBlurb": 4092,
"JudgeBlurbMed": 4093,
"JudgeBlurbLong": 4094,
"JudgeTaskRequirement": 4095,
"RolesHelp_Judge_01": 4096,
"RolesHelp_Judge_02": 4097,
"JudgeAbilityUnlocked": 4098,
"JudgeAbilityProgress": 4099,
"JudgeCourtAdjourned": 4100,
"JudgeHasSpoken": 4101,
"StatsJudgeSuccessfulOverrules": 4102,
"StatsJudgeFailedOverrules": 4103,
"QCJudges": 4104,
"QCJudgeOverrule": 4105,
"QCJudgePlease": 4106,
"QCJudgeWillOverrule": 4107,
"JudgeBeatYouToIt": 4108,
"SpiritGuideRole": 4120,
"SpiritGuideAbility": 4121,
"SpiritGuideBlurb": 4122,
"SpiritGuideBlurbMed": 4123,
"SpiritGuideBlurbLong": 4124,
"SpiritGuideCooldown": 4125,
"SpiritGuideAbilityCancel": 4126,
"SpiritGuideAbilitySend": 4127,
"SpiritGuideAbilityRefresh": 4128,
"StatsSpiritGuideSentMessage": 4129,
"RolesHelp_SpiritGuide_01": 4130,
"RolesHelp_SpiritGuide_02": 4131,
"QCInfluencerMessage": 4132,
"QCBecauseInfluencer": 4133,
"QCAnyInfluencerMessage": 4134,
"QCInfluencers": 4135,
"RedeemCodeLabel": 4200,
"CodeLengthLabel": 4201,
"CodeErrorLabel": 4202,
"CodeAlreadyRedeemedLabel": 4203,
"CodeRedeemPopupLabel": 4204,
"HorseModeToggle": 4300
"QCSelfSawRoleInLocation": 3540
}
@@ -1,4 +0,0 @@
{
"Invalid": 0,
"Keywords": 1
}
+2 -2
View File
@@ -1,5 +1,5 @@
{
"dumpostorVersion": "1.0.2-dev",
"gameVersion": "2026.9.29",
"dumpostorVersion": "1.0.1",
"gameVersion": "2024.6.18",
"platformType": "StandaloneItch"
}
@@ -1,93 +1,93 @@
{
"0": {
"room": "Cafeteria",
"position": {
"x": -5.1432004,
"y": 1.3355999
}
},
"1": {
"room": "Cafeteria",
"position": {
"x": 0.708,
"y": -4.992
}
},
"2": {
"room": "Cafeteria",
"position": {
"x": 6.3936,
"y": 1.33848
}
},
"3": {
"room": "Electrical",
"position": {
"x": 9.53616,
"y": -13.416001
}
},
"4": {
"room": "Storage",
"position": {
"x": -1.1316001,
"y": -11.98128
}
},
"5": {
"room": "Storage",
"position": {
"x": 0.70919997,
"y": -8.560801
}
},
"6": {
"1": {
"room": "Storage",
"position": {
"x": 5.268,
"y": -14.2884
}
},
"7": {
"room": "LowerEngine",
"position": {
"x": 14.6808,
"y": -11.472
}
},
"8": {
"room": "LowerEngine",
"position": {
"x": 16.930801,
"y": -8.9664
}
},
"9": {
"room": "UpperEngine",
"position": {
"x": 14.676002,
"y": 1.3406401
}
},
"10": {
"2": {
"room": "UpperEngine",
"position": {
"x": 16.930801,
"y": -2.1276002
}
},
"11": {
"3": {
"room": "Cafeteria",
"position": {
"x": 0.708,
"y": -4.992
}
},
"4": {
"room": "LowerEngine",
"position": {
"x": 14.6808,
"y": -11.472
}
},
"5": {
"room": "UpperEngine",
"position": {
"x": 14.676002,
"y": 1.3406401
}
},
"6": {
"room": "Security",
"position": {
"x": 14.734801,
"y": -5.1417603
}
},
"12": {
"7": {
"room": "Storage",
"position": {
"x": -1.1316001,
"y": -11.98128
}
},
"8": {
"room": "Cafeteria",
"position": {
"x": -5.1432004,
"y": 1.3355999
}
},
"9": {
"room": "Electrical",
"position": {
"x": 9.53616,
"y": -13.416001
}
},
"10": {
"room": "MedBay",
"position": {
"x": 9.1452,
"y": -0.4439999
}
},
"11": {
"room": "LowerEngine",
"position": {
"x": 16.930801,
"y": -8.9664
}
},
"12": {
"room": "Storage",
"position": {
"x": 0.70919997,
"y": -8.560801
}
}
}
@@ -1,11 +1,11 @@
{
"initialSpawnCenter": {
"x": 0.87,
"y": 0.69
"x": -0.72,
"y": 0.62
},
"meetingSpawnCenter": {
"x": 0.87,
"y": 0.69
"x": -0.72,
"y": 0.62
},
"meetingSpawnCenter2": {
"x": 0,
@@ -476,138 +476,5 @@
"usableDistance": 1
}
]
},
"29": {
"type": "NormalPlayerTask",
"taskType": "VentCleaning",
"length": "Short",
"consoles": [
{
"id": 0,
"room": "Admin",
"position": {
"x": -2.544,
"y": -9.955201
},
"usableDistance": 1
},
{
"id": 2,
"room": "Cafeteria",
"position": {
"x": -4.2588,
"y": -0.27600002
},
"usableDistance": 1
},
{
"id": 13,
"room": "Nav",
"position": {
"x": -16.008001,
"y": -6.3840003
},
"usableDistance": 1
},
{
"id": 12,
"room": "Nav",
"position": {
"x": -16.008001,
"y": -3.1680002
},
"usableDistance": 1
},
{
"id": 7,
"room": "Weapons",
"position": {
"x": -8.820001,
"y": 3.3240001
},
"usableDistance": 1
},
{
"id": 10,
"room": "Shields",
"position": {
"x": -9.5232,
"y": -14.337601
},
"usableDistance": 1
},
{
"id": 1,
"room": "Hallway",
"position": {
"x": -9.384,
"y": -6.438
},
"usableDistance": 1
},
{
"id": 3,
"room": "Electrical",
"position": {
"x": 9.7764,
"y": -8.034
},
"usableDistance": 1
},
{
"id": 8,
"room": "Reactor",
"position": {
"x": 20.796001,
"y": -6.9528003
},
"usableDistance": 1
},
{
"id": 11,
"room": "Reactor",
"position": {
"x": 21.876,
"y": -3.0516002
},
"usableDistance": 1
},
{
"id": 9,
"room": "LowerEngine",
"position": {
"x": 15.2508,
"y": -13.656001
},
"usableDistance": 1
},
{
"id": 4,
"room": "UpperEngine",
"position": {
"x": 15.288,
"y": 2.52
},
"usableDistance": 1
},
{
"id": 5,
"room": "Security",
"position": {
"x": 12.534,
"y": -6.9492
},
"usableDistance": 1
},
{
"id": 6,
"room": "MedBay",
"position": {
"x": 10.608001,
"y": -4.176
},
"usableDistance": 1
}
]
}
}
@@ -1,6 +1,6 @@
{
"0": {
"name": "AdminVent (1)",
"name": "AdminVent",
"position": {
"x": -2.544,
"y": -9.955201
@@ -10,7 +10,7 @@
"right": 1
},
"1": {
"name": "BigYVent (1)",
"name": "BigYVent",
"position": {
"x": -9.384,
"y": -6.438
@@ -20,7 +20,7 @@
"right": 2
},
"2": {
"name": "CafeVent (1)",
"name": "CafeVent",
"position": {
"x": -4.2588,
"y": -0.27600002
@@ -30,7 +30,7 @@
"right": 1
},
"3": {
"name": "ElecVent (1)",
"name": "ElecVent",
"position": {
"x": 9.7764,
"y": -8.034
@@ -40,7 +40,7 @@
"right": 6
},
"4": {
"name": "LEngineVent (1)",
"name": "LEngineVent",
"position": {
"x": 15.288,
"y": 2.52
@@ -50,7 +50,7 @@
"right": null
},
"5": {
"name": "SecurityVent",
"name": "LifeSuppVent",
"position": {
"x": 12.534,
"y": -6.9492
@@ -60,7 +60,7 @@
"right": 3
},
"6": {
"name": "MedVent (1)",
"name": "MedVent",
"position": {
"x": 10.608001,
"y": -4.176
@@ -70,7 +70,7 @@
"right": 3
},
"7": {
"name": "WeaponsVent (1)",
"name": "WeaponsVent",
"position": {
"x": -8.820001,
"y": 3.3240001
@@ -80,7 +80,7 @@
"right": 12
},
"8": {
"name": "ReactorVent (1)",
"name": "ReactorVent",
"position": {
"x": 20.796001,
"y": -6.9528003
@@ -90,7 +90,7 @@
"right": null
},
"9": {
"name": "REngineVent (1)",
"name": "REngineVent",
"position": {
"x": 15.2508,
"y": -13.656001
@@ -100,7 +100,7 @@
"right": null
},
"10": {
"name": "ShieldsVent (1)",
"name": "ShieldsVent",
"position": {
"x": -9.5232,
"y": -14.337601
@@ -110,7 +110,7 @@
"right": null
},
"11": {
"name": "UpperReactorVent (1)",
"name": "UpperReactorVent",
"position": {
"x": 21.876,
"y": -3.0516002
@@ -120,7 +120,7 @@
"right": null
},
"12": {
"name": "NavVentNorth (1)",
"name": "NavVentNorth",
"position": {
"x": -16.008001,
"y": -3.1680002
@@ -130,7 +130,7 @@
"right": 7
},
"13": {
"name": "NavVentSouth (1)",
"name": "NavVentSouth",
"position": {
"x": -16.008001,
"y": -6.3840003
@@ -1,37 +0,0 @@
{
"hatIds": [
"hat_pk04_beanie",
"hat_pk05_Cheese",
"hat_pk05_Cherry",
"hat_Chocolate",
"hat_Zipper",
"hat_pk02_Crown",
"hat_babybean",
"hat_Sorry",
"hat_mareLwyd",
"hat_fishingHat",
"hat_schnapp",
"hat_pk03_Traffic",
"hat_Pot",
"hat_AbominalHat",
"hat_tombstone",
"hat_pk04_MiniCrewmate",
"hat_pk05_Wizardhat",
"hat_pk05_Ellryhat",
"hat_pk05_EllieToppat"
],
"visorIds": [
"visor_pk01_AngeryVisor",
"visor_pk01_DumStickerVisor",
"visor_vr_Vr-Black",
"visor_pk01_PaperMaskVisor",
"visor_wash"
],
"petIds": [
"pet_YuleGoatPet",
"pet_HamPet",
"pet_Lava",
"pet_Snow",
"pet_Bush"
]
}
File diff suppressed because it is too large. Load diff
@@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class BoolGameFilter : ISubFilter
{
[JsonPropertyName("FilterType")]
public string FilterType { get; } = "bool";
[JsonPropertyName("AcceptedValues")]
public required List<bool> AcceptedValues { get; set; }
[JsonPropertyName("OptionEnum")]
public required BoolOptionNames OptionEnum { get; set; }
}
}
@@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class CategorizedGameFilter : ISubFilter
{
[JsonPropertyName("FilterType")]
public string FilterType { get; } = "cat";
[JsonPropertyName("AcceptedValues")]
public required List<int> AcceptedValues { get; set; }
[JsonPropertyName("OptionEnum")]
public required CategorizedOptionNames OptionEnum { get; set; }
}
}
@@ -1,15 +0,0 @@
using System;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class ChatModeGameFilter : ISubFilter
{
[JsonPropertyName("FilterType")]
public string FilterType { get; } = "chat";
[JsonPropertyName("AcceptedValues")]
public required byte AcceptedValues { get; set; }
}
}
@@ -1,87 +0,0 @@
using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class GameFilter
{
[JsonConstructor]
public GameFilter(string optionType, string key, string subFilterString)
{
this.OptionType = optionType;
this.Key = key;
this.SubFilterString = subFilterString;
this.SubFilter = ResolveSubFilter(OptionType, SubFilterString);
}
[JsonIgnore]
public ISubFilter SubFilter { get; set; }
[JsonPropertyName("OptionType")]
public required string OptionType { get; set; }
[JsonPropertyName("Key")]
public required string Key { get; set; }
[JsonPropertyName("SubFilterString")]
public required string SubFilterString { get; set; }
public void ModifySubFilter(ISubFilter subFilter)
{
this.SubFilter = subFilter;
}
[OnSerializing]
internal void OnSerializing(StreamingContext context)
{
this.SubFilterString = JsonSerializer.Serialize(this.SubFilter);
}
[OnDeserialized]
internal void OnDeserialized(StreamingContext context)
{
this.SubFilter = this.ResolveSubFilter(this.OptionType, this.SubFilterString);
}
private ISubFilter ResolveSubFilter(string type, string filterString)
{
if (type != null)
{
switch (type.ToLower())
{
case "int":
return JsonSerializer.Deserialize<IntGameFilter>(filterString)
?? throw new InvalidOperationException("Deserialization returned null for IntGameFilter");
case "platform":
return JsonSerializer.Deserialize<PlatformGameFilter>(filterString)
?? throw new InvalidOperationException("Deserialization returned null for PlatformGameFilter");
case "cat":
return JsonSerializer.Deserialize<CategorizedGameFilter>(filterString)
?? throw new InvalidOperationException("Deserialization returned null for CategorizedGameFilter");
case "languages":
return JsonSerializer.Deserialize<LanguageFilter>(filterString)
?? throw new InvalidOperationException("Deserialization returned null for LanguageFilter");
case "chat":
return JsonSerializer.Deserialize<ChatModeGameFilter>(filterString)
?? throw new InvalidOperationException("Deserialization returned null for ChatModeGameFilter");
case "map":
return JsonSerializer.Deserialize<MapGameFilter>(filterString)
?? throw new InvalidOperationException("Deserialization returned null for MapGameFilter");
case "bool":
return JsonSerializer.Deserialize<BoolGameFilter>(filterString)
?? throw new InvalidOperationException("Deserialization returned null for BoolGameFilter");
case "mod":
return JsonSerializer.Deserialize<ModFilter>(filterString)
?? throw new InvalidOperationException("Deserialization returned null for ModFilter");
default:
throw new InvalidOperationException("No type matches subfilter");
}
}
throw new InvalidOperationException("Must provide type for sub filter");
}
}
}
@@ -1,23 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class GameFilterSet
{
[JsonConstructor]
public GameFilterSet(GameModes gameMode, List<GameFilter> filters)
{
GameMode = gameMode;
Filters = filters;
}
[JsonPropertyName("GameMode")]
public required GameModes GameMode { get; set; }
[JsonPropertyName("Filters")]
public required List<GameFilter> Filters { get; set; }
}
}
@@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class GameFiltersList
{
[JsonPropertyName("FilterSets")]
public required List<GameFilterSet> FilterSets { get; set; }
}
}
@@ -1,7 +0,0 @@
namespace Impostor.Api.Innersloth.GameFilters
{
public interface ISubFilter
{
string FilterType { get; }
}
}
@@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class IntGameFilter : ISubFilter
{
[JsonPropertyName("FilterType")]
public string FilterType { get; } = "int";
[JsonPropertyName("AcceptedValues")]
public required List<int> AcceptedValues { get; set; }
[JsonPropertyName("OptionEnum")]
public required Int32OptionNames OptionEnum { get; set; }
}
}
@@ -1,15 +0,0 @@
using System;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class LanguageFilter : ISubFilter
{
[JsonPropertyName("FilterType")]
public string FilterType { get; } = "languages";
[JsonPropertyName("AcceptedValues")]
public required uint AcceptedValues { get; set; }
}
}
@@ -1,15 +0,0 @@
using System;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class MapGameFilter : ISubFilter
{
[JsonPropertyName("FilterType")]
public string FilterType { get; } = "map";
[JsonPropertyName("AcceptedValues")]
public required byte AcceptedValues { get; set; }
}
}
@@ -1,16 +0,0 @@
using System;
using System.Text.Json.Serialization;
// https://github.com/Innersloth-LLC/AmongUsModdingInformation
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class ModFilter : ISubFilter
{
[JsonPropertyName("FilterType")]
public string FilterType { get; } = "mod";
[JsonPropertyName("AcceptedValues")]
public required Guid AcceptedValues { get; set; }
}
}
@@ -1,15 +0,0 @@
using System;
using System.Text.Json.Serialization;
namespace Impostor.Api.Innersloth.GameFilters
{
[Serializable]
public class PlatformGameFilter : ISubFilter
{
[JsonPropertyName("FilterType")]
public string FilterType { get; } = "platform";
[JsonPropertyName("AcceptedValues")]
public required uint AcceptedValues { get; set; }
}
}
@@ -1,14 +0,0 @@
namespace Impostor.Api.Innersloth.GameOptions;
// TODO: generate this enum based on game data
/// <summary>
/// Tag that can be added to indicate the expected skill level of players in this lobby.
/// </summary>
public enum GameTags
{
None = 0,
Beginner = 1,
Intermediate = 2,
Expert = 3,
}
@@ -2,7 +2,7 @@ namespace Impostor.Api.Innersloth.GameOptions;
public class HideNSeekGameOptions : IGameOptions
{
public const int LatestVersion = 12;
public const int LatestVersion = 8;
public HideNSeekGameOptions(byte version = LatestVersion)
{
@@ -93,11 +93,6 @@ public class HideNSeekGameOptions : IGameOptions
public float MaxPingTime { get; set; } = 6f;
/// <summary>
/// Gets or sets the experience level of people in the lobby: Beginner, Intermediate or Expert.
/// </summary>
public GameTags Tag { get; set; } = 0;
public static HideNSeekGameOptions Deserialize(IMessageReader reader, byte version)
{
var options = new HideNSeekGameOptions(version);
@@ -107,11 +102,6 @@ public class HideNSeekGameOptions : IGameOptions
public void Deserialize(IMessageReader reader)
{
if (Version > LatestVersion)
{
IGameOptions.ThrowUnknownVersion<HideNSeekGameOptions>(Version);
}
if (Version >= 8)
{
SpecialMode = (SpecialGameModes)reader.ReadByte();
@@ -143,9 +133,9 @@ public class HideNSeekGameOptions : IGameOptions
MaxPingTime = reader.ReadSingle();
CrewmateTimeInVent = reader.ReadSingle();
if (Version >= 9)
if (Version > LatestVersion)
{
Tag = (GameTags)reader.ReadByte();
IGameOptions.ThrowUnknownVersion<HideNSeekGameOptions>(Version);
}
}
@@ -182,11 +172,6 @@ public class HideNSeekGameOptions : IGameOptions
writer.Write(MaxPingTime);
writer.Write(CrewmateTimeInVent);
if (Version >= 9)
{
writer.Write((byte)Tag);
}
if (Version > LatestVersion)
{
IGameOptions.ThrowUnknownVersion<HideNSeekGameOptions>(Version);
@@ -10,12 +10,12 @@ public interface IGameOptions
public byte Version { get; }
/// <summary>
/// Gets the currently active gamemode. This is currently used for the Normal and HideAndSeek gamemodes.
/// Gets the currently active gamemode.
/// </summary>
public GameModes GameMode { get; }
/// <summary>
/// Gets the currently active special gamemode. This is currently used for the AprilFools gamemode.
/// Gets if the AprilFools mode is enabled or not.
/// </summary>
public SpecialGameModes SpecialMode { get; }
@@ -49,8 +49,6 @@ public interface IGameOptions
/// </summary>
public bool IsDefaults { get; set; }
public GameTags Tag { get; set; }
public void Serialize(IMessageWriter writer);
public static void EnsureVersionIsModular<TCaller>(byte version)
@@ -145,8 +145,6 @@ public class LegacyGameOptionsData : IGameOptions
/// </summary>
public bool IsDefaults { get; set; } = true;
public GameTags Tag { get; set; } = 0;
public static LegacyGameOptionsData Deserialize(IMessageReader reader, byte version)
{
var options = new LegacyGameOptionsData(version);
@@ -4,7 +4,7 @@ namespace Impostor.Api.Innersloth.GameOptions;
public class NormalGameOptions : IGameOptions
{
public const int LatestVersion = 12;
public const int LatestVersion = 8;
public NormalGameOptions(byte version = LatestVersion)
{
@@ -128,11 +128,6 @@ public class NormalGameOptions : IGameOptions
/// </summary>
public TaskBarUpdate TaskBarUpdate { get; set; } = TaskBarUpdate.Always;
/// <summary>
/// Gets or sets the experience level of people in the lobby: Beginner, Intermediate or Expert.
/// </summary>
public GameTags Tag { get; set; } = 0;
public RoleOptionsCollection RoleOptions { get; set; }
public static NormalGameOptions Deserialize(IMessageReader reader, byte version)
@@ -144,11 +139,6 @@ public class NormalGameOptions : IGameOptions
public void Deserialize(IMessageReader reader)
{
if (Version > LatestVersion)
{
IGameOptions.ThrowUnknownVersion<NormalGameOptions>(Version);
}
if (Version >= 8)
{
SpecialMode = (SpecialGameModes)reader.ReadByte();
@@ -183,12 +173,12 @@ public class NormalGameOptions : IGameOptions
AnonymousVotes = reader.ReadBoolean();
TaskBarUpdate = (TaskBarUpdate)reader.ReadByte();
if (Version >= 9)
{
Tag = (GameTags)reader.ReadByte();
}
RoleOptions.Deserialize(reader);
if (Version > LatestVersion)
{
IGameOptions.ThrowUnknownVersion<NormalGameOptions>(Version);
}
}
public void Serialize(IMessageWriter writer)
@@ -227,11 +217,6 @@ public class NormalGameOptions : IGameOptions
writer.Write(AnonymousVotes);
writer.Write((byte)TaskBarUpdate);
if (Version >= 9)
{
writer.Write((byte)Tag);
}
RoleOptions.Serialize(writer);
if (Version > LatestVersion)
@@ -1,29 +0,0 @@
namespace Impostor.Api.Innersloth.GameOptions.RoleOptions;
public class DetectiveRoleOptions : IRoleOptions
{
public DetectiveRoleOptions(byte version)
{
Version = version;
}
public byte Version { get; }
public RoleTypes Type => RoleTypes.Detective;
public byte DetectiveSuspectLimit { get; set; } = 3;
public static DetectiveRoleOptions Deserialize(IMessageReader reader, byte version)
{
var options = new DetectiveRoleOptions(version);
options.DetectiveSuspectLimit = reader.ReadByte();
return options;
}
public void Serialize(IMessageWriter writer)
{
writer.Write((byte)DetectiveSuspectLimit);
}
}
@@ -1,29 +0,0 @@
namespace Impostor.Api.Innersloth.GameOptions.RoleOptions;
public class JudgeRoleOptions : IRoleOptions
{
public JudgeRoleOptions(byte version)
{
Version = version;
}
public byte Version { get; }
public RoleTypes Type => RoleTypes.Judge;
public float JudgeTaskRequirementPercentage { get; set; } = 50f;
public static JudgeRoleOptions Deserialize(IMessageReader reader, byte version)
{
var options = new JudgeRoleOptions(version);
options.JudgeTaskRequirementPercentage = (int)reader.ReadByte();
return options;
}
public void Serialize(IMessageWriter writer)
{
writer.Write((byte)JudgeTaskRequirementPercentage);
}
}
@@ -16,6 +16,8 @@ public class RoleOptionsCollection
public void Deserialize(IMessageReader reader)
{
Roles.Clear();
var count = reader.ReadPackedInt32();
Roles.EnsureCapacity(count);
for (var i = 0; i < count; i++)
@@ -32,14 +34,10 @@ public class RoleOptionsCollection
RoleTypes.Noisemaker => NoisemakerRoleOptions.Deserialize(roleOptionsReader, Version),
RoleTypes.Phantom => PhantomRoleOptions.Deserialize(roleOptionsReader, Version),
RoleTypes.Tracker => TrackerRoleOptions.Deserialize(roleOptionsReader, Version),
RoleTypes.Detective => DetectiveRoleOptions.Deserialize(roleOptionsReader, Version),
RoleTypes.Viper => ViperRoleOptions.Deserialize(roleOptionsReader, Version),
RoleTypes.Judge => JudgeRoleOptions.Deserialize(roleOptionsReader, Version),
RoleTypes.SpiritGuide => SpiritGuideRoleOptions.Deserialize(roleOptionsReader, Version),
_ => throw new ArgumentOutOfRangeException(nameof(roleType), roleType, null),
};
Roles[roleType] = new RoleData(roleType, roleOptions, roleRate);
Roles.Add(roleType, new RoleData(roleType, roleOptions, roleRate));
}
}
@@ -1,29 +0,0 @@
namespace Impostor.Api.Innersloth.GameOptions.RoleOptions;
public class SpiritGuideRoleOptions : IRoleOptions
{
public SpiritGuideRoleOptions(byte version)
{
Version = version;
}
public byte Version { get; }
public RoleTypes Type => RoleTypes.SpiritGuide;
public float SpiritGuideCooldownSeconds { get; set; } = 20f;
public static SpiritGuideRoleOptions Deserialize(IMessageReader reader, byte version)
{
var options = new SpiritGuideRoleOptions(version);
options.SpiritGuideCooldownSeconds = reader.ReadByte();
return options;
}
public void Serialize(IMessageWriter writer)
{
writer.Write((byte)SpiritGuideCooldownSeconds);
}
}
@@ -1,29 +0,0 @@
namespace Impostor.Api.Innersloth.GameOptions.RoleOptions;
public class ViperRoleOptions : IRoleOptions
{
public ViperRoleOptions(byte version)
{
Version = version;
}
public byte Version { get; }
public RoleTypes Type => RoleTypes.Viper;
public byte ViperDissolveTime { get; set; } = 15;
public static ViperRoleOptions Deserialize(IMessageReader reader, byte version)
{
var options = new ViperRoleOptions(version);
options.ViperDissolveTime = reader.ReadByte();
return options;
}
public void Serialize(IMessageWriter writer)
{
writer.Write((byte)ViperDissolveTime);
}
}
+1 -17
View File
@@ -8,7 +8,7 @@ namespace Impostor.Api.Net
/// <summary>
/// Represents a connected game client.
/// </summary>
public interface IClient : IEquatable<IClient>
public interface IClient
{
/// <summary>
/// Gets or sets the unique ID of the client.
@@ -60,22 +60,6 @@ namespace Impostor.Api.Net
/// </remarks>
IDictionary<object, object> Items { get; }
/// <summary>
/// Gets or sets the friendcode of the player.
/// </summary>
/// <remarks>
/// Impostor's HTTP server does not resolve friendcodes, so this value will remain null unless a plugin has written a value in this field.
/// </remarks>
string? FriendCode { get; set; }
/// <summary>
/// Gets or sets the puid of the player.
/// </summary>
/// <remarks>
/// Impostor's HTTP server does not resolve puids, so this value will remain null unless a plugin has written a value in this field.
/// </remarks>
string? Puid { get; set; }
/// <summary>
/// Gets the current game data of the <see cref="IClient" />.
/// </summary>
+1 -1
View File
@@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
using Impostor.Api.Games;
using Impostor.Api.Net.Inner;
using Impostor.Api.Net.Inner.Objects;
@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Impostor.Api.Events.Player;
@@ -6,24 +6,6 @@ namespace Impostor.Api.Net.Inner.Objects
{
public interface IInnerMeetingHud : IInnerNetObject
{
public interface IJudgeOverrule
{
/// <summary>
/// Gets the player id of the Judge that queued this overrule.
/// </summary>
byte JudgePlayerId { get; }
/// <summary>
/// Gets the player id of the player the Judge wants to overrule.
/// </summary>
byte OverruledPlayerId { get; }
/// <summary>
/// Gets the overrule nonce used to match this overrule to the voting result.
/// </summary>
ushort OverruleNonce { get; }
}
public interface IPlayerVoteArea
{
/// <summary>
@@ -73,10 +55,5 @@ namespace Impostor.Api.Net.Inner.Objects
/// Gets the player that started the meeting.
/// </summary>
IInnerPlayerInfo? Reporter { get; }
/// <summary>
/// Gets the Judge overrules queued in this meeting.
/// </summary>
IReadOnlyCollection<IJudgeOverrule> JudgeOverrules { get; }
}
}
@@ -1,4 +1,3 @@
using System;
using System.Threading.Tasks;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.Customization;
@@ -29,14 +28,13 @@ namespace Impostor.Api.Net.Inner.Objects
/// Gets the <see cref="IInnerPlayerInfo" /> of the <see cref="IInnerPlayerControl" />.
/// Contains metadata about the player.
/// </summary>
IInnerPlayerInfo? PlayerInfo { get; }
IInnerPlayerInfo PlayerInfo { get; }
/// <summary>
/// Sets the name of the current <see cref="IInnerPlayerControl" />.
/// Visible to all players.
/// </summary>
/// <param name="name">A name for the player.</param>
/// <exception cref="ImpostorProtocolException">Thrown when player doesn't have a PlayerInfo.</exception>
/// <returns>Task that must be awaited.</returns>
ValueTask SetNameAsync(string name);
@@ -45,7 +43,6 @@ namespace Impostor.Api.Net.Inner.Objects
/// Visible to all players.
/// </summary>
/// <param name="colorType">A color for the player.</param>
/// <exception cref="ImpostorProtocolException">Thrown when player doesn't have a PlayerInfo.</exception>
/// <returns>Task that must be awaited.</returns>
ValueTask SetColorAsync(ColorType colorType);
@@ -54,7 +51,6 @@ namespace Impostor.Api.Net.Inner.Objects
/// Visible to all players.
/// </summary>
/// <param name="hatId">An hat for the player.</param>
/// <exception cref="ImpostorProtocolException">Thrown when player doesn't have a PlayerInfo.</exception>
/// <returns>Task that must be awaited.</returns>
ValueTask SetHatAsync(string hatId);
@@ -63,7 +59,6 @@ namespace Impostor.Api.Net.Inner.Objects
/// Visible to all players.
/// </summary>
/// <param name="petId">A pet for the player.</param>
/// <exception cref="ImpostorProtocolException">Thrown when player doesn't have a PlayerInfo.</exception>
/// <returns>Task that must be awaited.</returns>
ValueTask SetPetAsync(string petId);
@@ -72,26 +67,9 @@ namespace Impostor.Api.Net.Inner.Objects
/// Visible to all players.
/// </summary>
/// <param name="skinId">A skin for the player.</param>
/// <exception cref="ImpostorProtocolException">Thrown when player doesn't have a PlayerInfo.</exception>
/// <returns>Task that must be awaited.</returns>
ValueTask SetSkinAsync(string skinId);
/// <summary>
/// Sets the visor of the current <see cref="IInnerPlayerControl" />.
/// Visible to all players.
/// </summary>
/// <param name="visorId">A visor for the player.</param>
/// <returns>Task that must be awaited.</returns>
ValueTask SetVisorAsync(string visorId);
/// <summary>
/// Sets the nameplate of the current <see cref="IInnerPlayerControl" />.
/// Visible to all players.
/// </summary>
/// <param name="nameplateId">A nameplate for the player.</param>
/// <returns>Task that must be awaited.</returns>
ValueTask SetNamePlateAsync(string nameplateId);
/// <summary>
/// Send a chat message as the current <see cref="IInnerPlayerControl" />.
/// Visible to all players.
@@ -120,60 +98,32 @@ namespace Impostor.Api.Net.Inner.Objects
/// <exception cref="ImpostorProtocolException">Thrown when player is not the impostor.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when player is dead.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when target is dead.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when player or target player doesn't have a PlayerInfo.</exception>
/// <returns>Task that must be awaited.</returns>
ValueTask MurderPlayerAsync(IInnerPlayerControl target, MurderResultFlags result);
/// <summary>
/// Murder <paramref name="target" /> player.
/// </summary>
/// <param name="target">Target player to murder.</param>
/// <param name="result">The result of the murder operation.</param>
/// <returns>Task that must be awaited.</returns>
ValueTask ForceMurderPlayerAsync(IInnerPlayerControl target, MurderResultFlags result);
/// <summary>
/// Murder <paramref name="target" /> player after validating if this is a valid kill.
/// Murder <paramref name="target" /> player successfully.
/// </summary>
/// <param name="target">Target player to murder.</param>
/// <exception cref="ImpostorProtocolException">Thrown when player is not the impostor.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when player is dead.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when target is dead.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when player or target player doesn't have a PlayerInfo.</exception>
/// <returns>Task that must be awaited.</returns>
[Obsolete("Please switch to version with the MurderResultFlags argument")]
ValueTask MurderPlayerAsync(IInnerPlayerControl target);
/// <summary>
/// Protect <paramref name="target" /> player.
/// </summary>
/// <param name="target">Target player to protect.</param>
/// <exception cref="ImpostorProtocolException">Thrown when target is dead.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when player or target player doesn't have a PlayerInfo.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when target is a guardian angel.</exception>
/// <returns>Task that must be awaited.</returns>
ValueTask ProtectPlayerAsync(IInnerPlayerControl target);
/// <summary>
/// Protect <paramref name="target" /> player.
/// </summary>
/// <param name="target">Target player to protect.</param>
/// <returns>Task that must be awaited.</returns>
ValueTask ForceProtectPlayerAsync(IInnerPlayerControl target);
/// <summary>
/// Exile the current player. This doesn't produce a body to be reported.
/// Visible to all players.
/// </summary>
/// <exception cref="ImpostorProtocolException">Thrown if player to be exiled is already dead.</exception>
/// <exception cref="ImpostorProtocolException">Thrown when player or target player doesn't have a PlayerInfo.</exception>
/// <returns>Task that must be awaited.</returns>
ValueTask ExileAsync();
/// <summary>
/// Exile the current player. This doesn't produce a body to be reported.
/// Visible to all players.
/// </summary>
/// <returns>Task that must be awaited.</returns>
ValueTask ForceExileAsync();
}
}
@@ -43,21 +43,5 @@ namespace Impostor.Api.Net.Inner.Objects
DateTimeOffset LastMurder { get; }
uint PlayerLevel { get; }
/// <summary>
/// Gets the friendcode of the player.
/// </summary>
/// <remarks>
/// Impostor's HTTP server does not resolve friendcodes, so this value will remain null unless a plugin has written a value on the player's client.
/// </remarks>
string? FriendCode { get; }
/// <summary>
/// Gets the puid of the player.
/// </summary>
/// <remarks>
/// Impostor's HTTP server does not resolve puids, so this value will remain null unless a plugin has written a value on the player's client.
/// </remarks>
string? Puid { get; }
}
}
@@ -1,4 +1,4 @@
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.GameOptions;
namespace Impostor.Api.Net.Messages.C2S
@@ -1,25 +0,0 @@
using System;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.GameOptions;
namespace Impostor.Api.Net.Messages.C2S
{
/// <summary>
/// Special serialization rules for AU MCI HostGame messages.
/// <see href="https://github.com/Innersloth-LLC/AmongUsModdingInformation?tab=readme-ov-file#all-client-mod-client-identification"/>
/// for more information.
/// </summary>
public static class Message25HostModdedGameC2S
{
public static void Serialize(IMessageWriter writer, IGameOptions gameOptions, CrossplayFlags crossplayFlags, GameFilterOptions gameFilterOptions)
{
Message00HostGameC2S.Serialize(writer, gameOptions, crossplayFlags, gameFilterOptions);
}
public static void Deserialize(IMessageReader reader, out IGameOptions gameOptions, out CrossplayFlags crossplayFlags, out GameFilterOptions gameFilterOptions, out Guid modGuid)
{
Message00HostGameC2S.Deserialize(reader, out gameOptions, out crossplayFlags, out gameFilterOptions);
modGuid = new Guid(reader.ReadBytes(16).Span);
}
}
}
@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
@@ -29,8 +29,6 @@ namespace Impostor.Api.Net.Messages
public const byte QueryPlatformIds = 22;
public const byte QueryLobbyInfo = 23;
public const byte EndGameHostMigration = 24;
public const byte HostModdedGame = 25;
public const byte PackedGameDataTo = 26;
private static readonly Dictionary<byte, string> FlagCache;
@@ -42,14 +40,16 @@ namespace Impostor.Api.Net.Messages
.ToDictionary(x => (byte)x.GetValue(null)!, y => y.Name);
}
/// <summary>
/// Convert a MessageFlag to the corresponding string.
/// </summary>
/// <param name="flag">The MessageFlag to convert.</param>
/// <returns>A string corresponding with the value of flag.</returns>
public static string FlagToString(byte flag)
{
return FlagCache.TryGetValue(flag, out var res) ? res : $"Unknown Flag {flag}";
if (FlagCache.TryGetValue(flag, out var res))
{
return res;
}
else
{
return $"Unknown Flag {flag}";
}
}
}
}
@@ -2,8 +2,6 @@ namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc23VotingComplete
{
// Pre 18.0 version
// TODO clean up when 17.4 and below are unsupported
public static void Serialize(IMessageWriter writer, byte[] states, byte playerId, bool tie)
{
writer.WriteBytesAndSize(states);
@@ -11,15 +9,6 @@ namespace Impostor.Api.Net.Messages.Rpcs
writer.Write(tie);
}
public static void Serialize(IMessageWriter writer, byte[] states, byte playerId, bool tie, bool wasOverruled, ushort overrideId)
{
writer.WriteBytesAndSize(states);
writer.Write(playerId);
writer.Write(tie);
writer.Write(wasOverruled);
writer.Write(overrideId);
}
public static void Deserialize(IMessageReader reader, out IMessageReader[] states, out byte playerId, out bool tie)
{
var length = reader.ReadPackedInt32();
@@ -32,21 +21,5 @@ namespace Impostor.Api.Net.Messages.Rpcs
playerId = reader.ReadByte();
tie = reader.ReadBoolean();
}
public static void Deserialize(IMessageReader reader, out IMessageReader[] states, out byte playerId, out bool tie, out bool wasOverruled, out ushort overrideId)
{
var length = reader.ReadPackedInt32();
states = new IMessageReader[length];
for (var i = 0; i < length; i++)
{
states[i] = reader.ReadMessage();
}
playerId = reader.ReadByte();
tie = reader.ReadBoolean();
wasOverruled = reader.ReadBoolean();
overrideId = reader.ReadUInt16();
}
}
}
@@ -2,16 +2,14 @@ namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc39SetHatStr
{
public static void Serialize(IMessageWriter writer, string hat, byte nextRpcSequenceId)
public static void Serialize(IMessageWriter writer, string hat)
{
writer.Write(hat);
writer.Write(nextRpcSequenceId);
}
public static void Deserialize(IMessageReader reader, out string hat, out byte nextRpcSequenceId)
public static void Deserialize(IMessageReader reader, out string hat)
{
hat = reader.ReadString();
nextRpcSequenceId = reader.ReadByte();
}
}
}
@@ -2,16 +2,14 @@ namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc40SetSkinStr
{
public static void Serialize(IMessageWriter writer, string skin, byte nextRpcSequenceId)
public static void Serialize(IMessageWriter writer, string skin)
{
writer.Write(skin);
writer.Write(nextRpcSequenceId);
}
public static void Deserialize(IMessageReader reader, out string skin, out byte nextRpcSequenceId)
public static void Deserialize(IMessageReader reader, out string skin)
{
skin = reader.ReadString();
nextRpcSequenceId = reader.ReadByte();
}
}
}
@@ -2,16 +2,14 @@ namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc41SetPetStr
{
public static void Serialize(IMessageWriter writer, string pet, byte nextRpcSequenceId)
public static void Serialize(IMessageWriter writer, string pet)
{
writer.Write(pet);
writer.Write(nextRpcSequenceId);
}
public static void Deserialize(IMessageReader reader, out string pet, out byte nextRpcSequenceId)
public static void Deserialize(IMessageReader reader, out string pet)
{
pet = reader.ReadString();
nextRpcSequenceId = reader.ReadByte();
}
}
}
@@ -2,16 +2,14 @@ namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc42SetVisorStr
{
public static void Serialize(IMessageWriter writer, string visor, byte nextRpcSequenceId)
public static void Serialize(IMessageWriter writer, string visor)
{
writer.Write(visor);
writer.Write(nextRpcSequenceId);
}
public static void Deserialize(IMessageReader reader, out string visor, out byte nextRpcSequenceId)
public static void Deserialize(IMessageReader reader, out string visor)
{
visor = reader.ReadString();
nextRpcSequenceId = reader.ReadByte();
}
}
}
@@ -2,16 +2,14 @@ namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc43SetNamePlateStr
{
public static void Serialize(IMessageWriter writer, string namePlate, byte nextRpcSequenceId)
public static void Serialize(IMessageWriter writer, string namePlate)
{
writer.Write(namePlate);
writer.Write(nextRpcSequenceId);
}
public static void Deserialize(IMessageReader reader, out string namePlate, out byte nextRpcSequenceId)
public static void Deserialize(IMessageReader reader, out string namePlate)
{
namePlate = reader.ReadString();
nextRpcSequenceId = reader.ReadByte();
}
}
}
@@ -2,7 +2,7 @@ namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc62CheckVanish
{
public static void Serialize(IMessageWriter writer, float maxDuration)
public static void Serialize(IMessageWriter writer, float maxDuration = 0f)
{
writer.Write(maxDuration);
}
@@ -1,19 +0,0 @@
namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc66QueueOverruleVotes
{
public static void Serialize(IMessageWriter writer, byte judgePlayerId, byte targetPlayerId, ushort overruleNonce)
{
writer.Write(judgePlayerId);
writer.Write(targetPlayerId);
writer.Write(overruleNonce);
}
public static void Deserialize(IMessageReader reader, out byte judgePlayerId, out byte targetPlayerId, out ushort overruleNonce)
{
judgePlayerId = reader.ReadByte();
targetPlayerId = reader.ReadByte();
overruleNonce = reader.ReadUInt16();
}
}
}
@@ -1,17 +0,0 @@
using System;
namespace Impostor.Api.Net.Messages.Rpcs
{
public static class Rpc67SpiritGuideMessage
{
public static void Serialize(IMessageWriter writer, byte[] images)
{
writer.WriteBytesAndSize(images);
}
public static void Deserialize(IMessageReader reader, out ReadOnlyMemory<byte> images)
{
images = reader.ReadBytesAndSize();
}
}
}
@@ -18,9 +18,11 @@ namespace Impostor.Api.Net.Messages.S2C
writer.Write(hostId);
writer.Write(player.Client.Name);
player.Client.PlatformSpecificData.Serialize(writer);
writer.WritePacked(player.Character?.PlayerInfo?.PlayerLevel ?? 1);
writer.Write(player.Client.FriendCode ?? string.Empty);
writer.Write(player.Client.Puid ?? string.Empty);
writer.WritePacked(player.Character?.PlayerInfo.PlayerLevel ?? 1);
// ProductUserId and FriendCode are not yet known, so set them to an empty string
writer.Write(string.Empty);
writer.Write(string.Empty);
writer.EndMessage();
}
@@ -22,9 +22,11 @@ namespace Impostor.Api.Net.Messages.S2C
writer.WritePacked(ply.Client.Id);
writer.Write(ply.Client.Name);
ply.Client.PlatformSpecificData.Serialize(writer);
writer.WritePacked(ply.Character?.PlayerInfo?.PlayerLevel ?? 1);
writer.Write(ply.Client.FriendCode ?? string.Empty);
writer.Write(ply.Client.Puid ?? string.Empty);
writer.WritePacked(ply.Character?.PlayerInfo.PlayerLevel ?? 1);
// ProductUserId and FriendCode are not yet known, so set them to an empty string
writer.Write(string.Empty);
writer.Write(string.Empty);
}
writer.EndMessage();
@@ -1,21 +1,20 @@
using Impostor.Api.Games;
using System;
namespace Impostor.Api.Net.Messages.S2C
{
public class Message24EndGameHostMigrationS2C
{
public static void Serialize(IMessageWriter writer, GameCode gameCode, int hostClientId)
public static void Serialize(IMessageWriter writer, int gameCode, int hostClientId)
{
writer.StartMessage(MessageFlags.EndGameHostMigration);
gameCode.Serialize(writer);
writer.Write(gameCode);
writer.Write(hostClientId);
writer.EndMessage();
}
public static void Deserialize(IMessageReader reader, out GameCode gameCode, out int hostClientId)
public static void Deserialize(IMessageReader reader)
{
gameCode = reader.ReadInt32();
hostClientId = reader.ReadInt32();
throw new NotImplementedException();
}
}
}
+7 -7
View File
@@ -4,9 +4,9 @@
"net8.0": {
"Impostor.Hazel.Abstractions": {
"type": "Direct",
"requested": "[1.0.1, )",
"resolved": "1.0.1",
"contentHash": "de2bMj78xDXOWwyqQVk8o4vbZKGfAgOjnWnkKB1IGGovNtxLeBF8jy3wH5moTZB6juTnLf0ptkCDkRi8c2OcjA=="
"requested": "[1.0.0, )",
"resolved": "1.0.0",
"contentHash": "x56AEsY5fKU2Z5O7ZrzEqKfr62kq/C05Aevcciwz5yMfOQlpwuFI1awgNGJsoe+bcx+XnFc3+l+eadtY72aZsg=="
},
"Microsoft.AspNetCore.Http.Abstractions": {
"type": "Direct",
@@ -42,9 +42,9 @@
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Direct",
"requested": "[8.0.30, )",
"resolved": "8.0.30",
"contentHash": "SfmwuZjUPBTEoBMAsXZ/hWkaEK9oL+Y/UtAx7N6RyWHfcMt9J0ExrNPuOgTyPbCXIyiTBFsxFNrPLEZNPmJcvA=="
"requested": "[8.0.6, )",
"resolved": "8.0.6",
"contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
},
"StyleCop.Analyzers": {
"type": "Direct",
@@ -124,6 +124,6 @@
"contentHash": "Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g=="
}
},
"net8.0/win-x64": {}
"net8.0/linux-x64": {}
}
}
+10 -10
View File
@@ -42,19 +42,19 @@
},
"Impostor.Hazel": {
"type": "Transitive",
"resolved": "1.0.1",
"contentHash": "DFsZcOa9ptFEj8FCfK63L/bcJ9RUVRZUhUS0qkrmdSqkgeJRdvUOTWR1gKlqbaOJcSEvexAITC0QJEPnJUcI7Q==",
"resolved": "1.0.0",
"contentHash": "FgVKuIWK+o6Q+wOPFoZZTeoSuVh4giAhrS8Zvs6O0++Bg8RxH4Lw51uSwnexLiwosXveUCIXICzgGHmRyguVSA==",
"dependencies": {
"Impostor.Hazel.Abstractions": "1.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
"Microsoft.Extensions.ObjectPool": "8.0.0",
"Impostor.Hazel.Abstractions": "1.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
"Microsoft.Extensions.ObjectPool": "7.0.1",
"Serilog": "2.12.0"
}
},
"Impostor.Hazel.Abstractions": {
"type": "Transitive",
"resolved": "1.0.1",
"contentHash": "de2bMj78xDXOWwyqQVk8o4vbZKGfAgOjnWnkKB1IGGovNtxLeBF8jy3wH5moTZB6juTnLf0ptkCDkRi8c2OcjA=="
"resolved": "1.0.0",
"contentHash": "x56AEsY5fKU2Z5O7ZrzEqKfr62kq/C05Aevcciwz5yMfOQlpwuFI1awgNGJsoe+bcx+XnFc3+l+eadtY72aZsg=="
},
"Microsoft.AspNetCore.Http.Abstractions": {
"type": "Transitive",
@@ -588,7 +588,7 @@
"impostor.api": {
"type": "Project",
"dependencies": {
"Impostor.Hazel.Abstractions": "[1.0.1, )",
"Impostor.Hazel.Abstractions": "[1.0.0, )",
"Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )",
"Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )",
"Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )"
@@ -597,8 +597,8 @@
"impostor.server": {
"type": "Project",
"dependencies": {
"Impostor.Api": "[1.10.7-dev, )",
"Impostor.Hazel": "[1.0.1, )",
"Impostor.Api": "[1.9.0-dev, )",
"Impostor.Hazel": "[1.0.0, )",
"Microsoft.Extensions.FileSystemGlobbing": "[8.0.0, )",
"Microsoft.Extensions.Hosting": "[8.0.0, )",
"Microsoft.Extensions.ObjectPool": "[8.0.1, )",
+12 -12
View File
@@ -13,19 +13,19 @@
},
"Impostor.Hazel": {
"type": "Transitive",
"resolved": "1.0.1",
"contentHash": "DFsZcOa9ptFEj8FCfK63L/bcJ9RUVRZUhUS0qkrmdSqkgeJRdvUOTWR1gKlqbaOJcSEvexAITC0QJEPnJUcI7Q==",
"resolved": "1.0.0",
"contentHash": "FgVKuIWK+o6Q+wOPFoZZTeoSuVh4giAhrS8Zvs6O0++Bg8RxH4Lw51uSwnexLiwosXveUCIXICzgGHmRyguVSA==",
"dependencies": {
"Impostor.Hazel.Abstractions": "1.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
"Microsoft.Extensions.ObjectPool": "8.0.0",
"Impostor.Hazel.Abstractions": "1.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
"Microsoft.Extensions.ObjectPool": "7.0.1",
"Serilog": "2.12.0"
}
},
"Impostor.Hazel.Abstractions": {
"type": "Transitive",
"resolved": "1.0.1",
"contentHash": "de2bMj78xDXOWwyqQVk8o4vbZKGfAgOjnWnkKB1IGGovNtxLeBF8jy3wH5moTZB6juTnLf0ptkCDkRi8c2OcjA=="
"resolved": "1.0.0",
"contentHash": "x56AEsY5fKU2Z5O7ZrzEqKfr62kq/C05Aevcciwz5yMfOQlpwuFI1awgNGJsoe+bcx+XnFc3+l+eadtY72aZsg=="
},
"Microsoft.AspNetCore.Http.Abstractions": {
"type": "Transitive",
@@ -97,8 +97,8 @@
},
"Microsoft.Extensions.ObjectPool": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "4pm+XgxSukskwjzDDfSjG4KNUIOdFF2VaqZZDtTzoyQMOVSnlV6ZM8a9aVu5dg9LVZTB//utzSc8fOi0b0Mb2Q=="
"resolved": "7.0.1",
"contentHash": "dDFItid/TGJljAnqbUQ0PkAl6ShIG0htwRR8J0cG/5Il6lIZPfkIZMwrZTWiF23AiQcqt6suPaUy2ih6dsCB9Q=="
},
"Microsoft.Extensions.Options": {
"type": "Transitive",
@@ -132,7 +132,7 @@
"impostor.api": {
"type": "Project",
"dependencies": {
"Impostor.Hazel.Abstractions": "[1.0.1, )",
"Impostor.Hazel.Abstractions": "[1.0.0, )",
"Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )",
"Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )",
"Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )"
@@ -141,8 +141,8 @@
"impostor.client": {
"type": "Project",
"dependencies": {
"Impostor.Api": "[1.10.7-dev, )",
"Impostor.Hazel": "[1.0.1, )"
"Impostor.Api": "[1.9.0-dev, )",
"Impostor.Hazel": "[1.0.0, )"
}
}
}
+1 -1
View File
@@ -2,7 +2,7 @@
<ItemGroup>
<ProjectReference Include="..\Impostor.Api\Impostor.Api.csproj" />
<PackageReference Include="Impostor.Hazel" Version="1.0.1" />
<PackageReference Include="Impostor.Hazel" Version="1.0.0" />
</ItemGroup>
</Project>
+11 -11
View File
@@ -4,20 +4,20 @@
"net8.0": {
"Impostor.Hazel": {
"type": "Direct",
"requested": "[1.0.1, )",
"resolved": "1.0.1",
"contentHash": "DFsZcOa9ptFEj8FCfK63L/bcJ9RUVRZUhUS0qkrmdSqkgeJRdvUOTWR1gKlqbaOJcSEvexAITC0QJEPnJUcI7Q==",
"requested": "[1.0.0, )",
"resolved": "1.0.0",
"contentHash": "FgVKuIWK+o6Q+wOPFoZZTeoSuVh4giAhrS8Zvs6O0++Bg8RxH4Lw51uSwnexLiwosXveUCIXICzgGHmRyguVSA==",
"dependencies": {
"Impostor.Hazel.Abstractions": "1.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
"Microsoft.Extensions.ObjectPool": "8.0.0",
"Impostor.Hazel.Abstractions": "1.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
"Microsoft.Extensions.ObjectPool": "7.0.1",
"Serilog": "2.12.0"
}
},
"Impostor.Hazel.Abstractions": {
"type": "Transitive",
"resolved": "1.0.1",
"contentHash": "de2bMj78xDXOWwyqQVk8o4vbZKGfAgOjnWnkKB1IGGovNtxLeBF8jy3wH5moTZB6juTnLf0ptkCDkRi8c2OcjA=="
"resolved": "1.0.0",
"contentHash": "x56AEsY5fKU2Z5O7ZrzEqKfr62kq/C05Aevcciwz5yMfOQlpwuFI1awgNGJsoe+bcx+XnFc3+l+eadtY72aZsg=="
},
"Microsoft.AspNetCore.Http.Abstractions": {
"type": "Transitive",
@@ -89,8 +89,8 @@
},
"Microsoft.Extensions.ObjectPool": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "4pm+XgxSukskwjzDDfSjG4KNUIOdFF2VaqZZDtTzoyQMOVSnlV6ZM8a9aVu5dg9LVZTB//utzSc8fOi0b0Mb2Q=="
"resolved": "7.0.1",
"contentHash": "dDFItid/TGJljAnqbUQ0PkAl6ShIG0htwRR8J0cG/5Il6lIZPfkIZMwrZTWiF23AiQcqt6suPaUy2ih6dsCB9Q=="
},
"Microsoft.Extensions.Options": {
"type": "Transitive",
@@ -124,7 +124,7 @@
"impostor.api": {
"type": "Project",
"dependencies": {
"Impostor.Hazel.Abstractions": "[1.0.1, )",
"Impostor.Hazel.Abstractions": "[1.0.0, )",
"Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )",
"Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )",
"Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )"
@@ -4,8 +4,8 @@
"net8.0": {
"Impostor.Hazel.Abstractions": {
"type": "Transitive",
"resolved": "1.0.1",
"contentHash": "de2bMj78xDXOWwyqQVk8o4vbZKGfAgOjnWnkKB1IGGovNtxLeBF8jy3wH5moTZB6juTnLf0ptkCDkRi8c2OcjA=="
"resolved": "1.0.0",
"contentHash": "x56AEsY5fKU2Z5O7ZrzEqKfr62kq/C05Aevcciwz5yMfOQlpwuFI1awgNGJsoe+bcx+XnFc3+l+eadtY72aZsg=="
},
"Microsoft.AspNetCore.Http.Abstractions": {
"type": "Transitive",
@@ -102,7 +102,7 @@
"impostor.api": {
"type": "Project",
"dependencies": {
"Impostor.Hazel.Abstractions": "[1.0.1, )",
"Impostor.Hazel.Abstractions": "[1.0.0, )",
"Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )",
"Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )",
"Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )"
@@ -4,8 +4,8 @@
"net8.0": {
"Impostor.Hazel.Abstractions": {
"type": "Transitive",
"resolved": "1.0.1",
"contentHash": "de2bMj78xDXOWwyqQVk8o4vbZKGfAgOjnWnkKB1IGGovNtxLeBF8jy3wH5moTZB6juTnLf0ptkCDkRi8c2OcjA=="
"resolved": "1.0.0",
"contentHash": "x56AEsY5fKU2Z5O7ZrzEqKfr62kq/C05Aevcciwz5yMfOQlpwuFI1awgNGJsoe+bcx+XnFc3+l+eadtY72aZsg=="
},
"Microsoft.AspNetCore.Http.Abstractions": {
"type": "Transitive",
@@ -102,7 +102,7 @@
"impostor.api": {
"type": "Project",
"dependencies": {
"Impostor.Hazel.Abstractions": "[1.0.1, )",
"Impostor.Hazel.Abstractions": "[1.0.0, )",
"Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )",
"Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )",
"Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )"
@@ -1,4 +1,4 @@
using Impostor.Api.Events.Meeting;
using Impostor.Api.Events.Meeting;
using Impostor.Api.Games;
using Impostor.Api.Net.Inner.Objects;
@@ -6,14 +6,12 @@ namespace Impostor.Server.Events.Meeting
{
public class MeetingEndedEvent : IMeetingEndedEvent
{
public MeetingEndedEvent(IGame game, IInnerMeetingHud meetingHud, IInnerPlayerControl? exiled, bool isTie, bool wasOverruled = false, ushort overrideId = 0)
public MeetingEndedEvent(IGame game, IInnerMeetingHud meetingHud, IInnerPlayerControl? exiled, bool isTie)
{
Game = game;
MeetingHud = meetingHud;
Exiled = exiled;
IsTie = isTie;
WasOverruled = wasOverruled;
OverrideId = overrideId;
}
public IGame Game { get; }
@@ -23,9 +21,5 @@ namespace Impostor.Server.Events.Meeting
public IInnerPlayerControl? Exiled { get; }
public bool IsTie { get; }
public bool WasOverruled { get; }
public ushort OverrideId { get; }
}
}
@@ -1,4 +1,4 @@
using Impostor.Api.Events.Player;
using Impostor.Api.Events.Player;
using Impostor.Api.Games;
using Impostor.Api.Net;
using Impostor.Api.Net.Inner.Objects;
@@ -24,7 +24,5 @@ namespace Impostor.Server.Events.Player
public string Message { get; }
public bool IsCancelled { get; set; }
public bool SendToAllPlayers { get; set; } = true;
}
}
@@ -1,24 +0,0 @@
using System;
using Impostor.Api.Innersloth.GameOptions;
using Impostor.Hazel;
namespace Impostor.Server.Extensions;
public static class IGameOptionsExtensions
{
public static byte[] ToBytes(this IGameOptions gameOptions)
{
using var writer = MessageWriter.Get(MessageType.Unreliable);
writer.Write(gameOptions.Version);
writer.StartMessage(0);
writer.Write((byte)gameOptions.GameMode);
gameOptions.Serialize(writer);
writer.EndMessage();
return writer.ToByteArray(false);
}
public static string ToBase64String(this IGameOptions gameOptions)
{
return Convert.ToBase64String(gameOptions.ToBytes());
}
}
@@ -1,56 +0,0 @@
using System;
using System.Net.Http.Headers;
using System.Text.Json;
using Microsoft.AspNetCore.Mvc;
namespace Impostor.Server.Http;
[Route("/api/filters")]
public sealed class FiltersController : ControllerBase
{
private static readonly string[] Value = new[]
{
"Tags",
// "PlayerSpeed",
// "Roles",
// "KillCooldown",
// "VotingTime",
"NumImposters",
// "VisualTasks",
// "AnonymousVotes",
// "ConfirmEjects",
// "DiscussionTime",
// "EmergencyCooldown",
// "NumEmergencyMeetings",
// "NumCommonTasks",
// "NumShortTasks",
// "NumLongTasks",
// "KillDistance",
};
[HttpGet]
public IActionResult GetFilters([FromHeader] AuthenticationHeaderValue authorization)
{
if (authorization.Scheme != "Bearer" || authorization.Parameter == null)
{
return BadRequest();
}
TokenController.Token? token = null;
try
{
token = JsonSerializer.Deserialize<TokenController.Token>(Convert.FromBase64String(authorization.Parameter));
}
catch
{
return BadRequest();
}
return Ok(new
{
filters = Value,
});
}
}
+2 -106
View File
@@ -5,15 +5,11 @@ using System.Net;
using System.Net.Http.Headers;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Web;
using Impostor.Api.Config;
using Impostor.Api.Games;
using Impostor.Api.Games.Managers;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.GameFilters;
using Impostor.Server.Extensions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace Impostor.Server.Http;
@@ -28,7 +24,6 @@ public sealed class GamesController : ControllerBase
private readonly IGameManager _gameManager;
private readonly ListingManager _listingManager;
private readonly HostServer _hostServer;
private readonly ILogger<GamesController> _logger;
/// <summary>
/// Initializes a new instance of the <see cref="GamesController"/> class.
@@ -36,14 +31,12 @@ public sealed class GamesController : ControllerBase
/// <param name="gameManager">GameManager containing a list of games.</param>
/// <param name="listingManager">ListingManager responsible for filtering.</param>
/// <param name="serverConfig">Impostor configuration section containing the public ip address of this server.</param>
/// <param name="logger">DI injected logger.</param>
public GamesController(IGameManager gameManager, ListingManager listingManager, IOptions<ServerConfig> serverConfig, ILogger<GamesController> logger)
public GamesController(IGameManager gameManager, ListingManager listingManager, IOptions<ServerConfig> serverConfig)
{
_gameManager = gameManager;
_listingManager = listingManager;
var config = serverConfig.Value;
_hostServer = HostServer.From(IPAddress.Parse(config.ResolvePublicIp()), config.PublicPort);
_logger = logger;
}
/// <summary>
@@ -57,7 +50,6 @@ public sealed class GamesController : ControllerBase
[HttpGet]
public IActionResult Index(int mapId, GameKeywords lang, int numImpostors, [FromHeader] AuthenticationHeaderValue authorization)
{
// NOTE: this method is no longer used by Among Us 16.0.0 and is only kept for backwards compatibility
if (authorization.Scheme != "Bearer" || authorization.Parameter == null)
{
return BadRequest();
@@ -83,7 +75,6 @@ public sealed class GamesController : ControllerBase
[HttpPost]
public IActionResult Post(int gameId)
{
// NOTE: this method is no longer used by Among Us 16.0.0 and is only kept for backwards compatibility
var code = new GameCode(gameId);
var game = _gameManager.Find(code);
@@ -106,69 +97,6 @@ public sealed class GamesController : ControllerBase
return Ok(_hostServer);
}
[HttpGet("{gameId}")]
public IActionResult Show([FromRoute] int gameId)
{
var code = new GameCode(gameId);
var game = _gameManager.Find(code);
// If the game was not found, print an error message.
if (game == null)
{
return NotFound(new FindGameByCodeResponse(new MatchmakerError(DisconnectReason.GameNotFound)));
}
return Ok(new FindGameByCodeResponse(GameListing.From(game)));
}
[HttpGet("filtered")]
public IActionResult ShowFilteredLobbies([FromQuery] string filter)
{
if (string.IsNullOrEmpty(filter))
{
return BadRequest(new MatchmakerResponse(new MatchmakerError(DisconnectReason.ServerError, "filter query parameter not provided")));
}
try
{
var decodedFilter = HttpUtility.UrlDecode(filter);
var filtersList = JsonSerializer.Deserialize<GameFiltersList>(decodedFilter);
// filterSets wont be null. It must at least have ChatFilter and LangFilter
// Vanilla game only builds one filterSet and InnerSloth officials only handles first one (though you can send multiple filter sets. sloths only handle the first)
if (filtersList == null || filtersList.FilterSets.Count != 1
|| filtersList.FilterSets[0].Filters.Count < 2
|| !filtersList.FilterSets[0].Filters.Any(x => x.OptionType == "languages")
|| !filtersList.FilterSets[0].Filters.Any(x => x.OptionType == "chat"))
{
return BadRequest(new MatchmakerResponse(new MatchmakerError(DisconnectReason.ServerError, "Invalid filterSets")));
}
var filteredGames = _listingManager.FindListingsV2(HttpContext, filtersList);
var gameListings = filteredGames.Select(GameListing.From).ToList();
var response = new
{
games = gameListings,
metadata = new
{
allGamesCount = _gameManager.Games.Count(),
matchingGamesCount = gameListings.Count,
},
};
return Ok(response);
}
catch (JsonException ex)
{
return BadRequest(new MatchmakerResponse(new MatchmakerError(DisconnectReason.ServerError, "Unable to deserialize filter json" + ex)));
}
catch (Exception ex)
{
return BadRequest(new MatchmakerResponse(new MatchmakerError(DisconnectReason.ServerError, "Unknown exception caught in filter" + ex)));
}
}
private static uint ConvertAddressToNumber(IPAddress address)
{
#pragma warning disable CS0618 // Among Us only supports IPv4
@@ -214,33 +142,13 @@ public sealed class GamesController : ControllerBase
private class MatchmakerError
{
[SetsRequiredMembers]
public MatchmakerError(DisconnectReason reason, string message = "")
public MatchmakerError(DisconnectReason reason)
{
Reason = reason;
Message = message;
}
[JsonPropertyName("Reason")]
public required DisconnectReason Reason { get; init; }
[JsonPropertyName("Message")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
public required string Message { get; init; } = string.Empty;
}
private class FindGameByCodeResponse
{
[SetsRequiredMembers]
public FindGameByCodeResponse(MatchmakerError error) => (Errors, Game) = (new[] { error }, null);
[SetsRequiredMembers]
public FindGameByCodeResponse(GameListing game) => (Errors, Game) = (null, game);
[JsonPropertyName("Errors")]
public required MatchmakerError[]? Errors { get; init; }
[JsonPropertyName("Game")]
public required GameListing? Game { get; init; }
}
private class GameListing
@@ -260,18 +168,12 @@ public sealed class GamesController : ControllerBase
[JsonPropertyName("HostName")]
public required string HostName { get; init; }
[JsonPropertyName("TrueHostName")]
public required string TrueHostName { get; init; }
[JsonPropertyName("HostPlatformName")]
public required string HostPlatformName { get; init; }
[JsonPropertyName("Platform")]
public required Platforms Platform { get; init; }
[JsonPropertyName("QuickChat")]
public required QuickChatModes QuickChat { get; init; }
[JsonPropertyName("Age")]
public required int Age { get; init; }
@@ -287,9 +189,6 @@ public sealed class GamesController : ControllerBase
[JsonPropertyName("Language")]
public required GameKeywords Language { get; init; }
[JsonPropertyName("Options")]
public required string Options { get; init; }
public static GameListing From(IGame game)
{
var platform = game.Host?.Client.PlatformSpecificData;
@@ -301,16 +200,13 @@ public sealed class GamesController : ControllerBase
GameId = game.Code,
PlayerCount = game.PlayerCount,
HostName = game.DisplayName ?? game.Host?.Client.Name ?? "Unknown host",
TrueHostName = game.DisplayName ?? game.Host?.Client.Name ?? "Unknown host",
HostPlatformName = platform?.PlatformName ?? string.Empty,
Platform = platform?.Platform ?? Platforms.Unknown,
QuickChat = game.Host?.Client.ChatMode ?? QuickChatModes.QuickChatOnly,
Age = 0,
MaxPlayers = game.Options.MaxPlayers,
NumImpostors = game.Options.NumImpostors,
MapId = game.Options.Map,
Language = game.Options.Keywords,
Options = game.Options.ToBase64String(),
};
}
}
@@ -1,36 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
namespace Impostor.Server.Http;
/// <summary>
/// Generate a diagnostic page to show that the Impostor HTTP server is working.
/// </summary>
[Route("/")]
public sealed class HelloController : ControllerBase
{
private static bool _shownHello = false;
private readonly ILogger<HelloController> _logger;
public HelloController(ILogger<HelloController> logger)
{
_logger = logger;
}
[HttpGet]
public IActionResult GetHello()
{
if (!_shownHello)
{
_shownHello = true;
_logger.LogInformation("Impostor's Http server is reachable (this message is only printed once per start)");
}
return Ok(
"""
Impostor is running, please configure your Among Us to connect to a game
To generate a region file, go to https://impostor.github.io/Impostor
"""
);
}
}
-134
View File
@@ -5,7 +5,6 @@ using Impostor.Api.Games;
using Impostor.Api.Games.Managers;
using Impostor.Api.Http;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.GameFilters;
using Impostor.Api.Net.Manager;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Options;
@@ -60,11 +59,6 @@ public sealed class ListingManager
continue;
}
if (game.ModGuid != null)
{
continue;
}
if (!_compatibilityConfig.AllowVersionMixing &&
game.Host != null &&
_compatibilityManager.CanJoinGame(game.Host.Client.GameVersion, gameVersion) != GameJoinError.None)
@@ -109,134 +103,6 @@ public sealed class ListingManager
}
}
public IEnumerable<IGame> FindListingsV2(HttpContext ctx, GameFiltersList filtersList, int maxListings = 10)
{
if (filtersList == null || filtersList.FilterSets.Count == 0)
{
return Enumerable.Empty<IGame>();
}
var result = new List<IGame>();
var resultCount = 0;
// Apply custom filters from API
var filters = _listingFilters.Select(f => f.GetFilter(ctx)).ToArray();
foreach (var game in _gameManager.Games)
{
if (!game.IsPublic || game.GameState != GameStates.NotStarted || game.PlayerCount >= game.Options.MaxPlayers)
{
continue;
}
if (!filters.All(filter => filter(game)))
{
continue;
}
var matchesAnyFilterSet = false;
foreach (var filterSet in filtersList.FilterSets)
{
// Not sure how to handle normal fools and seek fools
if (game.Options.GameMode != filterSet.GameMode)
{
continue;
}
if (game.ModGuid != null && !filterSet.Filters.Any(f => f.OptionType == "mod"))
{
continue;
}
var matchesAllFilters = true;
// Hard coded to only check map, languages, impostornum, chatmode, tags
foreach (var filter in filterSet.Filters)
{
switch (filter.OptionType)
{
case "map":
if (filter.SubFilter is MapGameFilter mapFilter && ((1 << (int)game.Options.Map) & mapFilter.AcceptedValues) == 0)
{
matchesAllFilters = false;
}
break;
case "languages":
if (filter.SubFilter is LanguageFilter langFilter && game.Options.Keywords != (GameKeywords)langFilter.AcceptedValues)
{
matchesAllFilters = false;
}
break;
case "int":
if (filter.SubFilter is IntGameFilter intFilter)
{
switch (intFilter.OptionEnum)
{
case Int32OptionNames.NumImpostors:
if (!intFilter.AcceptedValues.Contains(game.Options.NumImpostors))
{
matchesAllFilters = false;
}
break;
case Int32OptionNames.Tag:
if (!intFilter.AcceptedValues.Contains((int)game.Options.Tag))
{
matchesAllFilters = false;
}
break;
}
}
break;
case "chat":
if (filter.SubFilter is ChatModeGameFilter chatFilter && game.Host != null)
{
if (((byte)game.Host.Client.ChatMode & chatFilter.AcceptedValues) == 0)
{
matchesAllFilters = false;
}
}
break;
case "mod":
if (filter.SubFilter is ModFilter modFilter && game.ModGuid != modFilter.AcceptedValues)
{
matchesAllFilters = false;
}
break;
}
if (!matchesAllFilters)
{
break;
}
}
if (matchesAllFilters)
{
matchesAnyFilterSet = true;
break;
}
}
if (matchesAnyFilterSet)
{
result.Add(game);
if (++resultCount >= maxListings)
{
break;
}
}
}
return result;
}
private static bool IsGameDesired(IGame game, int map, int impostorCount, GameKeywords language)
{
if ((map & (1 << (int)game.Options.Map)) == 0)
+1 -1
View File
@@ -20,7 +20,7 @@
<ItemGroup>
<ProjectReference Include="..\Impostor.Api\Impostor.Api.csproj" />
<PackageReference Include="Impostor.Hazel" Version="1.0.1" />
<PackageReference Include="Impostor.Hazel" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
+17 -144
View File
@@ -5,7 +5,6 @@ using Impostor.Api;
using Impostor.Api.Config;
using Impostor.Api.Games;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.GameOptions;
using Impostor.Api.Net;
using Impostor.Api.Net.Custom;
using Impostor.Api.Net.Messages;
@@ -43,11 +42,6 @@ namespace Impostor.Server.Net
return false;
}
if (Player != null && Player.Game.ModGuid != null)
{
return false;
}
if (Player != null && Player.IsHost)
{
var isHostCheatingAllowed = _antiCheatConfig.AllowCheatingHosts switch {
@@ -73,22 +67,12 @@ namespace Impostor.Server.Net
{
CheatCategory.ProtocolExtension => _antiCheatConfig.ForbidProtocolExtensions,
CheatCategory.GameFlow => _antiCheatConfig.EnableGameFlowChecks,
CheatCategory.InvalidObject => _antiCheatConfig.EnableInvalidObjectChecks,
CheatCategory.MustBeHost => _antiCheatConfig.EnableMustBeHostChecks,
CheatCategory.ColorLimits => _antiCheatConfig.EnableColorLimitChecks,
CheatCategory.NameLimits => _antiCheatConfig.EnableNameLimitChecks,
CheatCategory.Ownership => _antiCheatConfig.EnableOwnershipChecks,
CheatCategory.Role => _antiCheatConfig.EnableRoleChecks,
CheatCategory.Target => _antiCheatConfig.EnableTargetChecks,
CheatCategory.Identifiers => _antiCheatConfig.EnableIdentifierChecks,
CheatCategory.HostOnlyExtension => _antiCheatConfig.AllowHostOnlyExtensions switch {
CheatingHostMode.Always => false,
CheatingHostMode.IfRequested => !GameVersion.HasDisableServerAuthorityFlag,
CheatingHostMode.Never => true,
_ => true,
},
CheatCategory.PacketSize => _antiCheatConfig.EnablePacketSizeChecks,
CheatCategory.ItemLimits => _antiCheatConfig.EnableItemLimitChecks,
CheatCategory.Other => true,
_ => LogUnknownCategory(category),
};
@@ -98,27 +82,14 @@ namespace Impostor.Server.Net
return false;
}
var supportCode = Random.Shared.Next(0, 999_999).ToString("000-000");
_logger.LogWarning("Client {Name} ({Id}) was caught cheating: [{Context}-{Category}] {Message}", Name, Id, context.Name, category, message);
_logger.LogWarning("Client {Name} ({Id}) was caught cheating: [{SupportCode}] [{Context}-{Category}] {Message}", Name, Id, supportCode, context.Name, category, message);
if (Player is { } player)
if (_antiCheatConfig.BanIpFromGame)
{
if (_antiCheatConfig.BanIpFromGame)
{
player.Game.BanIp(Connection.EndPoint.Address);
}
await player.Game.HandleRemovePlayer(Id, DisconnectReason.Hacking);
Player?.Game.BanIp(Connection.EndPoint.Address);
}
var disconnectMessage =
$"""
You have been caught cheating and were {(_antiCheatConfig.BanIpFromGame ? "banned" : "kicked")} from the lobby.
For questions, contact your server admin and share the following code: {supportCode}.
""";
await DisconnectAsync(DisconnectReason.Custom, disconnectMessage);
await DisconnectAsync(DisconnectReason.Hacking, context.Name + ": " + message);
return true;
}
@@ -132,25 +103,12 @@ namespace Impostor.Server.Net
switch (flag)
{
case MessageFlags.HostGame:
case MessageFlags.HostModdedGame:
{
IGameOptions gameOptions;
GameFilterOptions gameFilterOptions;
Guid? modGuid = null;
if (flag == MessageFlags.HostModdedGame)
{
Message25HostModdedGameC2S.Deserialize(reader, out gameOptions, out _, out gameFilterOptions, out var parsedModGuid);
modGuid = parsedModGuid;
}
else
{
// Read game settings.
Message00HostGameC2S.Deserialize(reader, out gameOptions, out _, out gameFilterOptions);
}
// Read game settings.
Message00HostGameC2S.Deserialize(reader, out var gameOptions, out _, out var gameFilterOptions);
// Create game.
var game = await _gameManager.CreateAsync(this, gameOptions, gameFilterOptions, modGuid);
var game = await _gameManager.CreateAsync(this, gameOptions, gameFilterOptions);
if (game == null)
{
@@ -158,11 +116,6 @@ namespace Impostor.Server.Net
return;
}
if (modGuid != null)
{
_logger.LogInformation("Client {Name} ({Id}) hosted a modded game with mod GUID {ModGuid}.", Name, Id, modGuid);
}
// Code in the packet below will be used in JoinGame.
using (var writer = MessageWriter.Get(MessageType.Reliable))
{
@@ -227,7 +180,7 @@ namespace Impostor.Server.Net
case MessageFlags.StartGame:
{
if (!IsPacketAllowed(reader, true, flag))
if (!IsPacketAllowed(reader, true))
{
return;
}
@@ -242,7 +195,7 @@ namespace Impostor.Server.Net
case MessageFlags.RemovePlayer:
{
if (!IsPacketAllowed(reader, true, flag))
if (!IsPacketAllowed(reader, true))
{
return;
}
@@ -259,7 +212,7 @@ namespace Impostor.Server.Net
case MessageFlags.GameData:
case MessageFlags.GameDataTo:
{
if (!IsPacketAllowed(reader, false, flag))
if (!IsPacketAllowed(reader, false))
{
return;
}
@@ -292,80 +245,9 @@ namespace Impostor.Server.Net
break;
}
case MessageFlags.PackedGameDataTo:
{
if (Player == null)
{
return;
}
var game = Player.Game;
// Innersloth Special: this message uses PackedInt32 instead of a normal int32
var code = reader.ReadPackedInt32();
if (code != game.Code.Value)
{
_logger.LogWarning("gcm2 {0} {1}", code, game.Code.Value);
return;
}
// We're limiting this to hosts right now. If you have a use case for this for
// players to use this feature, we're open to changing this.
if (game.HostId != Id)
{
await ReportCheatAsync(
new CheatContext(MessageFlags.FlagToString(flag)),
CheatCategory.MustBeHost,
"Client sent a PackedGameDataTo message");
return;
}
if (await ReportCheatAsync(
new CheatContext(MessageFlags.FlagToString(flag)),
CheatCategory.HostOnlyExtension,
"Client sent a PackedGameDataTo message"))
{
return;
}
while (reader.Position < reader.Length)
{
using var packed = reader.ReadMessage();
if (packed.Tag != MessageFlags.GameDataTo)
{
_logger.LogWarning("PackedGameDataTo contained non-GameDataTo flag {0}.", packed.Tag);
return;
}
if (packed.ReadInt32() != game.Code.Value)
{
_logger.LogWarning("PackedGameDataTo contained GameDataTo for the wrong game.");
return;
}
var position = packed.Position;
var verified = await Player.Game.HandleGameDataAsync(packed, Player, true);
packed.Seek(position);
if (!verified || Player == null)
{
return;
}
using var writer = MessageWriter.Get(messageType);
var target = packed.ReadPackedInt32();
packed.CopyTo(writer);
await Player.Game.SendToAsync(writer, target);
}
break;
}
case MessageFlags.EndGame:
{
if (!IsPacketAllowed(reader, true, flag))
if (!IsPacketAllowed(reader, true))
{
return;
}
@@ -380,7 +262,7 @@ namespace Impostor.Server.Net
case MessageFlags.AlterGame:
{
if (!IsPacketAllowed(reader, true, flag))
if (!IsPacketAllowed(reader, true))
{
return;
}
@@ -401,7 +283,7 @@ namespace Impostor.Server.Net
case MessageFlags.KickPlayer:
{
if (!IsPacketAllowed(reader, true, flag))
if (!IsPacketAllowed(reader, true))
{
return;
}
@@ -448,7 +330,6 @@ namespace Impostor.Server.Net
#if DEBUG
if (flag != MessageFlags.GameData &&
flag != MessageFlags.GameDataTo &&
flag != MessageFlags.PackedGameDataTo &&
flag != MessageFlags.EndGame &&
reader.Position < reader.Length)
{
@@ -467,9 +348,7 @@ namespace Impostor.Server.Net
{
if (Player != null)
{
// The client never sends over the real disconnect reason so we always assume ExitGame
var isRemote = reason == "The remote sent a disconnect request";
await Player.Game.HandleRemovePlayer(Id, isRemote ? DisconnectReason.ExitGame : DisconnectReason.Error);
await Player.Game.HandleRemovePlayer(Id, DisconnectReason.ExitGame);
}
}
catch (Exception ex)
@@ -479,10 +358,9 @@ namespace Impostor.Server.Net
_logger.LogInformation("Client {0} disconnecting, reason: {1}", Id, reason);
_clientManager.Remove(this);
await _gameManager.OnClientDisconnectAsync(this);
}
private bool IsPacketAllowed(IMessageReader message, bool hostOnly, byte flag)
private bool IsPacketAllowed(IMessageReader message, bool hostOnly)
{
if (Player == null)
{
@@ -492,8 +370,7 @@ namespace Impostor.Server.Net
var game = Player.Game;
// GameCode must match code of the current game assigned to the player.
var code = message.ReadInt32();
if (code != game.Code.Value)
if (message.ReadInt32() != game.Code)
{
return false;
}
@@ -506,11 +383,7 @@ namespace Impostor.Server.Net
return true;
}
_logger.LogWarning(
"[{0}] Client sent packet {1} only allowed by the host ({2}).",
Id,
MessageFlags.FlagToString(flag),
game.HostId);
_logger.LogWarning("[{0}] Client sent packet only allowed by the host ({1}).", Id, game.HostId);
return false;
}
-22
View File
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using Impostor.Api;
using Impostor.Api.Innersloth;
using Impostor.Api.Innersloth.Customization;
using Impostor.Api.Net;
using Impostor.Server.Net.State;
@@ -40,12 +39,6 @@ namespace Impostor.Server.Net
public ClientPlayer? Player { get; set; }
public string? FriendCode { get; set; }
public string? Puid { get; set; }
public ColorType? PreviousColor { get; set; } = null;
IClientPlayer? IClient.Player => Player;
public virtual ValueTask<bool> ReportCheatAsync(CheatContext context, CheatCategory category, string message)
@@ -66,20 +59,5 @@ namespace Impostor.Server.Net
{
await Connection.CustomDisconnectAsync(reason, message);
}
public bool Equals(IClient? other)
{
return other != null && Id == other.Id;
}
public override bool Equals(object? obj)
{
return Equals(obj as ClientBase);
}
public override int GetHashCode()
{
return Id;
}
}
}
@@ -1,23 +1,18 @@
using System.Net;
using System.Threading.Tasks;
using Impostor.Api;
using Impostor.Api.Config;
using Impostor.Api.Net;
using Impostor.Hazel;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace Impostor.Server.Net.Hazel
{
internal class HazelConnection : IHazelConnection
{
private readonly ILogger<HazelConnection> _logger;
private readonly AntiCheatConfig _antiCheatConfig;
public HazelConnection(Connection innerConnection, ILogger<HazelConnection> logger, IOptions<AntiCheatConfig> antiCheatOptions)
public HazelConnection(Connection innerConnection, ILogger<HazelConnection> logger)
{
_logger = logger;
_antiCheatConfig = antiCheatOptions.Value;
InnerConnection = innerConnection;
innerConnection.DataReceived = ConnectionOnDataReceived;
innerConnection.Disconnected = ConnectionOnDisconnected;
@@ -63,19 +58,6 @@ namespace Impostor.Server.Net.Hazel
return;
}
// Check raw message size against the configured limit.
// Innersloth requires full packet ≤ 1200 bytes (1168 bytes payload after 32 bytes IP+UDP headers).
if (e.Message.Length > _antiCheatConfig.PacketSizeLimit)
{
if (await Client.ReportCheatAsync(
new CheatContext("RootMessage"),
CheatCategory.PacketSize,
$"Received a message that is too large, length: {e.Message.Length}"))
{
return;
}
}
while (true)
{
if (e.Message.Position >= e.Message.Length)
@@ -87,11 +69,6 @@ namespace Impostor.Server.Net.Hazel
{
await Client.HandleMessageAsync(message, e.Type);
}
if (!IsConnected)
{
break;
}
}
}
}
+11 -10
View File
@@ -1,15 +1,16 @@
namespace Impostor.Server.Net.Inner
{
public static class GameDataTag
public enum GameDataTag : byte
{
public const byte DataFlag = 1;
public const byte RpcFlag = 2;
public const byte SpawnFlag = 4;
public const byte DespawnFlag = 5;
public const byte SceneChangeFlag = 6;
public const byte ReadyFlag = 7;
public const byte ChangeSettingsFlag = 8;
public const byte ConsoleDeclareClientPlatformFlag = 205;
public const byte PS4RoomRequest = 206;
DataFlag = 1,
RpcFlag = 2,
SpawnFlag = 4,
DespawnFlag = 5,
SceneChangeFlag = 6,
ReadyFlag = 7,
ChangeSettingsFlag = 8,
ConsoleDeclareClientPlatformFlag = 205,
PS4RoomRequest = 206,
XboxDeclareXuid = 207,
}
}
@@ -73,16 +73,9 @@ namespace Impostor.Server.Net.Inner
return true;
}
protected async ValueTask<bool> ValidateImpostor(CheatContext context, IClientPlayer sender, InnerPlayerInfo? playerInfo, bool value = true)
protected async ValueTask<bool> ValidateImpostor(CheatContext context, IClientPlayer sender, InnerPlayerInfo playerInfo, bool value = true)
{
if (playerInfo == null)
{
if (await sender.Client.ReportCheatAsync(context, CheatCategory.InvalidObject, "Couldn't check if Impostor, playerInfo not set"))
{
return false;
}
}
else if (playerInfo.IsImpostor != value)
if (playerInfo.IsImpostor != value)
{
if (await sender.Client.ReportCheatAsync(context, CheatCategory.Role, "Failed impostor check"))
{
@@ -93,16 +86,9 @@ namespace Impostor.Server.Net.Inner
return true;
}
protected async ValueTask<bool> ValidateCanVent(CheatContext context, IClientPlayer sender, InnerPlayerInfo? playerInfo, bool value = true)
protected async ValueTask<bool> ValidateCanVent(CheatContext context, IClientPlayer sender, InnerPlayerInfo playerInfo, bool value = true)
{
if (playerInfo == null)
{
if (await sender.Client.ReportCheatAsync(context, CheatCategory.InvalidObject, "Couldn't check if can vent, playerInfo not set"))
{
return false;
}
}
else if (playerInfo.CanVent != value)
if (playerInfo.CanVent != value)
{
if (await sender.Client.ReportCheatAsync(context, CheatCategory.Role, "Failed can vent check"))
{
@@ -113,16 +99,9 @@ namespace Impostor.Server.Net.Inner
return true;
}
protected async ValueTask<bool> ValidateRole(CheatContext context, IClientPlayer sender, InnerPlayerInfo? playerInfo, RoleTypes role)
protected async ValueTask<bool> ValidateRole(CheatContext context, IClientPlayer sender, InnerPlayerInfo playerInfo, RoleTypes role)
{
if (playerInfo == null)
{
if (await sender.Client.ReportCheatAsync(context, CheatCategory.InvalidObject, "Couldn't check role, playerInfo not set"))
{
return false;
}
}
else if (playerInfo.RoleType != role)
if (playerInfo.RoleType != role)
{
if (await sender.Client.ReportCheatAsync(context, CheatCategory.Role, $"Failed role = {role} check"))
{
Loaded 100 of 133 files, more files were not shown because too many files have changed in this diff. Show more