fix (teammates damage,C4 missing) feature (2 new modes)

TitaniumLithium · TitaniumLithium · commit 7c3456fd91ad · 2024-06-15T02:48:39.000+08:00
1.When healing Teammates, won't kill teammates anymore;
2.C4 will be given to T in Infinite Grenade Mode;
3.New Modes:
Change Weapon On Shoot
Drop Weapon On Shoot
4.fix fun_load command
diff --git a/FunChangeWeaponOnShoot.cs b/FunChangeWeaponOnShoot.cs
@@ -0,0 +1,71 @@
+﻿using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Entities.Constants;
+using CounterStrikeSharp.API.Modules.Utils;
+
+namespace FunMatchPlugin;
+
+public class FunChangeWeaponOnShoot : FunBaseClass
+{
+    public override string Decription => "Change Weapon OnShoot 射击换枪";
+    private BasePlugin.GameEventHandler<EventBulletImpact>? EventBulletImpactHandler=null;
+    private Random random = new Random();
+    public override void Fun(FunMatchPlugin plugin)
+    {
+        if (Enabled) return;
+        Enabled = true;
+        //EventPlayerShoot Not Working
+        plugin.RegisterEventHandler <EventBulletImpact>(EventBulletImpactHandler = (@event, info) =>
+        {
+            if (Enabled == false) return HookResult.Stop;
+            if (@event.Userid == null) return HookResult.Continue;
+            //200-209 300-312 400-410
+            //give random weapon ON shoot
+            var guntype = random.Next(2,5);
+            int guntype_add = 0;
+            switch (guntype)
+            {
+                case 2:
+                {
+                    guntype_add = random.Next(0,10);
+                    break;
+                }
+                case 3:
+                {
+                    guntype_add = random.Next(0,13);
+                    break;
+                }
+                case 4:
+                {
+                    guntype_add = random.Next(0,11);
+                    break;
+                }
+            }
+            CsItem csItem = (CsItem)(guntype * 100 + guntype_add);
+
+            var player = @event.Userid!.OriginalControllerOfCurrentPawn.Get();
+            var pawn = player!.PlayerPawn.Get();
+            var cur_weapon = pawn!.WeaponServices!.ActiveWeapon.Get();
+            if (cur_weapon is null) return HookResult.Continue;
+            if (cur_weapon.DesignerName == "weapon_c4" || cur_weapon.DesignerName == "weapon_knife" || cur_weapon.DesignerName == "weapon_knife_t")
+            return HookResult.Continue;
+
+            @event.Userid!.DropActiveWeapon();
+            cur_weapon!.Remove();
+
+            @event.Userid!.GiveNamedItem(csItem);
+            if (pawn!.WeaponServices!.ActiveWeapon.Get() is null)
+            {
+                @event.Userid!.GiveNamedItem(CsItem.Knife);
+            }
+            return HookResult.Continue;
+        });
+    }
+
+    public override void EndFun(FunMatchPlugin plugin)
+    {
+        Enabled = false;
+        plugin.DeregisterEventHandler(EventBulletImpactHandler!);
+    }
+}
+
diff --git a/FunDropWeaponOnShoot.cs b/FunDropWeaponOnShoot.cs
@@ -0,0 +1,41 @@
+﻿using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Entities.Constants;
+using CounterStrikeSharp.API.Modules.Utils;
+
+namespace FunMatchPlugin;
+
+public class FunDropWeaponOnShoot : FunBaseClass
+{
+    public override string Decription => "Drop Weapon OnShoot 射击丢枪";
+    private BasePlugin.GameEventHandler<EventBulletImpact>? EventBulletImpactHandler=null;
+    public override void Fun(FunMatchPlugin plugin)
+    {
+        if (Enabled) return;
+        Enabled = true;
+        //EventPlayerShoot Not Working
+        plugin.RegisterEventHandler <EventBulletImpact>(EventBulletImpactHandler = (@event, info) =>
+        {
+            if (Enabled == false) return HookResult.Stop;
+            var player = @event.Userid!.OriginalControllerOfCurrentPawn.Get();
+            var pawn = player!.PlayerPawn.Get();
+            var cur_weapon = pawn!.WeaponServices!.ActiveWeapon.Get();
+            if (cur_weapon is null) return HookResult.Continue;
+            if (cur_weapon.DesignerName == "weapon_c4" || cur_weapon.DesignerName == "weapon_knife" || cur_weapon.DesignerName == "weapon_knife_t")
+            return HookResult.Continue;
+
+            @event.Userid!.DropActiveWeapon();
+
+            if (pawn!.WeaponServices!.ActiveWeapon.Get() is null)
+            {
+                @event.Userid!.GiveNamedItem(CsItem.Knife);
+            }
+            return HookResult.Continue;
+        });
+    }
+
+    public override void EndFun(FunMatchPlugin plugin)
+    {
+        Enabled = false;
+        plugin.DeregisterEventHandler(EventBulletImpactHandler!);
+    }
+}
diff --git a/FunHealTeammates.cs b/FunHealTeammates.cs
@@ -22,8 +22,9 @@ public FunHealTeammates(FunMatchPlugin plugin) : base(plugin){}
     private BasePlugin.GameEventHandler<EventPlayerConnectFull>? EventPlayerConnectFullHandler;
     private BasePlugin.GameEventHandler<EventPlayerHurt>? EventPlayerHurtHandler;
     private Dictionary<int,Timer> playerTimersDict = new ();
