diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81ed81a..5deff5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,6 +59,7 @@ jobs: rm -r package/* echo "Creating package with CounterStrikeSharp (CSSharp) v$CSSHARP_VERSION for Windows" + cp -r cfg package cd package/ echo "Installing CounterStrikeSharp (CSSharp) v$CSSHARP_VERSION" [ -e addons/counterstrikesharp ] && rm -rf addons/counterstrikesharp && echo "CounterStrikeSharp removed" || echo "old CounterStrikeSharp not found" diff --git a/MatchZy.cs b/MatchZy.cs index 5e9a319..9a1d5bf 100644 --- a/MatchZy.cs +++ b/MatchZy.cs @@ -13,7 +13,7 @@ public partial class MatchZy : BasePlugin { public override string ModuleName => "MatchZy"; - public override string ModuleVersion => "0.7.5"; + public override string ModuleVersion => "0.7.6"; public override string ModuleAuthor => "WD- (https://github.com/shobhit-pathak/)"; @@ -321,8 +321,8 @@ public override void Load(bool hotReload) { { if (victim.IsBot) { int damage = @event.DmgHealth; - /* int postDamageHealth = @event.Health; */ - PrintToPlayerChat(@event.Attacker, Localizer["matchzy.pracc.damage", victim.PlayerName, damage]); + int postDamageHealth = @event.Health; + PrintToPlayerChat(@event.Attacker, Localizer["matchzy.pracc.damage", damage, victim.PlayerName, postDamageHealth]); } return HookResult.Continue; } @@ -399,7 +399,7 @@ public override void Load(bool hotReload) { Server.PrintToChatAll($"{adminChatPrefix} {commandArg}"); } else { // ReplyToUserCommand(player, "Usage: .asay "); - ReplyToUserCommand(player, Localizer["matchzy.cc.usage, $".asay "]); + ReplyToUserCommand(player, Localizer["matchzy.cc.usage", ".asay "]); } } else { SendPlayerNotAdminMessage(player); diff --git a/Pausing.cs b/Pausing.cs index e6f7eb7..e6ec9af 100644 --- a/Pausing.cs +++ b/Pausing.cs @@ -12,6 +12,8 @@ public partial class MatchZy public void TechPause(CCSPlayerController? player, CommandInfo? command) { // Tech Pause is WIP + return; + if (!isMatchLive) return; // Treating .tech command as .forcepause if it is used via server console. diff --git a/Utility.cs b/Utility.cs index 9e3fe24..5b752a7 100644 --- a/Utility.cs +++ b/Utility.cs @@ -1093,7 +1093,7 @@ private void ForcePauseMatch(CCSPlayerController? player, CommandInfo? command) private void ForceUnpauseMatch(CCSPlayerController? player, CommandInfo? command) { - if (isMatchLive && isPaused) { + if (matchStarted && isPaused) { if (!IsPlayerAdmin(player, "css_forceunpause", "@css/config")) { SendPlayerNotAdminMessage(player); return; diff --git a/lang/de.json b/lang/de.json index bdb7638..bc77636 100644 --- a/lang/de.json +++ b/lang/de.json @@ -129,6 +129,6 @@ "matchzy.pracc.grenade": "Grenade thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.molotov": "Molotov thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.decoy": "Decoy thrown by {red}{0}{default} took {green}{1}{default}s to detonate", - "matchzy.pracc.damage": "{lightblue}{0}{default} has been damaged for {green}{1}{default}hp", + "matchzy.pracc.damage": "{red}{0}{default} damage to {lightblue}{1}{default}({green}{2}{default} health)", "matchzy.pracc.blind": "{lightblue}{0}{default} has been blinded for {green}{1}{default}s" } \ No newline at end of file diff --git a/lang/en.json b/lang/en.json index 91af192..22ede6d 100644 --- a/lang/en.json +++ b/lang/en.json @@ -129,6 +129,6 @@ "matchzy.pracc.grenade": "Grenade thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.molotov": "Molotov thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.decoy": "Decoy thrown by {red}{0}{default} took {green}{1}{default}s to detonate", - "matchzy.pracc.damage": "{lightblue}{0}{default} has been damaged for {green}{1}{default}hp", + "matchzy.pracc.damage": "{red}{0}{default} damage to {lightblue}{1}{default}({green}{2}{default} health)", "matchzy.pracc.blind": "{lightblue}{0}{default} has been blinded for {green}{1}{default}s" } \ No newline at end of file diff --git a/lang/fr.json b/lang/fr.json index 93cb8e6..6b53136 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -130,7 +130,7 @@ "matchzy.pracc.grenade": "Grenade thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.molotov": "Molotov thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.decoy": "Decoy thrown by {red}{0}{default} took {green}{1}{default}s to detonate", - "matchzy.pracc.damage": "{lightblue}{0}{default} has been damaged for {green}{1}{default}hp", + "matchzy.pracc.damage": "{red}{0}{default} damage to {lightblue}{1}{default}({green}{2}{default} health)", "matchzy.pracc.blind": "{lightblue}{0}{default} has been blinded for {green}{1}{default}s" } \ No newline at end of file diff --git a/lang/pt-BR.json b/lang/pt-BR.json index 85277fd..d89856f 100644 --- a/lang/pt-BR.json +++ b/lang/pt-BR.json @@ -129,7 +129,7 @@ "matchzy.pracc.grenade": "Grenade thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.molotov": "Molotov thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.decoy": "Decoy thrown by {red}{0}{default} took {green}{1}{default}s to detonate", - "matchzy.pracc.damage": "{lightblue}{0}{default} has been damaged for {green}{1}{default}hp", + "matchzy.pracc.damage": "{red}{0}{default} damage to {lightblue}{1}{default}({green}{2}{default} health)", "matchzy.pracc.blind": "{lightblue}{0}{default} has been blinded for {green}{1}{default}s" } \ No newline at end of file diff --git a/lang/pt-pt.json b/lang/pt-pt.json index b4ce45e..4e66823 100644 --- a/lang/pt-pt.json +++ b/lang/pt-pt.json @@ -129,7 +129,7 @@ "matchzy.pracc.grenade": "Grenade thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.molotov": "Molotov thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.decoy": "Decoy thrown by {red}{0}{default} took {green}{1}{default}s to detonate", - "matchzy.pracc.damage": "{lightblue}{0}{default} has been damaged for {green}{1}{default}hp", + "matchzy.pracc.damage": "{red}{0}{default} damage to {lightblue}{1}{default}({green}{2}{default} health)", "matchzy.pracc.blind": "{lightblue}{0}{default} has been blinded for {green}{1}{default}s" } \ No newline at end of file diff --git a/lang/ru.json b/lang/ru.json index e62b3ab..d7a586b 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -129,6 +129,6 @@ "matchzy.pracc.grenade": "Grenade thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.molotov": "Molotov thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.decoy": "Decoy thrown by {red}{0}{default} took {green}{1}{default}s to detonate", - "matchzy.pracc.damage": "{lightblue}{0}{default} has been damaged for {green}{1}{default}hp", + "matchzy.pracc.damage": "{red}{0}{default} damage to {lightblue}{1}{default}({green}{2}{default} health)", "matchzy.pracc.blind": "{lightblue}{0}{default} has been blinded for {green}{1}{default}s" } \ No newline at end of file diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json index c3573b8..3441d64 100644 --- a/lang/zh-Hans.json +++ b/lang/zh-Hans.json @@ -129,6 +129,6 @@ "matchzy.pracc.grenade": "Grenade thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.molotov": "Molotov thrown by {red}{0}{default} took {green}{1}{default}s to detonate", "matchzy.pracc.decoy": "Decoy thrown by {red}{0}{default} took {green}{1}{default}s to detonate", - "matchzy.pracc.damage": "{lightblue}{0}{default} has been damaged for {green}{1}{default}hp", + "matchzy.pracc.damage": "{red}{0}{default} damage to {lightblue}{1}{default}({green}{2}{default} health)", "matchzy.pracc.blind": "{lightblue}{0}{default} has been blinded for {green}{1}{default}s" }