Fixed AXL [4]6S and Ram 214H hitboxes not displaying

Author: AltimorTASDK

strivehitboxes/arcsys.cpp

@@ -87,7 +87,7 @@ bool asw_entity::is_active() const
 	if (cinematic_flags & cinematic_flag::counter)
 		return true;
 
-	return asw_entity_is_active(this, false);
+	return asw_entity_is_active(this, !is_player);
 }
 
 bool asw_entity::is_pushbox_active() const

strivehitboxes/arcsys.h

@@ -78,6 +78,7 @@ namespace cinematic_flag {
 
 class asw_entity {
 public:
+	FIELD(0x18, bool, is_player);
 	FIELD(0x68, hitbox*, hitboxes);
 	FIELD(0xFC, int, hurtbox_count);
 	FIELD(0x100, int, hitbox_count);
@@ -86,6 +87,7 @@ class asw_entity {
 	FIELD(0x308, asw_entity*, attached);
 	FIELD(0x380, int, action_flags1);
 	FIELD(0x384, int, action_flags2);
+	FIELD(0x388, int, action_flags3);
 	FIELD(0x394, direction, facing);
 	FIELD(0x398, int, pos_x);
 	FIELD(0x39C, int, pos_y);

strivehitboxes/main.cpp

@@ -116,20 +116,17 @@ void draw_pushbox(UCanvas *canvas, const asw_entity *entity)
 	draw_rect(canvas, corners, FLinearColor(1.f, 1.f, 0.f, .1f));
 }
 
-void draw_hitboxes(UCanvas *canvas, const asw_entity *entity)
+void draw_hitboxes(UCanvas *canvas, const asw_entity *entity, bool active)
 {
 	const auto count = entity->hitbox_count + entity->hurtbox_count;
-	const auto *parent = entity->parent != nullptr ? entity->parent : entity;
-	const auto active = parent->is_active();
-	const auto invuln = entity->is_invuln();
 
 	for (auto boxidx = 0; boxidx < count; boxidx++) {
 		const auto &box = entity->hitboxes[boxidx];
 
 		// Don't show inactive hitboxes
 		if (box.type == hitbox::type::hit && !active)
 			continue;
-		else if (box.type == hitbox::type::hurt && invuln)
+		else if (box.type == hitbox::type::hurt && entity->is_invuln())
 			continue;
 
 		draw_hitbox(canvas, entity, box);
@@ -153,7 +150,14 @@ void draw_display(UCanvas *canvas)
 		if (entity->is_pushbox_active())
 			draw_pushbox(canvas, entity);
 
-		draw_hitboxes(canvas, entity);
+		const auto active = entity->is_active();
+		draw_hitboxes(canvas, entity, active);
+
+		const auto *attached = entity->attached;
+		while (attached != nullptr) {
+			draw_hitboxes(canvas, attached, active);
+			attached = attached->attached;
+		}
 	}
 }
 

strivehitboxes/strivehitboxes.vcxproj

@@ -82,12 +82,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="bbscript.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="sigscan.cpp" />
     <ClCompile Include="arcsys.cpp" />
     <ClCompile Include="ue4.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="bbscript.h" />
     <ClInclude Include="sigscan.h" />
     <ClInclude Include="arcsys.h" />
     <ClInclude Include="struct_util.h" />

strivehitboxes/strivehitboxes.vcxproj.filters

@@ -27,6 +27,9 @@
     <ClCompile Include="arcsys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="bbscript.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="sigscan.h">
@@ -41,5 +44,8 @@
     <ClInclude Include="ue4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="bbscript.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

striveinjector/main.cpp

@@ -10,7 +10,7 @@
 
 const auto *exe = "GGST-Win64-Shipping.exe";
 const auto *dll = "strivehitboxes.dll";
-const auto *version = "v1.1";
+const auto *version = "v1.1.1";
 
 bool elevate_privileges()
 {