-    private void BurnPlayer(CCSPlayerPawn pawn)
+    private void BurnPlayer(CCSPlayerPawn? pawn)
     {
+        if (pawn is null) return;
         pawn.Health -= BurnDamage;
         pawn.ApplyStressDamage = true;
         Utilities.SetStateChanged(pawn, "CBaseEntity", "m_iHealth");
@@ -36,6 +37,7 @@ public override void EndFun(FunMatchPlugin plugin)
     {
         Enabled = false;
         ConVar.Find("mp_autokick")!.SetValue(true);
+        ConVar.Find("ff_damage_reduction_bullets")!.SetValue(0.5F);
         foreach (var value in playerTimersDict.Values)
         {
             if (value is not null)
@@ -57,6 +59,7 @@ public override void Fun(FunMatchPlugin plugin)
         ConVar.Find("mp_autokick")!.SetValue(false);
         LastConvar_friendlyfire = ConVar.Find("mp_friendlyfire")!.GetPrimitiveValue<bool>();
         ConVar.Find("mp_friendlyfire")!.SetValue(true);
+        ConVar.Find("ff_damage_reduction_bullets")!.SetValue(0.0f);
         plugin.RegisterEventHandler <EventRoundFreezeEnd>(EventRoundFreezeEndHandler = (@event, info) =>
         {
             
@@ -68,7 +71,6 @@ public override void Fun(FunMatchPlugin plugin)
                 //if (p.IsBot) continue;
                 var pawn = p.OriginalControllerOfCurrentPawn.Get()!.PlayerPawn.Get();
                 playerTimersDict.TryAdd((int)p.UserId,plugin.AddTimer(BurnAfterSecond,() => BurnPlayer(pawn!),TimerFlags.REPEAT));
-                pawn!.LastFriendlyFireDamageReductionRatio = 0.0f;
             }
             return HookResult.Stop;
         });
@@ -82,7 +84,6 @@ public override void Fun(FunMatchPlugin plugin)
             if (pawn is null) return HookResult.Continue;
             playerTimer = plugin.AddTimer(BurnAfterSecond,() => BurnPlayer(pawn!),TimerFlags.REPEAT);
             playerTimersDict.TryAdd((int)@event.Userid.UserId!,playerTimer);
-            pawn!.LastFriendlyFireDamageReductionRatio = 0.0f;
             return HookResult.Continue;
         });
 
diff --git a/FunInfiniteGrenade.cs b/FunInfiniteGrenade.cs
@@ -1,4 +1,6 @@
 ﻿using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Translations;
 using CounterStrikeSharp.API.Modules.Cvars;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 
@@ -24,13 +26,19 @@ public override void Fun(FunMatchPlugin plugin)
         ConVar.Find("mp_weapons_allow_smgs")!.SetValue(0);
         ConVar.Find("mp_weapons_allow_heavy")!.SetValue(0);
         var Allplayers = Utilities.GetPlayers();
+        bool BombHasGiven = false;
         foreach (var p in Allplayers)
         {
             p.RemoveWeapons();
             p.GiveNamedItem(CsItem.HE);
             p.GiveNamedItem(CsItem.Knife);
             p.GiveNamedItem(CsItem.Kevlar);
             p.GiveNamedItem(CsItem.KevlarHelmet);
+            if (p.Team == CounterStrikeSharp.API.Modules.Utils.CsTeam.Terrorist && !BombHasGiven)
+            {
+                p.GiveNamedItem(CsItem.C4);
+                BombHasGiven = true;
+            }
         }
     }
     public override void EndFun(FunMatchPlugin plugin)
@@ -44,5 +52,6 @@ public override void EndFun(FunMatchPlugin plugin)
         ConVar.Find("mp_weapons_allow_pistols")!.SetValue(-1);
         ConVar.Find("mp_weapons_allow_smgs")!.SetValue(-1);
         ConVar.Find("mp_weapons_allow_heavy")!.SetValue(-1);
