skin machine 🅱roke

This commit is contained in:
nullifiedcat 2017-05-04 23:14:29 +03:00
parent 53c4c147a4
commit 25ede155d6
2 changed files with 26 additions and 20 deletions

View File

@ -58,26 +58,27 @@ static CatCommand set_redirect("skinchanger_redirect", "Set Redirect", [](const
GetModifier(CE_INT(LOCAL_W, netvar.iItemDefinitionIndex)).defidx_redirect = redirect; GetModifier(CE_INT(LOCAL_W, netvar.iItemDefinitionIndex)).defidx_redirect = redirect;
InvalidateCookies(); InvalidateCookies();
}); });
static CatCommand dump_attrs("skinchanger_debug_attrs", "Dump attributes", []() {
CAttributeList* list = CE_VAR(LOCAL_W, netvar.AttributeList, CAttributeList*);
logging::Info("ATTRIBUTE LIST: %i", list->m_Attributes.Size());
for (int i = 0; i < 15; i++) {
logging::Info("%i %.2f", list->m_Attributes[i].defidx, list->m_Attributes[i].value);
}
});
static CatCommand invalidate_cookies("skinchanger_invalidate_cookies", "Invalidate Cookies", InvalidateCookies); static CatCommand invalidate_cookies("skinchanger_invalidate_cookies", "Invalidate Cookies", InvalidateCookies);
void FrameStageNotify(int stage) { void FrameStageNotify(int stage) {
if (!enabled) return; if (!enabled) return;
CachedEntity* weapon = LOCAL_W; if (stage != FRAME_NET_UPDATE_POSTDATAUPDATE_START) return;
if (CE_BAD(weapon)) return; int handle = CE_INT(g_pLocalPlayer->entity, netvar.hActiveWeapon);
if (!GetCookie(weapon->m_IDX).Check()) { int eid = handle & 0xFFF;
CAttributeList* list = CE_VAR(weapon, 0x9c0, CAttributeList*); IClientEntity* entity = g_IEntityList->GetClientEntity(eid);
logging::Info("ATTRIBUTE LIST (BEFORE UPDATE): "); GetModifier(NET_INT(entity, netvar.iItemDefinitionIndex)).Apply(eid);
for (int i = 0; i < list->m_Attributes.Size(); i++) { /*if (!GetCookie(weapon->m_IDX).Check()) {
logging::Info("%i %.2f", list->m_Attributes[i].defidx, list->m_Attributes[i].value);
}
logging::Info("Cookie bad for %i", weapon->m_IDX); // FIXME DEBUG LOGS! logging::Info("Cookie bad for %i", weapon->m_IDX); // FIXME DEBUG LOGS!
GetModifier(CE_INT(weapon, netvar.iItemDefinitionIndex)).Apply(weapon->m_IDX); GetModifier(CE_INT(weapon, netvar.iItemDefinitionIndex)).Apply(weapon->m_IDX);
GetCookie(weapon->m_IDX).Update(weapon->m_IDX); GetCookie(weapon->m_IDX).Update(weapon->m_IDX);
logging::Info("ATTRIBUTE LIST (AFTER UPDATE): "); }*/
for (int i = 0; i < list->m_Attributes.Size(); i++) {
logging::Info("%i %.2f", list->m_Attributes[i].defidx, list->m_Attributes[i].value);
}
}
} }
void PaintTraverse() { void PaintTraverse() {
@ -116,6 +117,8 @@ void patched_weapon_cookie::Update(int entity) {
IClientEntity* ent = g_IEntityList->GetClientEntity(entity); IClientEntity* ent = g_IEntityList->GetClientEntity(entity);
if (!ent || ent->IsDormant()) return; if (!ent || ent->IsDormant()) return;
logging::Info("Updating cookie for %i", entity); // FIXME DEBUG LOGS! logging::Info("Updating cookie for %i", entity); // FIXME DEBUG LOGS!
CAttributeList* list = NET_VAR(ent, 0x9c0, CAttributeList*);
attrs = list->m_Attributes.Size();
eidx = entity; eidx = entity;
defidx = NET_INT(ent, netvar.iItemDefinitionIndex); defidx = NET_INT(ent, netvar.iItemDefinitionIndex);
eclass = ent->GetClientClass()->m_ClassID; eclass = ent->GetClientClass()->m_ClassID;
@ -126,6 +129,8 @@ bool patched_weapon_cookie::Check() {
if (!valid) return false; if (!valid) return false;
IClientEntity* ent = g_IEntityList->GetClientEntity(eidx); IClientEntity* ent = g_IEntityList->GetClientEntity(eidx);
if (!ent || ent->IsDormant()) return false; if (!ent || ent->IsDormant()) return false;
CAttributeList* list = NET_VAR(ent, 0x9c0, CAttributeList*);
if (attrs != list->m_Attributes.Size()) return false;
if (eclass != ent->GetClientClass()->m_ClassID) return false; if (eclass != ent->GetClientClass()->m_ClassID) return false;
if (defidx != NET_INT(ent, netvar.iItemDefinitionIndex)) return false; if (defidx != NET_INT(ent, netvar.iItemDefinitionIndex)) return false;
return true; return true;
@ -133,22 +138,22 @@ bool patched_weapon_cookie::Check() {
void def_attribute_modifier::Apply(int entity) { void def_attribute_modifier::Apply(int entity) {
IClientEntity* ent = g_IEntityList->GetClientEntity(entity); IClientEntity* ent = g_IEntityList->GetClientEntity(entity);
if (!ent || ent->IsDormant()) return; if (!ent) return;
logging::Info("Applying modifiers for %i %i %i", entity, NET_INT(ent, netvar.iItemDefinitionIndex), defidx_redirect); //logging::Info("Applying modifiers for %i %i %i", entity, NET_INT(ent, netvar.iItemDefinitionIndex), defidx_redirect);
if (defidx_redirect && NET_INT(ent, netvar.iItemDefinitionIndex) != defidx_redirect) { if (defidx_redirect && NET_INT(ent, netvar.iItemDefinitionIndex) != defidx_redirect) {
NET_INT(ent, netvar.iItemDefinitionIndex) = defidx_redirect; NET_INT(ent, netvar.iItemDefinitionIndex) = defidx_redirect;
logging::Info("Updated DefIDX to %i", NET_INT(ent, netvar.iItemDefinitionIndex)); logging::Info("Updated DefIDX to %i", NET_INT(ent, netvar.iItemDefinitionIndex));
GetCookie(entity).valid = false; GetCookie(entity).valid = false;
return; return;
} }
CAttributeList* list = NET_VAR(ent, 0x9c0, CAttributeList*); CAttributeList* list = NET_VAR(ent, netvar.AttributeList, CAttributeList*);
//::Info("Attribute list: 0x%08x 0x%08x 0x%08x 0x%08x", 0x9c0, ent, list, (uint32_t)list - (uint32_t)ent); //::Info("Attribute list: 0x%08x 0x%08x 0x%08x 0x%08x", 0x9c0, ent, list, (uint32_t)list - (uint32_t)ent);
list->m_Attributes.m_Size = list->m_Attributes.Size(); list->m_Attributes.m_Size = list->m_Attributes.Size();
logging::Info("Length: %i", list->m_Attributes.m_Size); //logging::Info("Length: %i", list->m_Attributes.m_Size);
//logging::Info("Base: 0x%08x", list->m_Attributes.Base()); //logging::Info("Base: 0x%08x", list->m_Attributes.Base());
for (const auto& mod : modifiers) { for (const auto& mod : modifiers) {
if (mod.defidx) { if (mod.defidx) {
logging::Info("Setting %i to %.2f", mod.defidx, mod.value); // FIXME DEBUG LOGS! //logging::Info("Setting %i to %.2f", mod.defidx, mod.value); // FIXME DEBUG LOGS!
list->SetAttribute(mod.defidx, mod.value); list->SetAttribute(mod.defidx, mod.value);
} }
} }

View File

@ -25,7 +25,7 @@ class CAttribute {
public: public:
CAttribute(uint16_t iAttributeDefinitionIndex, float flValue); CAttribute(uint16_t iAttributeDefinitionIndex, float flValue);
public: public:
void* pad00; void* vtable;
uint16_t defidx; uint16_t defidx;
float value; float value;
unsigned int pad01; unsigned int pad01;
@ -37,7 +37,7 @@ public:
void SetAttribute(int index, float value); void SetAttribute(int index, float value);
void RemoveAttribute(int index); void RemoveAttribute(int index);
public: public:
void* pad; uint32_t unknown;
CUtlVector<CAttribute, CUtlMemory<CAttribute>> m_Attributes; CUtlVector<CAttribute, CUtlMemory<CAttribute>> m_Attributes;
}; };
@ -64,6 +64,7 @@ public:
int eidx { 0 }; int eidx { 0 };
int defidx { 0 }; int defidx { 0 };
int eclass { 0 }; int eclass { 0 };
int attrs { 0 };
bool valid { false }; bool valid { false };
}; };