Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

exorcist #1278

Open
wants to merge 989 commits into
base: dev_2.2.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
989 commits
Select commit Hold shift + click to select a range
f378a47
Merge pull request #5 from EnhancedNetwork/dev_2.2.0
Bri1101 Dec 25, 2024
84ba091
Force remove blockmoveinvent
NikoCat233 Dec 26, 2024
f04c520
sightly increase check murder cooldown
NikoCat233 Dec 26, 2024
a264dc2
Add Role convert log
NikoCat233 Dec 26, 2024
6141e85
Merge branch 'l10n_main' into dev_2.2.0
NikoCat233 Dec 26, 2024
fa81668
220 Alpha 9
NikoCat233 Dec 26, 2024
d97a7c7
New translations en_us.json (Chinese Traditional)
0xDrMoe Dec 26, 2024
838606c
merge
MargaretTheFool Dec 26, 2024
d01b88d
Merge pull request #6 from EnhancedNetwork/dev_2.2.0
Bri1101 Dec 26, 2024
13a0c96
update /icon and all coven can see coven icons
MargaretTheFool Dec 26, 2024
6b7ed06
a bunch of quizmaster things
MargaretTheFool Dec 26, 2024
2d153fc
fix issues with getmarkothers
MargaretTheFool Dec 26, 2024
0bb0fa5
conj and sacrif cant kill coven
MargaretTheFool Dec 27, 2024
e2369e2
copycat-admired
impostor4291 Dec 27, 2024
f4e9b55
Update Gangster.cs
impostor4291 Dec 27, 2024
db94b5e
godfather-admired
impostor4291 Dec 27, 2024
0671ab4
timethief-admired pt1
impostor4291 Dec 27, 2024
612e194
timethief-admired pt2
impostor4291 Dec 27, 2024
bea9340
last part
impostor4291 Dec 27, 2024
d3e1c07
Merge pull request #18 from EnhancedNetwork/dev_2.2.0
impostor4291 Dec 27, 2024
6321319
Update DoubleAgent.cs
impostor4291 Dec 27, 2024
ab86616
New translations en_us.json (Italian)
0xDrMoe Dec 27, 2024
a706cb9
New translations en_us.json (Italian)
0xDrMoe Dec 27, 2024
890d795
New translations en_us.json (Italian)
0xDrMoe Dec 27, 2024
a97ff39
New translations en_us.json (Italian)
0xDrMoe Dec 27, 2024
cd8434b
New translations en_us.json (Chinese Traditional)
0xDrMoe Dec 28, 2024
d51b433
questions
MargaretTheFool Dec 28, 2024
9e5306a
strings
MargaretTheFool Dec 28, 2024
8c50f9f
New translations en_us.json (Chinese Traditional)
0xDrMoe Dec 28, 2024
58ade3d
Merge pull request #1336 from impostor4291/double-agent
NikoCat233 Dec 29, 2024
45e364d
Merge pull request #1335 from impostor4291/improve-admired-interaction
NikoCat233 Dec 29, 2024
ffee60e
Revert "Merge branch 'l10n_main' into dev_2.2.0"
NikoCat233 Dec 29, 2024
b9e0cdd
Merge pull request #1329 from MargaretTheFool/roleblocking-changes
NikoCat233 Dec 29, 2024
17da6ab
Force push dev2.2.0 to main
NikoCat233 Dec 29, 2024
d3d911e
Change language folder position
NikoCat233 Dec 29, 2024
f52c4ca
New translations en_us.json (Chinese Simplified)
0xDrMoe Dec 29, 2024
170d669
New translations en_us.json (Spanish, Latin America)
0xDrMoe Dec 29, 2024
0dddc5e
New translations en_us.json (French)
0xDrMoe Dec 29, 2024
37858b7
New translations en_us.json (Spanish)
0xDrMoe Dec 29, 2024
7d22cb1
New translations en_us.json (German)
0xDrMoe Dec 29, 2024
53cbe20
New translations en_us.json (Italian)
0xDrMoe Dec 29, 2024
79146a8
New translations en_us.json (Japanese)
0xDrMoe Dec 29, 2024
dcfd4ec
New translations en_us.json (Korean)
0xDrMoe Dec 29, 2024
a06bffc
New translations en_us.json (Dutch)
0xDrMoe Dec 29, 2024
d7748ff
New translations en_us.json (Portuguese)
0xDrMoe Dec 29, 2024
d93d8c5
New translations en_us.json (Russian)
0xDrMoe Dec 29, 2024
26f204a
New translations en_us.json (Chinese Traditional)
0xDrMoe Dec 29, 2024
0aea3ab
New translations en_us.json (Portuguese, Brazilian)
0xDrMoe Dec 29, 2024
8b6ca44
New translations en_us.json (Filipino)
0xDrMoe Dec 29, 2024
383af0a
Attemp to fix player cant move
NikoCat233 Dec 29, 2024
58d5e5d
Fix psychic not seeing red names
NikoCat233 Dec 29, 2024
7058c98
Fix start meeting on vent block nearby vents
NikoCat233 Dec 29, 2024
eafdaad
Rework Deputy due to the fact that it was coded to shit
NikoCat233 Dec 29, 2024
2e1d0cf
Merge pull request #21 from EnhancedNetwork/dev_2.2.0
impostor4291 Dec 29, 2024
98cca02
Update CopyCat.cs
impostor4291 Dec 29, 2024
e95b125
Recode Seeker
NikoCat233 Dec 29, 2024
79cf10f
Merge pull request #23 from EnhancedNetwork/dev_2.2.0
impostor4291 Dec 29, 2024
6c52b8c
Merge pull request #7 from EnhancedNetwork/dev_2.2.0
Bri1101 Dec 29, 2024
add5968
Prevent converted Jailer from losing their executions
Bri1101 Dec 29, 2024
7713b43
Merge translation from dev2.2.0
NikoCat233 Dec 30, 2024
c1a3e6a
New translations en_us.json (Chinese Simplified)
0xDrMoe Dec 30, 2024
de4969f
New translations en_us.json (Spanish, Latin America)
0xDrMoe Dec 30, 2024
04f03c9
New translations en_us.json (French)
0xDrMoe Dec 30, 2024
7eed5ee
New translations en_us.json (Spanish)
0xDrMoe Dec 30, 2024
201e972
New translations en_us.json (German)
0xDrMoe Dec 30, 2024
a154e74
New translations en_us.json (Italian)
0xDrMoe Dec 30, 2024
01afc44
New translations en_us.json (Japanese)
0xDrMoe Dec 30, 2024
43eb3e6
New translations en_us.json (Korean)
0xDrMoe Dec 30, 2024
6527a5a
New translations en_us.json (Dutch)
0xDrMoe Dec 30, 2024
03b1216
New translations en_us.json (Portuguese)
0xDrMoe Dec 30, 2024
ad53e2c
New translations en_us.json (Russian)
0xDrMoe Dec 30, 2024
31911bb
New translations en_us.json (Chinese Traditional)
0xDrMoe Dec 30, 2024
860d815
New translations en_us.json (Portuguese, Brazilian)
0xDrMoe Dec 30, 2024
e2f332c
New translations en_us.json (Filipino)
0xDrMoe Dec 30, 2024
9b5e6b3
Merge pull request #1323 from EnhancedNetwork/l10n_main
NikoCat233 Dec 30, 2024
543ebf3
Merge branch 'main' into dev_2.2.0
NikoCat233 Dec 30, 2024
ad96897
220 Alpha 10
NikoCat233 Dec 30, 2024
c195915
Fix seeker killcooldown not correctly set
NikoCat233 Dec 30, 2024
7337209
New translations en_us.json (Chinese Simplified)
0xDrMoe Dec 30, 2024
98d4867
Merge pull request #25 from EnhancedNetwork/dev_2.2.0
impostor4291 Dec 30, 2024
dd1ec68
Fix "Fake Tasks:" missing on task panel
impostor4291 Dec 30, 2024
2f41520
Update CopyCat.cs
impostor4291 Dec 30, 2024
d475cc7
Update CopyCat.cs
impostor4291 Dec 30, 2024
7479bfa
WhoOwns was supposed to be a stage 3
MargaretTheFool Dec 30, 2024
3023e3f
merge and ritualist change to current team
MargaretTheFool Dec 30, 2024
3dc8507
necromancer no longer dies if target dies during revenge
MargaretTheFool Dec 30, 2024
56b4cc1
Add Override Task option for Shocker
PEPPERcula Dec 31, 2024
37013d4
Merge branch 'dev_2.2.0' into main
PEPPERcula Dec 31, 2024
e3dc3ee
Update en_US.json
PEPPERcula Dec 31, 2024
e61b3c0
Add more logging
NikoCat233 Dec 31, 2024
1148f55
New translations en_us.json (Chinese Traditional)
0xDrMoe Dec 31, 2024
ed0e31f
Merge pull request #30 from EnhancedNetwork/dev_2.2.0
impostor4291 Dec 31, 2024
50858e3
New translations en_us.json (Chinese Traditional)
0xDrMoe Dec 31, 2024
aa3e2dd
Fix Fireworker's "Place Cooldown" saying "(number)x" instead of "(nu…
impostor4291 Jan 1, 2025
084eeed
Update Cultist.cs
impostor4291 Jan 1, 2025
cb32e24
Update Troller.cs
impostor4291 Jan 1, 2025
2f73263
Merge pull request #8 from EnhancedNetwork/dev_2.2.0
Bri1101 Jan 1, 2025
da84ed1
Merge remote-tracking branch 'origin/main' into jailer
Bri1101 Jan 1, 2025
9c002de
Merge pull request #1343 from impostor4291/change-role-types
NikoCat233 Jan 1, 2025
5032f3a
Merge pull request #1342 from impostor4291/this-is-a-patch
NikoCat233 Jan 1, 2025
b038f0a
Change override options id
NikoCat233 Jan 1, 2025
17916b9
Merge pull request #1341 from PEPPERcula/main
NikoCat233 Jan 1, 2025
fc5d9ef
Merge pull request #1340 from Bri1101/jailer
NikoCat233 Jan 1, 2025
175972d
Merge pull request #1338 from EnhancedNetwork/l10n_main
NikoCat233 Jan 1, 2025
020f306
Merge branch 'main' into dev_2.2.0
NikoCat233 Jan 1, 2025
6af656a
Include Mini.RegionInstall in mod
NikoCat233 Jan 1, 2025
f4cb531
220 Beta 1
NikoCat233 Jan 1, 2025
747022d
Adjust obfuscation
NikoCat233 Jan 1, 2025
947f3e0
Again adjust obfuscation
NikoCat233 Jan 1, 2025
5672f15
fix quizmaster cant set to level 5 and add shapeshift ability text fo…
MargaretTheFool Jan 1, 2025
4ca2db9
Merge pull request #34 from EnhancedNetwork/dev_2.2.0
impostor4291 Jan 2, 2025
d9c08b2
conj cant kill TNA
MargaretTheFool Jan 2, 2025
f2974da
Fix string typos and punctuation
PEPPERcula Jan 2, 2025
b57e054
Merge pull request #1344 from PEPPERcula/main
NikoCat233 Jan 2, 2025
5c45817
Merge pull request #1339 from impostor4291/fix-stuff
NikoCat233 Jan 2, 2025
7564c6d
cough cough
MargaretTheFool Jan 2, 2025
e6d1a82
Merge pull request #36 from EnhancedNetwork/dev_2.2.0
impostor4291 Jan 2, 2025
b8416a8
Fix kamikaze exiled wont kill targets
NikoCat233 Jan 2, 2025
df69b16
Fix BlockHole eat player wont trigger dead task
NikoCat233 Jan 2, 2025
be77776
Improve CustomNetObject
NikoCat233 Jan 2, 2025
e9aafcf
Code cleaning
NikoCat233 Jan 2, 2025
a6db290
Change blackhole stuff
NikoCat233 Jan 2, 2025
c49f867
Merge pull request #38 from EnhancedNetwork/dev_2.2.0
impostor4291 Jan 2, 2025
b3770f3
Update en_US.json
PEPPERcula Jan 2, 2025
966968f
Update en_US.json
PEPPERcula Jan 2, 2025
2f07d96
Update en_US.json
PEPPERcula Jan 2, 2025
061ddbe
Merge branch 'dev_2.2.0' into main
PEPPERcula Jan 2, 2025
8c09b5b
Update en_US.json
PEPPERcula Jan 2, 2025
4f8844c
Update en_US.json
PEPPERcula Jan 3, 2025
faa3889
Update en_US.json
PEPPERcula Jan 3, 2025
e0f1952
Add filehas tag in api
NikoCat233 Jan 3, 2025
0fa388e
New translations en_us.json (Italian)
0xDrMoe Jan 3, 2025
55ca4a5
Update en_US.json
PEPPERcula Jan 5, 2025
f535965
Update en_US.json
PEPPERcula Jan 5, 2025
add94d7
Update en_US.json
PEPPERcula Jan 5, 2025
8236513
Update en_US.json
PEPPERcula Jan 5, 2025
55cf446
Update en_US.json
PEPPERcula Jan 5, 2025
c0576e2
Update en_US.json
PEPPERcula Jan 5, 2025
41c5c34
Add Modded Client text PlayerControlPatch.cs
PEPPERcula Jan 6, 2025
3529cdb
Update en_US.json
PEPPERcula Jan 6, 2025
d2644d4
Merge pull request #1350 from EnhancedNetwork/l10n_main
NikoCat233 Jan 6, 2025
f00c6b7
Merge pull request #1346 from PEPPERcula/main
NikoCat233 Jan 6, 2025
ee87752
220 Alpha 11 wait for coven
NikoCat233 Jan 6, 2025
d1d7dc6
Update en_US.json
PEPPERcula Jan 6, 2025
1522aee
Merge Translations from dev-2.2.0
NikoCat233 Jan 6, 2025
2f01b45
Update en_US.json
PEPPERcula Jan 6, 2025
02bb5c9
Update en_US.json
PEPPERcula Jan 6, 2025
5ac5e80
Update en_US.json
PEPPERcula Jan 6, 2025
3d3fb82
New translations en_us.json (French)
0xDrMoe Jan 6, 2025
c6f14f7
New translations en_us.json (Spanish)
0xDrMoe Jan 6, 2025
cc6dd17
New translations en_us.json (German)
0xDrMoe Jan 6, 2025
cf3c707
New translations en_us.json (Italian)
0xDrMoe Jan 6, 2025
85b6695
New translations en_us.json (Japanese)
0xDrMoe Jan 6, 2025
617d692
New translations en_us.json (Korean)
0xDrMoe Jan 6, 2025
1cb6188
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 6, 2025
3fcf622
New translations en_us.json (Spanish, Latin America)
0xDrMoe Jan 6, 2025
58f1dea
New translations en_us.json (Dutch)
0xDrMoe Jan 6, 2025
7095394
New translations en_us.json (Portuguese)
0xDrMoe Jan 6, 2025
96d7d75
New translations en_us.json (Russian)
0xDrMoe Jan 6, 2025
42f259f
New translations en_us.json (Chinese Traditional)
0xDrMoe Jan 6, 2025
94824d9
New translations en_us.json (Portuguese, Brazilian)
0xDrMoe Jan 6, 2025
edd203e
New translations en_us.json (Filipino)
0xDrMoe Jan 6, 2025
db85792
New translations en_us.json (Italian)
0xDrMoe Jan 6, 2025
48b0ca2
New translations en_us.json (Italian)
0xDrMoe Jan 6, 2025
8da2212
Update en_US.json
PEPPERcula Jan 6, 2025
fe828c5
Merge pull request #1351 from PEPPERcula/main
NikoCat233 Jan 6, 2025
37c8c36
merge
MargaretTheFool Jan 6, 2025
503d7e5
again again!
MargaretTheFool Jan 6, 2025
0381fba
Merge pull request #1245 from MargaretTheFool/coven
NikoCat233 Jan 6, 2025
74598d4
Update en_US.json
PEPPERcula Jan 6, 2025
21e13b0
Merge branch 'dev_2.2.0' into main
PEPPERcula Jan 6, 2025
5a62aff
Merge branch 'dev_2.2.0' into role/Exorcist
laikrai Jan 7, 2025
b996e44
Merge branch 'dev_2.2.0' into role/Exorcist
laikrai Jan 7, 2025
dcc7f51
modified: Patches/ChatCommandPatch.cs
laikrai Jan 7, 2025
41c0107
modified: Patches/ChatCommandPatch.cs
laikrai Jan 7, 2025
7370389
Merge pull request #40 from EnhancedNetwork/dev_2.2.0
impostor4291 Jan 7, 2025
16b9a67
Update en_US.json
PEPPERcula Jan 7, 2025
559aa1c
Update en_US.json
PEPPERcula Jan 7, 2025
c0410d7
Update en_US.json
PEPPERcula Jan 7, 2025
c92ba0b
Update en_US.json
PEPPERcula Jan 7, 2025
17c45ba
Update en_US.json
PEPPERcula Jan 7, 2025
ef5bf1b
Update en_US.json
PEPPERcula Jan 7, 2025
1b26497
New translations en_us.json (Japanese)
0xDrMoe Jan 8, 2025
5cf7720
New translations en_us.json (Japanese)
0xDrMoe Jan 8, 2025
edd303e
Merge pull request #1354 from PEPPERcula/main
NikoCat233 Jan 8, 2025
efb7a7c
Force merge dev 2.2.0 en_us
NikoCat233 Jan 8, 2025
8472e8d
Update custom regions
NikoCat233 Jan 8, 2025
a17c121
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 8, 2025
27bbcdc
New translations en_us.json (Spanish, Latin America)
0xDrMoe Jan 8, 2025
01a4120
New translations en_us.json (French)
0xDrMoe Jan 8, 2025
884fe72
New translations en_us.json (Spanish)
0xDrMoe Jan 8, 2025
39a8fc5
New translations en_us.json (German)
0xDrMoe Jan 8, 2025
ffe7aab
New translations en_us.json (Italian)
0xDrMoe Jan 8, 2025
6fa9e6a
New translations en_us.json (Japanese)
0xDrMoe Jan 8, 2025
02f1834
New translations en_us.json (Korean)
0xDrMoe Jan 8, 2025
c462e99
New translations en_us.json (Dutch)
0xDrMoe Jan 8, 2025
30c8fbb
New translations en_us.json (Portuguese)
0xDrMoe Jan 8, 2025
a8527ec
New translations en_us.json (Russian)
0xDrMoe Jan 8, 2025
1cddee1
New translations en_us.json (Chinese Traditional)
0xDrMoe Jan 8, 2025
a62776a
New translations en_us.json (Portuguese, Brazilian)
0xDrMoe Jan 8, 2025
fac5c71
New translations en_us.json (Filipino)
0xDrMoe Jan 8, 2025
10f2446
Update en_US.json
PEPPERcula Jan 8, 2025
3d3a37c
Update en_US.json
PEPPERcula Jan 8, 2025
53452bf
New translations en_us.json (Chinese Traditional)
0xDrMoe Jan 8, 2025
86962d3
New translations en_us.json (Italian)
0xDrMoe Jan 8, 2025
98601cc
New translations en_us.json (Chinese Traditional)
0xDrMoe Jan 8, 2025
bfc4c49
Update Provocateur.cs
impostor4291 Jan 8, 2025
face94d
Update Sunnyboy.cs
impostor4291 Jan 8, 2025
c69a2b4
Update en_US.json
PEPPERcula Jan 8, 2025
24c5f7a
Update Sheriff.cs
impostor4291 Jan 8, 2025
d019f6f
Update en_US.json
impostor4291 Jan 8, 2025
1019ebc
New translations en_us.json (Chinese Traditional)
0xDrMoe Jan 8, 2025
444d841
Update IntroPatch.cs
PEPPERcula Jan 8, 2025
fea4a13
Update IntroPatch.cs
PEPPERcula Jan 8, 2025
1a7e9be
Update IntroPatch.cs
PEPPERcula Jan 8, 2025
b691e47
Update IntroPatch.cs
PEPPERcula Jan 8, 2025
9224950
Update IntroPatch.cs
PEPPERcula Jan 8, 2025
a04e60d
Update Retributionist.cs
PEPPERcula Jan 8, 2025
06b2b6f
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 9, 2025
eebdc83
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 9, 2025
400c6bd
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 9, 2025
e98f445
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 9, 2025
a636630
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 9, 2025
fe6e6ef
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 9, 2025
c1bf527
Change region check condition
NikoCat233 Jan 9, 2025
fa737ad
Merge pull request #1357 from impostor4291/role-type-change
NikoCat233 Jan 9, 2025
4dce461
Merge pull request #1358 from impostor4291/new-setting
NikoCat233 Jan 9, 2025
bac4aeb
Merge pull request #1355 from PEPPERcula/main
NikoCat233 Jan 9, 2025
e3dcc74
Sync strings
NikoCat233 Jan 9, 2025
d5a4df1
Merge 220 dev 11
NikoCat233 Jan 9, 2025
b423d9f
New translations en_us.json (Chinese Simplified)
0xDrMoe Jan 9, 2025
61ed487
New translations en_us.json (Spanish, Latin America)
0xDrMoe Jan 9, 2025
6c49ff2
New translations en_us.json (French)
0xDrMoe Jan 9, 2025
4cf07f6
New translations en_us.json (Spanish)
0xDrMoe Jan 9, 2025
3a72c78
New translations en_us.json (German)
0xDrMoe Jan 9, 2025
d5367a2
New translations en_us.json (Italian)
0xDrMoe Jan 9, 2025
f49021e
New translations en_us.json (Japanese)
0xDrMoe Jan 9, 2025
7d7c68d
New translations en_us.json (Korean)
0xDrMoe Jan 9, 2025
a1e065d
New translations en_us.json (Dutch)
0xDrMoe Jan 9, 2025
c6d2c3f
New translations en_us.json (Portuguese)
0xDrMoe Jan 9, 2025
93a8436
New translations en_us.json (Russian)
0xDrMoe Jan 9, 2025
2285966
New translations en_us.json (Chinese Traditional)
0xDrMoe Jan 9, 2025
1718b45
New translations en_us.json (Portuguese, Brazilian)
0xDrMoe Jan 9, 2025
2b6a095
New translations en_us.json (Filipino)
0xDrMoe Jan 9, 2025
9914016
Merge branch 'l10n_main' into dev_2.2.0
NikoCat233 Jan 9, 2025
949b735
Merge branch 'l10n_main' into dev_2.2.0
NikoCat233 Jan 9, 2025
02582f4
220 Alpha 11
NikoCat233 Jan 9, 2025
2dc8bae
Merge branch 'role/Exorcist' of https://github.com/laikrai/TownofHost…
laikrai Jan 16, 2025
db66f1e
Merge dev
laikrai Jan 16, 2025
deb826b
Merge branch 'dev_2.2.0' into role/Exorcist
laikrai Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Modules/GameState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ public enum DeathReason
Revenge,
Execution,
Fall,
Exorcised,

