Feat/lr (#68)

edgegamers · Mar 3, 2024 · 0cb80de · 0cb80de
2 parents e649e00 + a6b172f
commit 0cb80de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lang/Jailbreak.English/LastRequest/LastRequestMessages.cs b/lang/Jailbreak.English/LastRequest/LastRequestMessages.cs
@@ -63,17 +63,18 @@ public IView InformLastRequest(AbstractLastRequest lr)
         return new SimpleView()
         {
             PREFIX,
-            lr.prisoner, "is", lr.type.ToFriendlyString(),
-            "against", lr.guard
+            lr.prisoner, "is preparing a", lr.type.ToFriendlyString(),
+            "Last Request against", lr.guard
         };
     }
 
     public IView AnnounceLastRequest(AbstractLastRequest lr)
     {
         return new SimpleView()
         {
-            lr.prisoner, "is", lr.type.ToFriendlyString(),
-            "against", lr.guard
+            PREFIX,
+            lr.prisoner, "is doing a", lr.type.ToFriendlyString(),
+            "Last Request against", lr.guard
         };
     }
 

diff --git a/mod/Jailbreak.LastRequest/LastRequests/ShotForShot.cs b/mod/Jailbreak.LastRequest/LastRequests/ShotForShot.cs
@@ -16,7 +16,7 @@ public ShotForShot(BasePlugin plugin, ILastRequestManager manager, CCSPlayerCont
     {
     }
 
-    public override LRType type => LRType.GunToss;
+    public override LRType type => LRType.ShotForShot;
     private CCSPlayerController whosShot;
 
     public override void Setup()
@@ -90,7 +90,6 @@ public override void Execute()
                 PrintToParticipants("Health was the deciding factor. ");
             }
 
-            manager.EndLastRequest(this, result);
             if (result == LRResult.GuardWin)
                 prisoner.Pawn.Value?.CommitSuicide(false, true);
             else
@@ -109,6 +108,12 @@ public HookResult OnPlayerShoot(EventPlayerShoot @event, GameEventInfo info)
 
         if (player.Slot != prisoner.Slot && player.Slot != guard.Slot)
             return HookResult.Continue;
+        if (player.Slot != whosShot.Slot)
+        {
+            PrintToParticipants(player.PlayerName + " cheated.");
+            player.Pawn.Value?.CommitSuicide(false, true);
+            return HookResult.Handled;
+        }
 
         PrintToParticipants(player.PlayerName + " has shot.");
         var opponent = player.Slot == prisoner.Slot ? guard : prisoner;