Skip to content

Commit

Permalink
Merge branch 'OhMyGuus:nightly' into Mute-other-dead-players
Browse files Browse the repository at this point in the history
  • Loading branch information
Er1ckW authored Jan 27, 2024
2 parents d5aba57 + 0f4f3c5 commit 2959e93
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ This project is a fork of the popular Proximity Voice Chat, [CrewLink](https://g
- You can play BetterCrewLink without having to be stuck in MENU Infinitely.
- Changing the Speaker Setting does actually something unlike Original CrewLink where it is always using the Default Output.
- Microphone Echo Cancellation.
- Microphone Eoise Suppression.
- Microphone Noise Suppression.
- More Overlay Positions and you can set the Overlay to the Top/Bottom and you can set It so It shows Everyone Even When Dead.
- You can set the Lobby Up so Only Death people can talk. (Normal Lobbies but then with Death Talk)
- Support for New/Older versions of Among Us. (v2021.11.9.2)
Expand Down
47 changes: 45 additions & 2 deletions src/common/ColliderMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,41 @@ export const colliderMaps: { [key in MapType]: string[] | undefined } = {
// not tested might require some small offset adjustments
'M 40 4.7 C 40.5 4.7 41 4.9 41.2 5.5 V 7.1 H 42.8 V 8.3 L 44.5 10 V 11 H 41.3 V 13.6 L 43.3 15.6 L 45.4 13.5 V 12.8 H 44.6 V 9.4 L 42.9 7.7 V 7.1 H 48.9 V 11.4 L 47.5 12.8 H 46.7 V 14.4 L 44.3 16.8 V 17.4 H 46.9 V 18.7 H 49.6 V 11.3 H 51.1 V 12.1 H 51.3 V 11.4 H 52.9 V 14.2 H 51.3 V 13.5 H 51.1 V 15.3 H 53.1 V 13.5 H 55.7 V 17.4 H 51.1 V 26.9 H 48.9 V 29.4 H 49.4 V 30.5 H 49.6 V 29.8 H 51.2 V 32.7 H 49.6 V 31.9 H 49.3 V 32.7 H 48.4 V 33.7 H 49.1 V 35.5 H 46.4 V 33.7 H 47.1 V 32.8 H 46.3 V 31.6 L 45.4 30 H 44.9 V 30.8 H 45.3 L 46.2 32.2 V 32.8 H 43.5 V 28 H 44.2 V 22.9 H 42.1 V 24.4 H 42.4 V 26.1 H 40.8 V 26.8 H 42.4 V 30.5 C 42.4 31.1 41.6 31.4 41 31.4 C 40.5 31.4 39.7 31 39.7 30.4 V 29 H 41 V 28.3 H 35.1 V 26.9 H 34.9 V 27.7 H 31.8 V 22.7 H 32.7 V 21.4 H 31.3 V 28.6 H 33.9 V 31.4 H 28.5 V 27.1 H 29.8 V 21.4 H 29.1 V 25.5 H 24.3 V 18.7 H 29.1 V 20 H 29.9 V 15.6 H 27 V 8.3 H 28.3 L 30.8 9.7 V 10.5 H 36 V 12.3 H 39.9 V 11 H 39.1 L 37.3 9.2 V 7.1 H 38.8 V 5.5 C 39 4.9 39.6 4.7 40 4.7 Z M 51.1 59.4 V 60.1 H 51.3 V 59.5 H 52.9 V 62.4 H 51.3 V 61.6 H 51.1 V 64 H 54.4 V 66.3 L 52.9 67.4 V 69.7 H 50.7 V 70.3 H 51.4 V 70.5 H 51.5 V 70.3 H 52.8 L 54.3 71.5 V 73 H 51.5 V 72 H 51.4 V 73 H 48.4 V 70.3 H 49.3 V 69.7 H 48.4 V 68.3 H 46.9 V 71 H 43.5 V 72.1 L 46.8 73 V 76.9 H 45.9 V 77.7 H 49.4 V 78.6 H 49.5 V 77.9 H 51.2 V 80.8 H 49.5 V 80 H 49.4 V 80.9 H 48.4 V 81.8 H 49.2 V 83.5 H 46.3 V 81.8 H 47.1 V 80.9 H 43.5 V 80.1 H 37.8 V 80.9 H 36 V 80 H 35.8 V 80.9 H 32.1 L 31.7 80.6 V 81.3 L 32 81.6 H 34.2 V 83.8 H 28.1 V 77.8 H 30.3 V 79.9 L 30.5 80.1 V 79.4 L 30.3 79.2 V 75.2 H 31.1 V 74.3 H 30.3 V 72.4 H 31.1 V 69.6 H 29.6 V 75.1 H 23.8 V 73 H 28.1 V 72.4 H 23.8 V 69.2 H 28.1 V 68.5 H 23.8 V 66.5 H 29.6 V 68.1 H 32.8 V 67.2 H 32 V 65.4 H 34.8 V 67.2 H 34.1 V 68.1 H 35.7 V 67.2 H 35 V 65.4 H 37.8 V 67.2 H 37 V 68.1 H 39.7 V 65.5 H 41.1 V 59.4 Z M 36 13.7 V 15.6 H 31.2 V 20 H 32.7 V 19 H 32 V 17.4 H 34.8 V 19 H 34.1 V 20 H 35.7 V 19 H 35 V 17.4 H 37.8 V 19 H 37 V 20 H 39.7 V 17.4 H 42.2 V 16.8 L 39.9 14.4 V 13.7 Z M 34.1 21.4 V 22.7 H 35 V 25.5 H 35.1 V 24.9 L 36.7 24.5 H 40.7 V 22.9 H 39.7 V 21.4 Z M 42.5 60.8 V 65.5 H 46.9 V 66.8 H 48.4 V 63.2 H 49.8 V 62.4 H 48.4 V 65.4 H 47 V 63.9 L 45.7 61.7 V 60.8 Z M 32.5 69.6 V 72.4 H 33.3 V 74.3 H 32.5 V 75.2 H 33.3 V 76.4 L 34.8 77.8 H 35.8 V 78.5 H 36 V 77.8 H 37.8 V 78.6 H 43.5 V 77.7 H 44.5 V 76.9 H 38.8 V 73 L 42.1 72.1 V 71 H 39.7 V 69.6 H 36.1 V 72.2 H 37.5 V 75.6 H 35.5 L 34.2 74.3 V 70.7 H 34.7 V 69.6 Z M 46.9 22.9 H 45.5 V 28 H 46.1 L 47 29.4 H 47.5 V 25.4 H 49.7 V 20.1 H 46.9 Z',
],
[MapType.FUNGLE]: undefined,
[MapType.FUNGLE]: [
'M 27.12 33.21 V 31.23 H 26.92 V 33.11 Z',
'M 20.2 34.47 V 36 H 25.72 L 27.1 35.54 V 34.6 H 26.88 V 35.36 L 25.93 35.72 H 20.41 V 34.58 Z',
'M 20.13 33.11 H 20.34 V 31.89 H 20.05 Z',
'M 26.18 40.01 V 39.3 L 25.13 38.25 H 22.43 L 20.58 37.52 L 18.87 38.71 H 22.17 V 39.25 H 22.29 V 38.83 H 23.21 V 39.35 H 23.43 V 38.83 H 24.3 V 39.37 H 24.47 V 38.83 H 25.12 L 26.05 39.51 V 40.04 Z',
'M 19.19 44.18 L 22.08 42.57 V 41.1 H 24.35 V 41.38 H 22.41 V 42.84 H 25.33 L 25.94 42.22 V 41.49 H 26.11 V 42.63 L 25.41 43.43 H 21.97 V 43.06 L 19.72 44.16 Z',
'M 21.32 46.62 V 45.78 H 23.61 V 45.45 H 21.12 V 46.6 Z',
'M 25.3 45.49 H 27.11 L 28.03 46.66 V 50.72 H 20.98 V 48.21 H 21.23 V 50.39 H 27.52 V 47.06 L 26.73 45.94 H 25.67 Z',
'M 38.56 55.21 L 40.78 52.99 L 43.31 55.22 Z',
'M 36.88 52.44 V 53.06 H 32.13 L 30.97 51.08 V 44.45 H 33.69 V 40.42 H 34.33 V 44.31 H 36.67 L 38.14 47.24 V 51.3 H 37.88 V 47.89 H 36.66 V 45.39 H 32.07 V 52.48 Z',
'M 31.47 32.87 H 31.78 L 29.59 29.22 L 32.21 28.12 L 31.47 27.28 L 28.33 28.56 Z',
'M 35.74 30.5 L 34.28 30.51 L 33.33 29.73 L 34.14 28.4 Z',
'M 34.83 47.72 V 47.42 H 33.34 V 51.42 H 33.68 V 47.67 Z',
'M 52.41 55.46 H 54.32 V 54.55 H 52.32 Z',
'M 44.61 53.28 H 53.36 V 52.96 H 44.61 Z',
'M 47 50.83 V 51.12 H 42.2 V 49.57 L 40.72 49.2 L 40.27 47.39 L 42.14 46.88 L 45.41 48.08 V 50.57 Z',
'M 35.09 51.42 H 36.08 V 51.1 H 35.08 Z',
'M 47.07 49.38 V 49.03 H 49.44 V 47.75 H 49.82 L 49.54 48.98 H 51.44 V 49.47 H 51.23 V 49.15 Z',
'M 51.28 51.46 V 50.57 H 51.5 V 51.46 Z',
'M 56.07 50.45 V 48.42 H 55.58 L 56.05 47.45 L 53.89 47.81 V 45.08 H 53.16 V 47.55 L 55.81 48.85 V 50.25 Z',
'M 58.08 50.99 V 51.55 H 57.43 V 51.05 Z',
'M 59.28 47.8 V 49.9 H 65.26 V 43.85 H 59.39 V 46.03 H 59.63 V 45.51 H 64.74 V 49.47 H 59.84 V 47.78 Z',
'M 56.17 34.1 H 53.47 V 33.26 H 56.17 Z',
'M 45.8 32.45 H 50.38 V 32.87 L 51.84 33.18 V 34.22 H 51.11 V 36.09 H 50.81 V 34.76 H 45.38 V 38.07 H 45.17 V 34.53 Z',
'M 47.47 36.91 L 50.97 38.02 V 40.52 H 47.74 V 40.2 H 50.24 L 50.67 40.36 V 38.18 L 47.47 37.17 Z',
'M 36.33 39.35 H 38.71 L 39.77 40.51 H 40.01 V 40.08 H 43.71 V 42.68 H 39.66 V 42.43 L 38.05 43.81 L 38.92 44.01 H 44.04 V 39.63 H 39.48 L 38.4 38.92 H 36.05 Z',
'M 57.39 55.55 V 53.78 H 56.72 V 53.3 L 57.72 53.49 L 60.76 52.53 Z',
'M 52.34 40.53 H 53.63 V 40.04 H 52.35 Z',
'M 54.18 38.03 H 56.97 V 36.81 H 54.28 Z',
'M 65.15 27.82 L 65.59 27.34 L 65.81 27.67 L 65.32 28.04 Z',
'M 63.05 28.06 H 59.68 L 58.52 27.31 H 58.85 L 60.02 27.43 H 60.91 V 26.97 H 61.68 V 27.72 H 63.03 Z',
'M 58.56 25.95 V 25.22 H 58.43 V 25.94 Z',
'M 41.57 32.55 H 38.45 V 34.64 H 38.23 V 31.61 H 41.53 Z',
'M 40.42 34.3 H 43.96 V 37.64 H 38.72 L 38.22 36.5 H 43.02 V 34.73 H 40.52 Z'
],
[MapType.THE_SKELD_APRIL]: undefined,
[MapType.UNKNOWN]: undefined,
};
Expand Down Expand Up @@ -98,7 +132,16 @@ export const doorMaps: { [key in MapType]: { [key in number]: string | undefined
20: 'M 71.708 44.3274 H 73.3457', //Medical Top
},
[MapType.SUBMERGED]: undefined,
[MapType.FUNGLE]: undefined,
[MapType.FUNGLE]: {
0: 'M 62.95 27.87 H 65.34', // Horizontal Comms
1: 'M 58.53 27.51 V 25.63', // Vertical Comms
2: 'M 23.51 45.57 H 25.44', // Kitchen
3: 'M 34.65 47.6 H 36.84', // Laboratory
4: 'M 50.9 38.43 V 35.82', // Lookout
5: 'M 51.38 33.62 H 53.88', // MiningPit
6: 'M 59.52 47.91 V 45.62', // Reactor
7: 'M 38.31 36.76 V 34.37', // Storage
},
[MapType.THE_SKELD_APRIL]: undefined,
[MapType.UNKNOWN]: undefined,
};
Expand Down

0 comments on commit 2959e93

Please sign in to comment.