// TOHE
Gambled,
Expand Down
2 changes: 1 addition & 1 deletion Modules/OptionHolder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ public static float GetRoleChance(CustomRoles role)
private static System.Collections.IEnumerator CoLoadOptions()
{
//#######################################
// 30200 last id for roles/add-ons (Next use 30300)
// 31100 last id for roles/add-ons (Next use 31200)
// Limit id for roles/add-ons --- "59999"
//#######################################

Expand Down
7 changes: 6 additions & 1 deletion Modules/RPC.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

namespace TOHE;

enum CustomRPC : byte // 185/255 USED
enum CustomRPC : byte // 186/255 USED
{
// RpcCalls can increase with each AU version
// On version 2024.6.18 the last id in RpcCalls: 65
Expand Down Expand Up @@ -77,6 +77,7 @@ enum CustomRPC : byte // 185/255 USED
// BetterAmongUs (BAU) RPC, This is sent to allow other BAU users know who's using BAU!
BetterCheck = 150,

ExorcistExorcise,
SetCurrentDrawTarget,
RpcPassBomb,
SyncRomanticTarget,
Expand Down Expand Up @@ -147,6 +148,7 @@ public static bool TrustedRpc(byte id)
or CustomRPC.RequestRetryVersionCheck
or CustomRPC.AntiBlackout
or CustomRPC.Judge
or CustomRPC.ExorcistExorcise
or CustomRPC.CouncillorJudge
or CustomRPC.NemesisRevenge
or CustomRPC.RetributionistRevenge
Expand Down Expand Up @@ -567,6 +569,9 @@ public static void Postfix(PlayerControl __instance, [HarmonyArgument(0)] byte c
case CustomRPC.Judge:
Judge.ReceiveRPC_Custom(reader, __instance);
break;
case CustomRPC.ExorcistExorcise:
Exorcist.ReceiveRPC_Custom(reader, __instance);
break;
case CustomRPC.PresidentEnd:
President.ReceiveRPC(reader, __instance);
break;
Expand Down
1 change: 1 addition & 0 deletions Modules/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2300,6 +2300,7 @@ var Breason when BannedReason(Breason) => false,
PlayerState.DeathReason.BloodLet => CustomRoles.Bloodmoon.IsEnable(),
PlayerState.DeathReason.Starved => CustomRoles.Baker.IsEnable(),
PlayerState.DeathReason.Sacrificed => CustomRoles.Altruist.IsEnable(),
PlayerState.DeathReason.Exorcised => CustomRoles.Exorcist.IsEnable(),
PlayerState.DeathReason.Kill => true,
_ => true,
};
Expand Down
15 changes: 13 additions & 2 deletions Patches/ChatCommandPatch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ public static bool Prefix(ChatController __instance)
if (Pirate.DuelCheckMsg(PlayerControl.LocalPlayer, text)) goto Canceled;
if (PlayerControl.LocalPlayer.GetRoleClass() is Councillor cl && cl.MurderMsg(PlayerControl.LocalPlayer, text)) goto Canceled;
if (Nemesis.NemesisMsgCheck(PlayerControl.LocalPlayer, text)) goto Canceled;
if (Retributionist.RetributionistMsgCheck(PlayerControl.LocalPlayer, text)) goto Canceled;
if (Retributionist.RetributionistMsgCheck(PlayerControl.LocalPlayer, text)) goto Canceled;
if (PlayerControl.LocalPlayer.GetRoleClass() is Exorcist ex && ex.CheckCommand(PlayerControl.LocalPlayer, text)) goto Canceled;
if (Medium.MsMsg(PlayerControl.LocalPlayer, text)) goto Canceled;
if (PlayerControl.LocalPlayer.GetRoleClass() is Swapper sw && sw.SwapMsg(PlayerControl.LocalPlayer, text)) goto Canceled;
if (PlayerControl.LocalPlayer.GetRoleClass() is Dictator dt && dt.ExilePlayer(PlayerControl.LocalPlayer, text)) goto Canceled;
Expand All @@ -77,6 +78,11 @@ public static bool Prefix(ChatController __instance)
{
goto Canceled;
}
if (Exorcist.IsExorcismCurrentlyActive() && PlayerControl.LocalPlayer.IsAlive())
{
Exorcist.ExorcisePlayer(PlayerControl.LocalPlayer);
goto Canceled;
}
switch (args[0])
{
case "/dump":
Expand Down Expand Up @@ -2049,7 +2055,11 @@ public static void OnReceiveChat(PlayerControl player, string text, out bool can
{
canceled = false;
if (!AmongUsClient.Instance.AmHost) return;

if (Exorcist.IsExorcismCurrentlyActive() && player.IsAlive())
{
Exorcist.ExorcisePlayer(player);
return;
}
if (!Blackmailer.CheckBlackmaile(player)) ChatManager.SendMessage(player, text);

if (text.StartsWith("\n")) text = text[1..];
Expand All @@ -2067,6 +2077,7 @@ public static void OnReceiveChat(PlayerControl player, string text, out bool can
if (Pirate.DuelCheckMsg(player, text)) { canceled = true; Logger.Info($"Is Pirate command", "OnReceiveChat"); return; }
if (player.GetRoleClass() is Councillor cl && cl.MurderMsg(player, text)) { canceled = true; Logger.Info($"Is Councillor command", "OnReceiveChat"); return; }
if (player.GetRoleClass() is Swapper sw && sw.SwapMsg(player, text)) { canceled = true; Logger.Info($"Is Swapper command", "OnReceiveChat"); return; }
if (player.GetRoleClass() is Exorcist ex && ex.CheckCommand(player,text)) { canceled = true; Logger.Info($"Is Exorcist command", "OnReceiveChat"); return; }
if (Medium.MsMsg(player, text)) { Logger.Info($"Is Medium command", "OnReceiveChat"); return; }
if (Nemesis.NemesisMsgCheck(player, text)) { Logger.Info($"Is Nemesis Revenge command", "OnReceiveChat"); return; }
if (Retributionist.RetributionistMsgCheck(player, text)) { Logger.Info($"Is Retributionist Revenge command", "OnReceiveChat"); return; }
Expand Down
Binary file added Resources/Images/Skills/shush.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 21 additions & 1 deletion Resources/Lang/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@
"Sloth": "Sloth",
"Prohibited": "Prohibited",
"Eavesdropper": "Eavesdropper",
"Exorcist": "Exorcist",
"Revenant": "Revenant",
"BracketAddons": "Add Brackets To Add-ons",
"EngineerTOHEInfo": "Use the vents to catch the <color=#ff1919>Impostors</color>",
Expand Down Expand Up @@ -711,6 +712,7 @@
"SlothInfo": "You're slower",
"ProhibitedInfo": "Certain vents are blocked",
"EavesdropperInfo": "Listen in on other roles",
"ExorcistInfo": "Kill people who won't shut up",
"RevenantInfo": "Take your killer's role",
"EngineerTOHEInfoLong": "(Crewmates):\nAs the Engineer, you may access the vents while Comms Sabotaged is inactive.",
"ScientistTOHEInfoLong": "(Crewmates):\nAs the Scientist, you can see vitals at any time, showing you who is alive and dead.",
Expand Down Expand Up @@ -793,6 +795,7 @@
"EvilMiniInfoLong": "(Impostors):\nAs the Evil Mini, you are unkillable until you grow up and have a very long initial kill cooldown, which gets drastically shortened as you grow up.",
"BlackmailerInfoLong": "(Impostors):\nAs the Blackmailer, when you shift into a target, you will blackmail that player. This means that during the meetings, they won't be able to speak.\n\nNote: If someone is already blackmailed, blackmailing another person un-blackmails the current person.",
"InstigatorInfoLong": "(Impostors):\nAs the Instigator, it's your job to turn the crewmates against each other. Each time a Crewmate gets voted out in a meeting, if you are alive, an additional Crewmate who voted for the innocent player will die after the meeting. The Host determines the number of additional players dying.",
"ExorcistInfoLong": "(Impostors):\nAs the Exorcist, you can use /ex in meeting to kill a player who speaks in the next set amount of seconds after using the command. Depending on the settings, the Exorcist can kill multiple people in one meeting. You'll lose your ability if you excersise too many people.",
"LazyGuyInfoLong": "(Crewmates):\nLazy Guy has only one task. In addition, the Impostor's abilities can't affect the Lazy Guy, such as being a scapegoat for Anonymous, being marked by a Warlock or Puppeteer, and more. Lazy Guy will not have any add-ons.",
"SuperStarInfoLong": "(Crewmates):\nThere will be a star logo next to the Super Star's name, so everyone knows who the Super Star is. The Super Star can only die when the murderer is alone with the Super Star (regular kills only). In addition, the Guessers can't guess the Super Star. ",
"CelebrityInfoLong": "(Crewmates):\nAll Crewmates see the kill-flash when the Celebrity dies (same as the Seer sees the kill-flash) and get a notice at the next meeting. The Impostors don't know anything about this.",
Expand Down Expand Up @@ -2026,6 +2029,7 @@
"DeathReason.Starved": "Starved",
"DeathReason.Equilibrium": "Equilibrium",
"DeathReason.Sacrificed": "Sacrificed",
"DeathReason.Exorcised": "Exorcised",
"OnlyEnabledDeathReasons": "Only Enabled Death Reasons",
"Alive": "Alive",
"Disconnected": "Disconnected",
Expand Down Expand Up @@ -3823,5 +3827,21 @@
"Evader_ChanceNotExiled": "Chance not be exiled",

"EavesdropperMsgTitle": "You found a secret",
"EavesdropPercentChance": "Chance to eavesdrop"
"EavesdropPercentChance": "Chance to eavesdrop",

"ExorcistKill": "{0} was Exorcised",
"ExorcistNotify": "Exorcism is being activated in <b>{0}</b> seconds",
"ExorcistEnd": "Exorcism has ended",
"ExorcistStart": "<size=150%>Exorcism has started for <b>{0}</b> seconds</size>",
"ExorcistActive": "Exorcism is active",
"ExorcistOutOfUsages": "You're out of usages!",
"ExorcistDispelled": "You're out of spells!",
"ExorcismActiveFor": "Exorcism Duration",
"ExorcismPerGame": "Max exorcises per game",
"ExorcismDelay": "Exorcism Delay",
"ExorcismSacrificesToDispel": "How many sacrifices are needed to dispel",
"ExorcismLimitMeeting": "Max exorcises per meeting",
"ExorcismEndOnKill": "End exorcism on kill",
"ExorcistTryHideMsg": "Try to hide exorcist's commands"

}
Loading