Change the .retreat command to the .vent command

PatPeter · Aug 23, 2021 · 6e63933 · 6e63933
1 parent d94fa7d
commit 6e63933
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/ZombieSuicideHotline/PlayerHandlers.cs b/ZombieSuicideHotline/PlayerHandlers.cs
@@ -58,11 +58,11 @@ public void OnPlayerSpawn(SpawningEventArgs ev)
             }
             if (ev.RoleType == RoleType.Scp049)
             {
-                player.Broadcast(10, "Use .recall to bring all your zombies to you");
+                player.Broadcast(10, "Use .recall to bring all your zombies to you.");
             }
             if (ev.RoleType == RoleType.Scp173)
             {
-                player.Broadcast(10, "Use .retreat to teleport to other SCPs");
+                player.Broadcast(10, "Use .vent to escape NTF fire and travel to another SCP.");
             }
 
             if (Spawns.ContainsKey(ev.RoleType) == false)
@@ -73,11 +73,14 @@ public void OnPlayerSpawn(SpawningEventArgs ev)
 
         public void OnPlayerDied(DiedEventArgs ev)
         {
-            Player player = ev.Target;
-            if (ev.Target.Role == RoleType.Scp0492)
-            {
-                    plugin.zombies[player.UserId].Disconnected = false;
-            }
+			if (plugin.Config.IsEnabled)
+			{
+				Player player = ev.Target;
+				if (ev.Target.Role == RoleType.Scp0492)
+				{
+					plugin.zombies[player.UserId].Disconnected = false;
+				}
+			}
         }
 
         public void OnPlayerHurt(HurtingEventArgs ev)
@@ -86,11 +89,13 @@ public void OnPlayerHurt(HurtingEventArgs ev)
 				plugin.Config.HotlineCalls.ContainsKey(ev.Target.Role.ToString()) &&
 				plugin.Config.HotlineCalls[ev.Target.Role.ToString()] != -1)
 			{
-				float originalAmount = ev.Amount;
-				float percentHealth = ev.Target.Health * plugin.Config.HotlineCalls[ev.Target.Role.ToString()];
-				ev.Target.Broadcast(new Broadcast("You called the Zombie Suicide Hotline and took " + Math.Min(originalAmount, percentHealth) + " damage instead of/same as " + originalAmount + " " + ev.DamageType + " damage.", 2));
 				if ((ev.DamageType == DamageTypes.Tesla || ev.DamageType == DamageTypes.Wall || ev.DamageType == DamageTypes.Decont))
 				{
+					float originalAmount = ev.Amount;
+					float percentHealth = ev.Target.Health * plugin.Config.HotlineCalls[ev.Target.Role.ToString()];
+					Log.Debug(ev.Target.Nickname + " called the SCP Suicide Hotline and took " + Math.Min(originalAmount, percentHealth) + " damage instead of/same as " + originalAmount + " " + ev.DamageType.name + " damage.");
+					ev.Target.Broadcast(new Broadcast("You called the SCP Suicide Hotline and took " + Math.Min(originalAmount, percentHealth) + " damage instead of/same as " + originalAmount + " " + ev.DamageType.name + " damage.", 2));
+
 					Player targetPlayer = GetTeleportTarget(ev.Target);
 					if (targetPlayer != null)
 					{

diff --git a/ZombieSuicideHotline/Properties/AssemblyInfo.cs b/ZombieSuicideHotline/Properties/AssemblyInfo.cs
@@ -48,6 +48,6 @@ static internal class AssemblyInfo
 		/// <summary>
 		/// The AssemblyFileVersion of this web part
 		/// </summary>
-		internal const string Version = "1.6.10.64";
+		internal const string Version = "1.6.11.65";
 	}
 }
diff --git a/ZombieSuicideHotline/RetreatCommand.cs → ZombieSuicideHotline/VentCommand.cs b/ZombieSuicideHotline/RetreatCommand.cs → ZombieSuicideHotline/VentCommand.cs
@@ -11,9 +11,9 @@
 namespace ZombieSuicideHotline
 {
     [CommandHandler(typeof(ClientCommandHandler))]
-    class RetreatCommand : ICommand
+    class VentCommand : ICommand
     {
-        public string Command => "retreat"; //Why is this called respawn?
+        public string Command => "vent";
 
         public string[] Aliases => null;
 
@@ -35,7 +35,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                     }
                     else
                     {
-                        response = "retreat is on cooldown for " + (Lasttime + Plugin.Singleton.Config.RetreatCooldown - Time.time).ToString();
+                        response = "vent is on cooldown for " + (Lasttime + Plugin.Singleton.Config.RetreatCooldown - Time.time).ToString();
                     }
                 }
                 if (response == "")

diff --git a/ZombieSuicideHotline/ZombieSuicideHotline.csproj b/ZombieSuicideHotline/ZombieSuicideHotline.csproj
@@ -76,7 +76,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RetreatCommand.cs" />
+    <Compile Include="VentCommand.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="PlayerHandlers.cs" />
     <Compile Include="RecallCommand.cs" />