GarpBot/cs2-WeaponPaints
1
0
Fork 0
mirror of https://github.com/Nereziel/cs2-WeaponPaints.git synced 2026-03-08 07:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5b43b2daef into 439c6eaf2d

Browse Source
This commit is contained in:
StefanX
2025-08-15 11:54:46 -04:00
committed by GitHub
parent 439c6eaf2d 5b43b2daef
commit 4e9df0fff3
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Events.cs
View File

@@ -13,7 +13,7 @@ namespace WeaponPaints
[GameEventHandler] [GameEventHandler]
public HookResult OnClientFullConnect(EventPlayerConnectFull @event, GameEventInfo info) public HookResult OnClientFullConnect(EventPlayerConnectFull @event, GameEventInfo info)
{ {
CCSPlayerController? player = @event.Userid; CCSPlayerController? player = @event.Userid;
if (player is null || !player.IsValid || player.IsBot || if (player is null || !player.IsValid || player.IsBot ||
@@ -142,7 +142,10 @@ namespace WeaponPaints
GivePlayerMusicKit(player); GivePlayerMusicKit(player);
GivePlayerAgent(player); GivePlayerAgent(player);
GivePlayerGloves(player); Server.NextFrame(() =>
{
GivePlayerGloves(player);
});
GivePlayerPin(player); GivePlayerPin(player);
return HookResult.Continue; return HookResult.Continue;

2
Variables.cs
View File

@@ -25,7 +25,7 @@ public partial class WeaponPaints
{"weapon_g3sg1", "G3SG1"}, {"weapon_g3sg1", "G3SG1"},
{"weapon_galilar", "Galil AR"}, {"weapon_galilar", "Galil AR"},
{"weapon_m249", "M249"}, {"weapon_m249", "M249"},
{"weapon_m4a1", "M4A1"}, {"weapon_m4a1", "M4A4"},
{"weapon_mac10", "MAC-10"}, {"weapon_mac10", "MAC-10"},
{"weapon_p90", "P90"}, {"weapon_p90", "P90"},
{"weapon_mp5sd", "MP5-SD"}, {"weapon_mp5sd", "MP5-SD"},

35
WeaponAction.cs
View File

@@ -37,6 +37,9 @@ namespace WeaponPaints
weapon.AttributeManager.Item.ItemDefinitionIndex = (ushort)newDefIndex.Key; weapon.AttributeManager.Item.ItemDefinitionIndex = (ushort)newDefIndex.Key;
weapon.AttributeManager.Item.EntityQuality = 3; weapon.AttributeManager.Item.EntityQuality = 3;
weapon.AttributeManager.Item.AttributeList.Attributes.RemoveAll();
weapon.AttributeManager.Item.NetworkedDynamicAttributes.Attributes.RemoveAll();
break; break;
} }
default: default:
@@ -96,9 +99,8 @@ namespace WeaponPaints
weapon.AttributeManager.Item.AttributeList.Attributes.RemoveAll(); weapon.AttributeManager.Item.AttributeList.Attributes.RemoveAll();
weapon.AttributeManager.Item.NetworkedDynamicAttributes.Attributes.RemoveAll(); weapon.AttributeManager.Item.NetworkedDynamicAttributes.Attributes.RemoveAll();
weapon.AttributeManager.Item.ItemID = 16384; UpdatePlayerEconItemId(weapon.AttributeManager.Item);
weapon.AttributeManager.Item.ItemIDLow = 16384 & 0xFFFFFFFF;
weapon.AttributeManager.Item.ItemIDHigh = weapon.AttributeManager.Item.ItemIDLow >> 32;
weapon.AttributeManager.Item.CustomName = weaponInfo.Nametag; weapon.AttributeManager.Item.CustomName = weaponInfo.Nametag;
weapon.FallbackPaintKit = weaponInfo.Paint; weapon.FallbackPaintKit = weaponInfo.Paint;
@@ -136,7 +138,7 @@ namespace WeaponPaints
UpdatePlayerWeaponMeshGroupMask(player, weapon, isLegacyModel); UpdatePlayerWeaponMeshGroupMask(player, weapon, isLegacyModel);
} }
// silly method to update sticker when call RefreshWeapons() // silly method to update sticker when call RefreshWeapons()
private void IncrementWearForWeaponWithStickers(CCSPlayerController player, CBasePlayerWeapon weapon) private void IncrementWearForWeaponWithStickers(CCSPlayerController player, CBasePlayerWeapon weapon)
{ {
@@ -170,7 +172,7 @@ namespace WeaponPaints
foreach (var sticker in weaponInfo.Stickers) foreach (var sticker in weaponInfo.Stickers)
{ {
int stickerSlot = weaponInfo.Stickers.IndexOf(sticker); int stickerSlot = weaponInfo.Stickers.IndexOf(sticker);
CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
$"sticker slot {stickerSlot} id", ViewAsFloat(sticker.Id)); $"sticker slot {stickerSlot} id", ViewAsFloat(sticker.Id));
if (sticker.OffsetX != 0 || sticker.OffsetY != 0) if (sticker.OffsetX != 0 || sticker.OffsetY != 0)
@@ -187,7 +189,7 @@ namespace WeaponPaints
CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
$"sticker slot {stickerSlot} rotation", sticker.Rotation); $"sticker slot {stickerSlot} rotation", sticker.Rotation);
} }
if (_temporaryPlayerWeaponWear.TryGetValue(player.Slot, out var playerWear) && if (_temporaryPlayerWeaponWear.TryGetValue(player.Slot, out var playerWear) &&
playerWear.TryGetValue(weaponDefIndex, out float storedWear)) playerWear.TryGetValue(weaponDefIndex, out float storedWear))
{ {
@@ -215,7 +217,7 @@ namespace WeaponPaints
CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
"keychain slot 0 offset z", keyChain.OffsetZ); "keychain slot 0 offset z", keyChain.OffsetZ);
CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
"keychain slot 0 seed", keyChain.Seed); "keychain slot 0 seed", ViewAsFloat(keyChain.Seed));
} }
private static void GiveKnifeToPlayer(CCSPlayerController? player) private static void GiveKnifeToPlayer(CCSPlayerController? player)
@@ -378,9 +380,14 @@ namespace WeaponPaints
pawn.SetModel(model); pawn.SetModel(model);
} }
CEconItemView item = pawn.EconGloves;
item.NetworkedDynamicAttributes.Attributes.RemoveAll();
item.AttributeList.Attributes.RemoveAll();
Instance.AddTimer(0.08f, () => Instance.AddTimer(0.08f, () =>
{ {
CEconItemView item = pawn.EconGloves;
try try
{ {
if (!player.IsValid) if (!player.IsValid)
@@ -396,13 +403,19 @@ namespace WeaponPaints
return; return;
item.ItemDefinitionIndex = gloveId; item.ItemDefinitionIndex = gloveId;
item.ItemIDLow = 16384 & 0xFFFFFFFF;
item.ItemIDHigh = 16384; UpdatePlayerEconItemId(item);
item.NetworkedDynamicAttributes.Attributes.RemoveAll();
CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture prefab", weaponInfo.Paint); CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture prefab", weaponInfo.Paint);
CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture seed", weaponInfo.Seed); CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture seed", weaponInfo.Seed);
CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture wear", weaponInfo.Wear); CAttributeListSetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture wear", weaponInfo.Wear);
item.AttributeList.Attributes.RemoveAll();
CAttributeListSetOrAddAttributeValueByName.Invoke(item.AttributeList.Handle, "set item texture prefab", weaponInfo.Paint);
CAttributeListSetOrAddAttributeValueByName.Invoke(item.AttributeList.Handle, "set item texture seed", weaponInfo.Seed);
CAttributeListSetOrAddAttributeValueByName.Invoke(item.AttributeList.Handle, "set item texture wear", weaponInfo.Wear);
item.Initialized = true; item.Initialized = true;
SetBodygroup(pawn, "default_gloves", 1); SetBodygroup(pawn, "default_gloves", 1);