@@ -24,7 +24,7 @@ internal class ExileControllerBeginPatch
2424 public static bool Prefix ( ExileController __instance , [ HarmonyArgument ( 0 ) ] ref GameData . PlayerInfo exiled , [ HarmonyArgument ( 1 ) ] bool tie )
2525 {
2626 lastExiled = exiled ;
27-
27+ Message ( $ "开始放逐: { exiled ? . PlayerName ?? "null" } " ) ;
2828 if ( Balancer . currentAbilityUser != null && Balancer . IsDoubleExile && ! IsSec )
2929 {
3030 IsSec = true ;
@@ -64,9 +64,25 @@ void createlate(int index)
6464 Helpers . SetActiveAllObject ( controller . gameObject . GetChildren ( ) , "RaftAnimation" , false ) ;
6565 controller . transform . localPosition = new ( - 3.75f , - 0.2f , - 60f ) ;
6666 }
67+ if ( Lawyer . lawyer != null && exiled ? . Object . PlayerId == Lawyer . target . PlayerId && Lawyer . target != Jester . jester )
68+ {
69+ var writer = StartRPC ( PlayerControl . LocalPlayer , CustomRPC . LawyerPromotesToPursuer ) ;
70+ writer . Write ( true ) ;
71+ writer . EndRPC ( ) ;
72+ Lawyer . PromotesToPursuer ( true ) ;
73+ }
74+
6775 if ( ! IsSec ) return true ;
6876 }
6977
78+ if ( Lawyer . lawyer != null && exiled ? . Object . PlayerId == Lawyer . target . PlayerId && Lawyer . target != Jester . jester )
79+ {
80+ var writer = StartRPC ( PlayerControl . LocalPlayer , CustomRPC . LawyerPromotesToPursuer ) ;
81+ writer . Write ( true ) ;
82+ writer . EndRPC ( ) ;
83+ Lawyer . PromotesToPursuer ( true ) ;
84+ }
85+
7086 // Medic shield
7187 if ( Medic . medic != null && AmongUsClient . Instance . AmHost && Medic . futureShielded != null && ! Medic . medic . Data . IsDead )
7288 {
@@ -176,7 +192,7 @@ internal class ExileControllerWrapUpPatch
176192 public static void Prefix ( GameObject obj )
177193 {
178194 // Nightvision:
179- if ( obj ? . name != null && obj . name . Contains ( "FungleSecurity" ) )
195+ if ( obj != null && obj . name != null && obj . name . Contains ( "FungleSecurity" ) )
180196 {
181197 SurveillanceMinigamePatch . resetNightVision ( ) ;
182198 return ;
@@ -198,7 +214,7 @@ public static void Prefix(GameObject obj)
198214
199215 private static void WrapUpPostfix ( GameData . PlayerInfo exiled )
200216 {
201- Message ( "驱逐结束 " ) ;
217+ Message ( "WrapUp " ) ;
202218 if ( CachedPlayer . LocalPlayer . IsDead ) CanSeeRoleInfo = true ;
203219 // Prosecutor win condition
204220 if ( exiled != null && Executioner . executioner != null && Executioner . target != null &&
@@ -227,27 +243,31 @@ private static void WrapUpPostfix(GameData.PlayerInfo exiled)
227243 AmongUsClient . Instance . FinishRpcImmediately ( writer ) ;
228244 Executioner . PromotesRole ( ) ;
229245 }
230- else if ( Witness . Player == CachedPlayer . LocalPlayer . PlayerControl && Witness . target != null && Witness . killerTarget != null )
246+ if ( Witness . target != null && Witness . killerTarget != null )
231247 {
232- bool skip = exiled == null ;
248+ bool skip = exiled == null && Witness . skipMeeting ;
233249 bool targetIsKillerAndNotExiled = Witness . target == Witness . killerTarget && ( exiled ? . Object == null || Witness . target != exiled ? . Object ) ;
234- bool targetIsExiledAndNotKiller = ( Witness . target == exiled ? . Object || ( Witness . meetingDie && Witness . target . IsDead ( ) ) )
235- && Witness . target != Witness . killerTarget ;
250+ bool targetIsExiledAndNotKiller = Witness . target != Witness . killerTarget && ( Witness . target == exiled ? . Object ||
251+ ( Witness . meetingDie && Witness . target . IsDead ( ) ) ) ;
236252
237- if ( targetIsKillerAndNotExiled || targetIsExiledAndNotKiller )
253+ if ( ( ! skip && targetIsKillerAndNotExiled ) || targetIsExiledAndNotKiller )
238254 {
239255 Witness . exiledCount ++ ;
240256 }
241257
242258 if ( Witness . exiledCount == Witness . exileToWin )
243259 {
244- var writer = StartRPC ( CachedPlayer . LocalPlayer . PlayerControl , CustomRPC . WitnessWin ) ;
245- writer . EndRPC ( ) ;
246260 Witness . triggerWitnessWin = true ;
247261 }
248262 }
249263 Witness . target = Witness . killerTarget = null ;
250264
265+ if ( Vortox . Player . IsAlive ( ) )
266+ {
267+ Vortox . skipCount ++ ;
268+ if ( Vortox . skipCount == Vortox . skipMeetingNum ) Vortox . triggerImpWin = true ;
269+ }
270+
251271 // Reset custom button timers where necessary
252272 CustomButton . MeetingEndedUpdate ( ) ;
253273
@@ -292,7 +312,6 @@ private static void WrapUpPostfix(GameData.PlayerInfo exiled)
292312 } ) ) ) ;
293313 }
294314 }
295-
296315 Seer . deadBodyPositions = new List < Vector3 > ( ) ;
297316 }
298317
@@ -436,18 +455,16 @@ private static void WrapUpPostfix(GameData.PlayerInfo exiled)
436455
437456 if ( InfoSleuth . infoSleuth != null && InfoSleuth . target != null && InfoSleuth . infoSleuth == PlayerControl . LocalPlayer )
438457 {
439- string msg ;
440- var random = rnd . Next ( 2 ) ;
441- var isNotCrew = isNeutral ( InfoSleuth . target ) || InfoSleuth . target . isImpostor ( ) ;
442- var team = "的阵营是 " + teamString ( InfoSleuth . target ) ;
458+ var isNotCrew = ( isNeutral ( InfoSleuth . target ) || InfoSleuth . target . isImpostor ( ) ) ^ Vortox . Reversal ;
459+ var team = "的阵营是 " + getTeam ( InfoSleuth . target ) ;
443460 var info = InfoSleuth . infoType switch
444461 {
445462 0 => isNotCrew ? "不是船员" : "是船员" ,
446463 1 => team ,
447- _ => random == 0 ? isNotCrew ? "不是船员" : "是船员" : team ,
464+ _ => rnd . Next ( 2 ) == 0 ? isNotCrew ? "不是船员" : "是船员" : team ,
448465 } ;
449466
450- msg = $ "{ InfoSleuth . target . Data . PlayerName } { info } ";
467+ string msg = $ "{ InfoSleuth . target . Data . PlayerName } { info } ";
451468
452469 FastDestroyableSingleton < HudManager > . Instance . Chat . AddChat ( PlayerControl . LocalPlayer , $ "{ msg } ") ;
453470 var writer = StartRPC ( PlayerControl . LocalPlayer , CustomRPC . ShareGhostInfo ) ;
@@ -459,6 +476,19 @@ private static void WrapUpPostfix(GameData.PlayerInfo exiled)
459476 var writer1 = StartRPC ( PlayerControl . LocalPlayer , CustomRPC . InfoSleuthNoTarget ) ;
460477 writer1 . EndRPC ( ) ;
461478 RPCProcedure . infoSleuthNoTarget ( ) ;
479+
480+ static string getTeam ( PlayerControl player )
481+ {
482+ if ( Vortox . Player . IsAlive ( ) )
483+ {
484+ if ( player . isCrew ( ) ) return rnd . Next ( 2 ) == 0 ? "NeutralRolesText" . Translate ( ) : "ImpostorRolesText" . Translate ( ) ;
485+ if ( isNeutral ( player ) || player . isImpostor ( ) ) return "CrewmateRolesText" . Translate ( ) ;
486+ }
487+
488+ return isNeutral ( player ) ? "NeutralRolesText" . Translate ( )
489+ : player . isImpostor ( ) ? "ImpostorRolesText" . Translate ( )
490+ : "CrewmateRolesText" . Translate ( ) ;
491+ }
462492 }
463493
464494 // Invert add meeting
@@ -471,8 +501,7 @@ private static void WrapUpPostfix(GameData.PlayerInfo exiled)
471501 ( GameOptionsManager . Instance . currentNormalGameOptions . KillCooldown / 2 ) + 2 , new Action < float > ( p =>
472502 { if ( p == 1f ) foreach ( var trap in Trap . traps ) trap . triggerable = true ; } ) ) ) ;
473503
474- if ( ! Yoyo . markStaysOverMeeting )
475- Silhouette . clearSilhouettes ( ) ;
504+ if ( ! Yoyo . markStaysOverMeeting ) Silhouette . clearSilhouettes ( ) ;
476505
477506 if ( AmongUsClient . Instance . AmHost )
478507 {
0 commit comments