mirror of
https://github.com/Nereziel/cs2-WeaponPaints.git
synced 2026-02-18 10:43:22 +00:00
Merge pull request #440 from stefanx111/fix-bugs
fix knife, gloves, keychain seed
This commit is contained in:
@@ -142,7 +142,10 @@ namespace WeaponPaints
|
|||||||
|
|
||||||
GivePlayerMusicKit(player);
|
GivePlayerMusicKit(player);
|
||||||
GivePlayerAgent(player);
|
GivePlayerAgent(player);
|
||||||
|
Server.NextFrame(() =>
|
||||||
|
{
|
||||||
GivePlayerGloves(player);
|
GivePlayerGloves(player);
|
||||||
|
});
|
||||||
GivePlayerPin(player);
|
GivePlayerPin(player);
|
||||||
|
|
||||||
return HookResult.Continue;
|
return HookResult.Continue;
|
||||||
|
|||||||
@@ -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"},
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user