GarpBot/cs2-WeaponPaints
1
0
Fork 0
mirror of https://github.com/Nereziel/cs2-WeaponPaints.git synced 2026-03-28 22:57:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: GarpBot:bc196093996733cb9b22e456a0809e48405e30dd
Branches Tags
GarpBot:main GarpBot:dev GarpBot:test GarpBot:dbtest
GarpBot:build-411 GarpBot:build-408 GarpBot:build-406 GarpBot:build-399 GarpBot:build-396 GarpBot:build-395 GarpBot:build-394 GarpBot:build-392 GarpBot:build-391 GarpBot:build-389 GarpBot:build-386 GarpBot:build-387 GarpBot:build-380 GarpBot:build-378 GarpBot:build-373 GarpBot:build-370 GarpBot:build-368 GarpBot:build-366 GarpBot:build-362 GarpBot:build-359 GarpBot:build-355 GarpBot:build-353 GarpBot:build-349 GarpBot:build-346 GarpBot:build-344 GarpBot:build-342 GarpBot:build-340 GarpBot:build-338 GarpBot:build-336 GarpBot:build-334 GarpBot:build-332 GarpBot:build-329 GarpBot:build-327 GarpBot:build-324 GarpBot:build-319 GarpBot:build-320 GarpBot:build-316 GarpBot:build-314 GarpBot:build-312 GarpBot:build-309 GarpBot:build-307 GarpBot:build-299 GarpBot:build-297 GarpBot:build-291 GarpBot:build-290 GarpBot:build-289 GarpBot:build-288 GarpBot:build-287 GarpBot:build-284 GarpBot:build-281 GarpBot:build-277 GarpBot:build-275 GarpBot:build-273 GarpBot:build-271 GarpBot:build-269 GarpBot:build-266 GarpBot:build-261 GarpBot:build-257 GarpBot:build-254 GarpBot:build-252 GarpBot:build-240 GarpBot:build-238 GarpBot:build-231 GarpBot:build-227 GarpBot:build-224 GarpBot:build-222 GarpBot:build-216 GarpBot:build-214 GarpBot:build-212 GarpBot:build-210 GarpBot:build-206 GarpBot:build-204 GarpBot:build-202 GarpBot:build-200 GarpBot:build-197 GarpBot:build-195 GarpBot:build-193 GarpBot:build-191 GarpBot:build-188 GarpBot:build-184 GarpBot:build-182 GarpBot:build-180 GarpBot:build-178 GarpBot:build-176 GarpBot:build-174 GarpBot:build-172 GarpBot:dbtest-1 GarpBot:build-170 GarpBot:build-168 GarpBot:build-166 GarpBot:build-163 GarpBot:build-161 GarpBot:build-159 GarpBot:build-157 GarpBot:build-148 GarpBot:build-147 GarpBot:build-145 GarpBot:build-144 GarpBot:build-143 GarpBot:build-142 GarpBot:build-141 GarpBot:build-140 GarpBot:build-132 GarpBot:build-122 GarpBot:build-120 GarpBot:build-118 GarpBot:build-115 GarpBot:build-113 GarpBot:build-111 GarpBot:build-109 GarpBot:build-107 GarpBot:build-105 GarpBot:build-103 GarpBot:build-101 GarpBot:build-99 GarpBot:build-97 GarpBot:build-95 GarpBot:build-93 GarpBot:build-91 GarpBot:build-87 GarpBot:build-86 GarpBot:build-84 GarpBot:build-81 GarpBot:build-77 GarpBot:build-76 GarpBot:build-75 GarpBot:build-74 GarpBot:build-73 GarpBot:build-71 GarpBot:build-67 GarpBot:build-65 GarpBot:build-63 GarpBot:build-61 GarpBot:build-59 GarpBot:build-60 GarpBot:build-57 GarpBot:build-55 GarpBot:build-54 GarpBot:build-53 GarpBot:build-52 GarpBot:build-49 GarpBot:build-46 GarpBot:build-43 GarpBot:build-40 GarpBot:build-39 GarpBot:build-35 GarpBot:build-34 GarpBot:build-32 GarpBot:build-30 GarpBot:build-27 GarpBot:build-26 GarpBot:build-25 GarpBot:build-24 GarpBot:build-17 GarpBot:build-16 GarpBot:build-15 GarpBot:build-14 GarpBot:build-13 GarpBot:build-12 GarpBot:build-10 GarpBot:build-9 GarpBot:build-3 GarpBot:build-1
..
compare: GarpBot:c19f35a5ac8ec183af1163205277a7daeed1cac5
Branches Tags
GarpBot:main GarpBot:dev GarpBot:test GarpBot:dbtest
GarpBot:build-411 GarpBot:build-408 GarpBot:build-406 GarpBot:build-399 GarpBot:build-396 GarpBot:build-395 GarpBot:build-394 GarpBot:build-392 GarpBot:build-391 GarpBot:build-389 GarpBot:build-386 GarpBot:build-387 GarpBot:build-380 GarpBot:build-378 GarpBot:build-373 GarpBot:build-370 GarpBot:build-368 GarpBot:build-366 GarpBot:build-362 GarpBot:build-359 GarpBot:build-355 GarpBot:build-353 GarpBot:build-349 GarpBot:build-346 GarpBot:build-344 GarpBot:build-342 GarpBot:build-340 GarpBot:build-338 GarpBot:build-336 GarpBot:build-334 GarpBot:build-332 GarpBot:build-329 GarpBot:build-327 GarpBot:build-324 GarpBot:build-319 GarpBot:build-320 GarpBot:build-316 GarpBot:build-314 GarpBot:build-312 GarpBot:build-309 GarpBot:build-307 GarpBot:build-299 GarpBot:build-297 GarpBot:build-291 GarpBot:build-290 GarpBot:build-289 GarpBot:build-288 GarpBot:build-287 GarpBot:build-284 GarpBot:build-281 GarpBot:build-277 GarpBot:build-275 GarpBot:build-273 GarpBot:build-271 GarpBot:build-269 GarpBot:build-266 GarpBot:build-261 GarpBot:build-257 GarpBot:build-254 GarpBot:build-252 GarpBot:build-240 GarpBot:build-238 GarpBot:build-231 GarpBot:build-227 GarpBot:build-224 GarpBot:build-222 GarpBot:build-216 GarpBot:build-214 GarpBot:build-212 GarpBot:build-210 GarpBot:build-206 GarpBot:build-204 GarpBot:build-202 GarpBot:build-200 GarpBot:build-197 GarpBot:build-195 GarpBot:build-193 GarpBot:build-191 GarpBot:build-188 GarpBot:build-184 GarpBot:build-182 GarpBot:build-180 GarpBot:build-178 GarpBot:build-176 GarpBot:build-174 GarpBot:build-172 GarpBot:dbtest-1 GarpBot:build-170 GarpBot:build-168 GarpBot:build-166 GarpBot:build-163 GarpBot:build-161 GarpBot:build-159 GarpBot:build-157 GarpBot:build-148 GarpBot:build-147 GarpBot:build-145 GarpBot:build-144 GarpBot:build-143 GarpBot:build-142 GarpBot:build-141 GarpBot:build-140 GarpBot:build-132 GarpBot:build-122 GarpBot:build-120 GarpBot:build-118 GarpBot:build-115 GarpBot:build-113 GarpBot:build-111 GarpBot:build-109 GarpBot:build-107 GarpBot:build-105 GarpBot:build-103 GarpBot:build-101 GarpBot:build-99 GarpBot:build-97 GarpBot:build-95 GarpBot:build-93 GarpBot:build-91 GarpBot:build-87 GarpBot:build-86 GarpBot:build-84 GarpBot:build-81 GarpBot:build-77 GarpBot:build-76 GarpBot:build-75 GarpBot:build-74 GarpBot:build-73 GarpBot:build-71 GarpBot:build-67 GarpBot:build-65 GarpBot:build-63 GarpBot:build-61 GarpBot:build-59 GarpBot:build-60 GarpBot:build-57 GarpBot:build-55 GarpBot:build-54 GarpBot:build-53 GarpBot:build-52 GarpBot:build-49 GarpBot:build-46 GarpBot:build-43 GarpBot:build-40 GarpBot:build-39 GarpBot:build-35 GarpBot:build-34 GarpBot:build-32 GarpBot:build-30 GarpBot:build-27 GarpBot:build-26 GarpBot:build-25 GarpBot:build-24 GarpBot:build-17 GarpBot:build-16 GarpBot:build-15 GarpBot:build-14 GarpBot:build-13 GarpBot:build-12 GarpBot:build-10 GarpBot:build-9 GarpBot:build-3 GarpBot:build-1

