Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proper way to strip static attributes #40

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Proper way to strip static attributes #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a567fd
Proper way to strip static attributes
tsuza May 22, 2022
8fb0d58
Follow the codebase's code format rules
tsuza May 22, 2022
514fd9b
Add new keep_static_attrs value; Remove some hardcoded attributes; It…
tsuza May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripting/cwx.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ static bool IsCustomItemAllowed(int client, const CustomItemDefinition item) {
bMedievalAllowedInSchema = !!StringToInt(configValue);
}
}
if (!bNativeAttributeOverride && item.bKeepStaticAttributes) {
if (!bNativeAttributeOverride && item.keepStaticAttributes) {
// TODO we should cache this...
ArrayList attribList = TF2Econ_GetItemStaticAttributes(item.defindex);
bMedievalAllowedInSchema =
Expand Down
64 changes: 57 additions & 7 deletions scripting/cwx/item_config.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ enum struct CustomItemDefinition {
KeyValues nativeAttributes;
KeyValues customAttributes;

bool bKeepStaticAttributes;
KeepStaticType keepStaticAttributes;

void Init() {
this.defindex = TF_ITEMDEF_DEFAULT;
Expand Down Expand Up @@ -56,6 +56,12 @@ enum struct CustomItemDefinition {
}
}

enum KeepStaticType {
KeepStatic_False = 0,
KeepStatic_True,
KeepStatic_Nullify
};

/**
* Holds a uid to CustomItemDefinition mapping.
*/
Expand Down Expand Up @@ -197,7 +203,7 @@ bool CreateItemFromSection(KeyValues config) {

config.GetString("item_class", item.className, sizeof(item.className), item.className);

item.bKeepStaticAttributes = !!config.GetNum("keep_static_attrs", true);
item.keepStaticAttributes = view_as<KeepStaticType>(config.GetNum("keep_static_attrs", true));

// allows restricting access to the item
config.GetString("access", item.access, sizeof(item.access));
Expand Down Expand Up @@ -305,11 +311,55 @@ int EquipCustomItem(int client, const CustomItemDefinition item) {
SetEntProp(itemEntity, Prop_Send, "m_iAccountID", accountid);
}
}

// TODO: implement a version that nullifies runtime attributes to their defaults
SetEntProp(itemEntity, Prop_Send, "m_bOnlyIterateItemViewAttributes",
!item.bKeepStaticAttributes);


switch(item.keepStaticAttributes) {
case KeepStatic_False: {
SetEntProp(itemEntity, Prop_Send, "m_bOnlyIterateItemViewAttributes", true);
}
case KeepStatic_Nullify: {
TF2Attrib_RemoveAll(itemEntity);

char valueType[2];
char valueFormat[64];

int staticAttribs[16];
float staticAttribsValues[16];

int staticAttribsNum = TF2Attrib_GetStaticAttribs(item.defindex, staticAttribs, staticAttribsValues);

for(int i = 0; i < staticAttribsNum; i++)
{
// We don't want to nullify attributes that bring a "cosmetic" value.
// 834 ( paintkit_proto_def_index ), 745 ( has team color paintkit )
if(staticAttribs[i] == 834 || staticAttribs[i] == 745) {
continue;
}

// "stored_as_integer" is absent from the attribute schema if its type is "string".
// TF2ED_GetAttributeDefinitionString returns false if it can't find the given string.
if(!TF2Econ_GetAttributeDefinitionString(staticAttribs[i], "stored_as_integer", valueType, sizeof(valueType))) {
continue;
}

TF2Econ_GetAttributeDefinitionString(staticAttribs[i], "description_format", valueFormat, sizeof(valueFormat));

// Since we already know what we're working with and what we're looking for, we can manually handpick
// the most significative chars to check if they match. Eons faster than doing StrEqual or StrContains.

if(valueFormat[9] == 'a' && valueFormat[10] == 'd') { // value_is_additive & value_is_additive_percentage
TF2Attrib_SetByDefIndex(itemEntity, staticAttribs[i], 0.0);
}
else if((valueFormat[9] == 'i' && valueFormat[18] == 'p')
|| (valueFormat[9] == 'p' && valueFormat[10] == 'e')) { // value_is_percentage & value_is_inverted_percentage
TF2Attrib_SetByDefIndex(itemEntity, staticAttribs[i], 1.0);
}
else if(valueFormat[9] == 'o' && valueFormat[10] == 'r') { // value_is_or
TF2Attrib_SetByDefIndex(itemEntity, staticAttribs[i], 0.0);
}
}
}
}

// apply game attributes
if (item.nativeAttributes) {
if (item.nativeAttributes.GotoFirstSubKey(false)) {
Expand Down