Merge pull request #138 from qq410525209/main

feat: add animation support for wings

Author: schwarper

Store/src/cs2-store.cs

@@ -13,7 +13,7 @@ namespace Store;
 public class Store : BasePlugin, IPluginConfig<Item_Config>
 {
     public override string ModuleName => "Store";
-    public override string ModuleVersion => "v18";
+    public override string ModuleVersion => "v19";
     public override string ModuleAuthor => "schwarper";
 
     public Item_Config Config { get; set; } = new();

Store/src/item/item.cs

@@ -167,7 +167,6 @@ public static bool Equip(CCSPlayerController player, Dictionary<string, string>
             return false;
         }
 
-        // 根据物品类型采用不同的冲突检测逻辑
         List<Store_Equipment> currentItems = GetConflictingItems(player, item, itemType);
 
         foreach (Store_Equipment currentItem in currentItems)
@@ -195,20 +194,15 @@ public static bool Equip(CCSPlayerController player, Dictionary<string, string>
         return true;
     }
 
-    /// <summary>
-    /// 根据物品类型获取冲突的已装备物品
-    /// </summary>
     private static List<Store_Equipment> GetConflictingItems(CCSPlayerController player, Dictionary<string, string> item, string itemType)
     {
         return itemType switch
         {
-            // playerskin: 同类型且同slot的物品冲突（队伍限制）
             "playerskin" => [.. Instance.GlobalStorePlayerEquipments.FindAll(p =>
                 p.SteamID == player.SteamID &&
                 p.Type == itemType &&
                 (p.Slot == int.Parse(item["slot"]) || (item["slot"] == "1" || p.Slot == 1)))],
 
-            // customweapon: 同武器类型的物品冲突（基于weapon属性，确保同一武器只能装备一个皮肤）
             "customweapon" => [.. Instance.GlobalStorePlayerEquipments.FindAll(p =>
             {
                 if (p.SteamID != player.SteamID || p.Type != itemType)
@@ -221,13 +215,11 @@ private static List<Store_Equipment> GetConflictingItems(CCSPlayerController pla
                        equippedWeapon == newWeapon;
             })],
 
-            // equipment: 同类型且同slot的物品冲突
             "equipment" => [.. Instance.GlobalStorePlayerEquipments.FindAll(p =>
                 p.SteamID == player.SteamID &&
                 p.Type == itemType &&
                 p.Slot == int.Parse(item["slot"]))],
 
-            // 其他类型: 默认采用同类型且同slot冲突的逻辑
             _ => [.. Instance.GlobalStorePlayerEquipments.FindAll(p =>
                 p.SteamID == player.SteamID &&
                 p.Type == itemType &&

Store/src/item/items/wings.cs

@@ -44,7 +44,8 @@ public bool OnEquip(CCSPlayerController player, Dictionary<string, string> item)
     {
         if (!item.TryGetValue("slot", out var slotStr) || !int.TryParse(slotStr, out var slot) || slot < 0)
             return false;
-        EquipWings(player, item["model"], slot);
+        var animation = item.TryGetValue("animation", out var anim) ? anim : string.Empty;
+        EquipWings(player, item["model"], slot, animation);
         return true;
     }
 
@@ -56,12 +57,12 @@ public bool OnUnequip(CCSPlayerController player, Dictionary<string, string> ite
         return true;
     }
 
-    public static void EquipWings(CCSPlayerController player, string model, int slot)
+    public static void EquipWings(CCSPlayerController player, string model, int slot, string animation = "")
     {
         UnEquipWings(player, slot);
         Server.NextFrame(() =>
         {
-            var entity = CreateWings(player, model);
+            var entity = CreateWings(player, model, animation);
             if (entity != null && entity.IsValid)
             {
                 if (!PlayerWingsEntities.ContainsKey(player))
@@ -83,7 +84,7 @@ public static void UnEquipWings(CCSPlayerController player, int slot)
             PlayerWingsEntities.Remove(player);
     }
 
-    public static CDynamicProp? CreateWings(CCSPlayerController player, string model)
+    public static CDynamicProp? CreateWings(CCSPlayerController player, string model, string animation = "")
     {
         var pawn = player.PlayerPawn.Value;
         if (pawn == null) return null;
@@ -93,6 +94,10 @@ public static void UnEquipWings(CCSPlayerController player, int slot)
         entity.SetModel(model);
         entity.DispatchSpawn();
         entity.AcceptInput("FollowEntity", pawn, pawn, "!activator");
+        if (!string.IsNullOrEmpty(animation))
+        {
+            entity.AcceptInput("SetAnimation", value: animation);
+        }
         var origin = pawn.AbsOrigin;
         if (origin != null)
         {
@@ -112,7 +117,8 @@ public HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
             var item = Item.GetItem(equip.UniqueId);
             if (item != null && item.TryGetValue("model", out var model))
             {
-                EquipWings(player, model, equip.Slot);
+                var animation = item.TryGetValue("animation", out var anim) ? anim : string.Empty;
+                EquipWings(player, model, equip.Slot, animation);
             }
         }
         return HookResult.Continue;

cs2-store-example.json

@@ -266,7 +266,8 @@
         "model": "models/hostage/hostage_carry.vmdl",
         "type": "wings",
         "price": "1000",
-        "slot": "1"
+        "slot": "1",
+        "animation": ""
       }
     },
     "Tags": {