Added getting/setting entity key values

Author: Ayuto

src/core/core/sp_main.cpp

@@ -137,7 +137,7 @@ InterfaceHelper_t gGameInterfaces[] = {
 	{INTERFACEVERSION_PLAYERBOTMANAGER, (void **)&botmanager},
 	{IEFFECTS_INTERFACE_VERSION, (void **)&effects},
 	{INTERFACEVERSION_SERVERGAMEDLL, (void **)&servergamedll},
-#if( SOURCE_ENGINE >= 2 )
+#if( SOURCE_ENGINE >= 1 )
 	{VSERVERTOOLS_INTERFACE_VERSION, (void **)&servertools},
 #endif
 	{NULL, NULL}

src/core/modules/entities/entities_wrap.cpp

@@ -134,6 +134,13 @@ void CEdictExt::SetPropVector( edict_t* pEdict, const char* prop_name, Vector ve
 	prop.Set<Vector>(vecValue);
 }
 
+const char* CEdictExt::GetKeyValue(edict_t* pEdict, const char* szName)
+{
+	char szResult[1024];
+	CBaseEntity* pEntity = pEdict->GetUnknown()->GetBaseEntity();
+	servertools->GetKeyValue(pEntity, szName, szResult, 1024);
+	return szResult;
+}
 
 //-----------------------------------------------------------------------------
 // CSendProp code.

src/core/modules/entities/entities_wrap.h

@@ -32,7 +32,10 @@
 #include "edict.h"
 #include "server_class.h"
 #include <cstdint>
+#include "toolframework/itoolentity.h"
 
+// Externals
+extern IServerTools* servertools;
 
 //---------------------------------------------------------------------------------
 // edict_t extension
@@ -49,6 +52,15 @@ class CEdictExt
 	static void        SetPropFloat( edict_t* pEdict, const char* prop_name, float flValue );
 	static void        SetPropString( edict_t* pEdict, const char* prop_name, const char* szValue );
 	static void        SetPropVector( edict_t* pEdict, const char* prop_name, Vector vecValue );
+
+	static const char* GetKeyValue(edict_t* pEdict, const char* szName);
+
+	template<class T>
+	static void        SetKeyValue(edict_t* pEdict, const char* szName, T value)
+	{
+		CBaseEntity* pEntity = pEdict->GetUnknown()->GetBaseEntity();
+		servertools->SetKeyValue(pEntity, szName, value);
+	}
 };
 
 //---------------------------------------------------------------------------------

src/core/modules/entities/entities_wrap_python.cpp

@@ -416,6 +416,36 @@ void export_edict()
 			args("prop_name", "value")
 		)
 
+		.def("get_key_value",
+			&CEdictExt::GetKeyValue,
+			"Returns the value of the given field name.",
+			args("field_name")
+		)
+
+		.def("set_key_value_int",
+			&CEdictExt::SetKeyValue<int>,
+			"Sets a field to the given value.",
+			args("field_name", "value")
+		)
+
+		.def("set_key_value_float",
+			&CEdictExt::SetKeyValue<float>,
+			"Sets a field to the given value.",
+			args("field_name", "value")
+		)
+
+		.def("set_key_value_string",
+			&CEdictExt::SetKeyValue<const char *>,
+			"Sets a field to the given value.",
+			args("field_name", "value")
+		)
+
+		.def("set_key_value_vector",
+			&CEdictExt::SetKeyValue<Vector>,
+			"Sets a field to the given value.",
+			args("field_name", "value")
+		)
+
 		// Class attributes
 		/*
 		// TODO: Missing on CS:GO