1 Commits
bc19609399 ... c19f35a5ac

Author SHA1 Message Date
StefanX
c19f35a5ac Merge be8633f82b into b026ce1e7d 2025-08-10 17:53:14 +00:00
2 changed files with 5 additions and 33 deletions
Expand all files Collapse all files

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", "M4A4"}, {"weapon_m4a1", "M4A1"},
{"weapon_mac10", "MAC-10"}, {"weapon_mac10", "MAC-10"},
{"weapon_p90", "P90"}, {"weapon_p90", "P90"},
{"weapon_mp5sd", "MP5-SD"}, {"weapon_mp5sd", "MP5-SD"},

36
WeaponAction.cs
View File

@@ -138,27 +138,6 @@ namespace WeaponPaints
UpdatePlayerWeaponMeshGroupMask(player, weapon, isLegacyModel); UpdatePlayerWeaponMeshGroupMask(player, weapon, isLegacyModel);
} }
// silly method to update sticker when call RefreshWeapons()
private void IncrementWearForWeaponWithStickers(CCSPlayerController player, CBasePlayerWeapon weapon)
{
int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
if (!HasChangedPaint(player, weaponDefIndex, out var weaponInfo) || weaponInfo == null ||
weaponInfo.Stickers.Count <= 0) return;
float wearIncrement = 0.001f;
float currentWear = weaponInfo.Wear;
var playerWear = _temporaryPlayerWeaponWear.GetOrAdd(player.Slot, _ => new ConcurrentDictionary<int, float>());
float incrementedWear = playerWear.AddOrUpdate(
weaponDefIndex,
currentWear + wearIncrement,
(_, oldWear) => Math.Min(oldWear + wearIncrement, 1.0f)
);
weapon.FallbackWear = incrementedWear;
}
private void SetStickers(CCSPlayerController? player, CBasePlayerWeapon weapon) private void SetStickers(CCSPlayerController? player, CBasePlayerWeapon weapon)
{ {
@@ -172,7 +151,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)
@@ -189,7 +168,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))
{ {
@@ -352,8 +331,6 @@ namespace WeaponPaints
{ {
newWeapon.Clip1 = ammo.Item1; newWeapon.Clip1 = ammo.Item1;
newWeapon.ReserveAmmo[0] = ammo.Item2; newWeapon.ReserveAmmo[0] = ammo.Item2;
IncrementWearForWeaponWithStickers(player, newWeapon);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -380,14 +357,9 @@ 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)