+        Server.PrintToChatAll(StringExtensions.ReplaceColorTags("{RED}") + "[FunMatchPlugin] " + "If U Cannot Buy guns,Reconnect 如果手雷结束后买不了枪 请重新连接服务器");
     }
 }
diff --git a/FunMatchPlugin.cs b/FunMatchPlugin.cs
@@ -3,14 +3,13 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Admin;
-using System.Data;
 
 namespace FunMatchPlugin;
 
 public class FunMatchPlugin: BasePlugin
 {
     public override string ModuleName => "Fun Match Plugin";
-    public override string ModuleVersion => "1.0.4";
+    public override string ModuleVersion => "1.0.5";
     public override void Load(bool hotReload)
     {
         Console.WriteLine("Fun Match Plugin Load!");
@@ -34,6 +33,10 @@ public override void Load(bool hotReload)
         FunLists.Add(funToTheMoon);
         FunWNoStop funWNoStop = new FunWNoStop(this);
         FunLists.Add(funWNoStop);
+        FunDropWeaponOnShoot funDropWeaponOnShoot = new();
+        FunLists.Add(funDropWeaponOnShoot);
+        FunChangeWeaponOnShoot funChangeWeaponOnShoot = new();
+        FunLists.Add(funChangeWeaponOnShoot);
     }
 
     public void LoadRandomFun()
@@ -74,6 +77,9 @@ public void LoadFunByName(string name)
     private List<FunBaseClass> FunLists = new List<FunBaseClass>();
     private bool EnableRandom = true;
 
+    private GameEventHandler<EventRoundStart> ?ManualLoadHander;
+    private int ManualLoadIndex = -1;
+
     [GameEventHandler]
     public HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
     {
@@ -99,23 +105,32 @@ public void OnLoadFunCommand(CCSPlayerController? player, CommandInfo commandInf
             commandInfo.ReplyToCommand($"Invalid num. pls input num from {1} - {FunLists.Count}");
             return;
         }
-        LoadFunByIndex(num - 1);
+        if (ManualLoadHander is not null) 
+        {
+            commandInfo.ReplyToCommand($"Alraedy loaded {ManualLoadIndex + 1} Manually, Pls !fun_load first");
+            return;
+        }
+        ManualLoadIndex = num - 1;
+        LoadFunByIndex(ManualLoadIndex);
+        RegisterEventHandler (ManualLoadHander = (@event, info) =>
+        {
+            UnLoadFunByIndex(ManualLoadIndex);
+            Server.NextFrame(()=>{
+                LoadFunByIndex(ManualLoadIndex);
+            });
+            return HookResult.Continue;
+        });
     }
 
-    [ConsoleCommand("!fun_load", "UnLoad fun by num")]
-    [CommandHelper(minArgs: 1, usage: "[num]", whoCanExecute: CommandUsage.CLIENT_AND_SERVER)]
+    [ConsoleCommand("!fun_load", "UnLoad fun Manually")]
+    [CommandHelper(minArgs: 0, usage: "", whoCanExecute: CommandUsage.CLIENT_AND_SERVER)]
     [RequiresPermissions("@css/root")]
     public void OnUnLoadFunCommand(CCSPlayerController? player, CommandInfo commandInfo)
     {
-        
-        int num;
-        int.TryParse(commandInfo.GetArg(1),out num);
-        if (num <= 0 || num >FunLists.Count)
-        {
-            commandInfo.ReplyToCommand($"Invalid num. pls input num from {1} - {FunLists.Count}");
-            return;
-        }
-        UnLoadFunByIndex(num - 1);
+        UnLoadFunByIndex(ManualLoadIndex);
+        DeregisterEventHandler(ManualLoadHander!);
+        ManualLoadHander = null;
+        commandInfo.ReplyToCommand($"Unloaded {ManualLoadIndex + 1}");
     }
 
     [ConsoleCommand("fun_lists", "Lists Avaliable Fun")]
diff --git a/README.md b/README.md
@@ -22,6 +22,8 @@ a showmatch like plugin for fun
 ### WNoStop 按住W不松手
 if you don't forward, you will get hurt.
 不向前则会收到伤害
+### Change Weapon ONShoot 射击换枪
+### Drop Weapon ONShoot 射击丢枪
 
 ## How to Install 如何安装
 
@@ -43,4 +45,4 @@ see [https://docs.cssharp.dev/docs/guides/getting-started.html](https://docs.css
 
 `fun_load [num]` load certain mode by num (num can be found in command "funlists") won't affect random load 手动加载模式 对应的数字可以在"funlists"指令查到 与随机模式独立
 
-`!fun_load [num]` Unload certain mode by num (num can be found in command "funlists") 手动卸载模式
+`!fun_load` Unload mode you manually load (num can be found in command "funlists") 卸载手动加载的模式
