Beta Release v0.2.28

generator/docs_generator/generator.py

@@ -21,6 +21,9 @@ def extract_metadata(yaml_data, is_index=False):
         words = title.split()
         clean_title = words[-1] if words else ''
 
+    clean_title = re.sub(r'<[^>]+>', '', clean_title)
+    clean_title = re.sub(r'\[[^\]]+\]', '', clean_title)
+
     return {'title': clean_title}
 
 def convert_to_path(s):
@@ -49,7 +52,7 @@ def generate_markdown(yaml_data):
         if 'h2' in item:
             md += f"## {item['h2']}\n\n"
         if 'h4' in item:
-            md += f"- {item['h4']}\n\n"
+            md += f"#### {item['h4']}\n\n"
         if 'code' in item:
             md += "```csharp\n" + item['code'] + "\n```\n\n"
         if 'parameters' in item:
@@ -86,11 +89,12 @@ def generate_markdown(yaml_data):
             md += "\n"
         if 'api3' in item:
             src = item.get('src', '')
-            md += f"### **{item['api3']}**"
+            api3_title = str(item.get('api3', ''))
+            api3_title = re.sub(r'<[^>]+>', '', api3_title)
+            api3_title = re.sub(r'\[[^\]]+\]', '', api3_title)
+            md += f"### {api3_title}\n\n"
             if src != '':
-                md += f" - [Source Code]({src})\n\n"
-            else:
-                md += "\n\n"
+                md += f"[Source Code]({src})\n\n"
     return md
 
 def convert_yaml_file(src_path, dest_path):

generator/gameevent_generator/gameevents/mod.gameevents

@@ -968,20 +968,6 @@
 	{
 	}
 
-	"bullet_flight_resolution"
-	{
-		"userid"	"player_controller_and_pawn"
-		"pos_x"		"short"
-		"pos_y"		"short"
-		"pos_z"		"short"
-		"ang_x"		"short"
-		"ang_y"		"short"
-		"ang_z"		"short"
-		"start_x"	"short"
-		"start_y"	"short"
-		"start_z"	"short"
-	}
-
 	"game_phase_changed"
 	{
 		"new_phase" "short"

generator/schema_generator/field_type_parser.py

@@ -20,6 +20,7 @@
   "Vector": "Vector",
   "QAngle": "QAngle",
   "CUtlVector": "CUtlVector",
+  "CUtlLeanVector": "CUtlLeanVector",
   "Quaternion": "Quaternion",
   "Vector2D": "Vector2D",
   "Vector4D": "Vector4D",
@@ -47,21 +48,23 @@
   "CNetworkUtlVectorBase": "CUtlVector",
   "CEntityHandle": "CHandle<CEntityInstance>",
   "CTakeDamageInfo": "CTakeDamageInfo",
+  "CTakeDamageResult": "CTakeDamageResult",
   "ChangeAccessorFieldPathIndex_t": "ChangeAccessorFieldPathIndex_t",
   "CNetworkVarChainer": "CNetworkVarChainer"
 }
 
 blacklisted_types = [
   "CUtlStringTokenWithStorage",
   "FourVectors2D",
+  "FeSimdTri_t",
   "CStrongHandleVoid",
   "CUtlVectorFixedGrowable",
+  "CUtlLeanVectorFixedGrowable",
   "QuaternionStorage",
   "CWeakHandle",
   "DegreeEuler",
   "CTypedBitVec",
   "CUtlSymbol",
-  "CUtlLeanVector",
   "CSmartPtr",
   "CUtlHashtable",
   "CUtlOrderedMap",
@@ -124,6 +127,9 @@ def convert_utlvector_type(type, all_class_names, all_enum_names, interface = Fa
   if type.startswith("CUtlVectorFixedGrowable"):
     name = "CUtlVectorFixedGrowable"
     length = len("CUtlVectorFixedGrowable")
+  elif type.startswith("CUtlLeanVector"):
+    name = "CUtlLeanVector"
+    length = len("CUtlLeanVector")
   elif type.startswith("CUtlVectorEmbeddedNetworkVar"):
     name = "CUtlVector"
     length = len("CUtlVectorEmbeddedNetworkVar")
@@ -147,18 +153,26 @@ def convert_utlvector_type(type, all_class_names, all_enum_names, interface = Fa
 
   generic_t1_type, is_value_type = convert_field_type(generic_t1, "ref", all_class_names, all_enum_names, interface)
 
-  if is_ptr and generic_t1_type == "char":
-    return (f"{name}<CString>", True)
-  if is_ptr:
-    # print(f"{name}<PointerTo<{generic_t1_type}>>")
-    return (f"{name}<PointerTo<{generic_t1_type}>>", True)
-
-  if is_value_type:
-    # print(f"{name}<{generic_t1_type}>")
-    return (f"{name}<{generic_t1_type}>", is_value_type)
+  if name == "CUtlLeanVector":
+    if is_ptr and generic_t1_type == "char":
+      return (f"{name}<CString, int>", True)
+    if is_ptr:
+      # print(f"{name}<PointerTo<{generic_t1_type}>>")
+      return (f"{name}<PointerTo<{generic_t1_type}>, int>", True)
+
+    return (f"{name}<{generic_t1_type}, int>", True)
   else:
-    # print(f"{name}")
-    return (name, True)
+    if is_ptr and generic_t1_type == "char":
+      return (f"{name}<CString>", True)
+    if is_ptr:
+      # print(f"{name}<PointerTo<{generic_t1_type}>>")
+      return (f"{name}<PointerTo<{generic_t1_type}>>", True)
+
+    for blacklisted_type in blacklisted_types:
+      if blacklisted_type in generic_t1_type:
+        return (f"{name}<SchemaUntypedField>", True)
+
+    return (f"{name}<{generic_t1_type}>", True)
 
 def convert_field_type(type, kind, all_class_names, all_enum_names, interface = False):
 
@@ -183,7 +197,7 @@ def convert_field_type(type, kind, all_class_names, all_enum_names, interface =
           return (f"{prefix}SchemaFixedArray<{name}>", False)
         return (name, is_value_type)
 
-      if type.startswith("CUtlVector") or type.startswith("CNetworkUtlVector"):
+      if type.startswith("CUtlVector") or type.startswith("CNetworkUtlVector") or type.startswith("CUtlLeanVector"):
         name, is_value_type = convert_utlvector_type(type, all_class_names, all_enum_names, True)
         if kind == "fixed_array":
           return (f"{prefix}SchemaFixedArray<{name}>", False)

generator/schema_generator/generator.py

@@ -18,6 +18,7 @@
 blacklisted_classes = [
   "FeSimdTri_t",
   "CTakeDamageInfo",
+  "CTakeDamageResult",
   "CNetworkVarChainer",
   "ChangeAccessorFieldPathIndex_t"
 ]
@@ -178,7 +179,8 @@ def write_interface(self):
       "BASE_INTERFACE": f"" if self.base_class == "SchemaClass" else get_interface_name(self.base_class) + ", ",
       "IMPL_TYPE": get_impl_name(self.class_name),
       "FIELDS": "\n".join(fields),
-      "UPDATORS": "\n".join(updators)
+      "UPDATORS": "\n".join(updators),
+      "SIZE": self.size
     }
     self.interface_file_handle.write(render_template(self.interface_template, params))