fix: ram as vis flag

arceusVen1 · Apr 14, 2024 · 99a5f86 · 99a5f86
1 parent 62d96ef
commit 99a5f86
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 28 deletions.
diff --git a/lib/classes/gsf/header2/chunks/chunk_attributes.dart b/lib/classes/gsf/header2/chunks/chunk_attributes.dart
@@ -575,13 +575,14 @@ class VehiAttributes extends ChunkAttributes {
   bool get unknown => bits[unknownIndice];
 
   @override
-  List<int> get visibilityFlags => [];
+  List<int> get visibilityFlags => [
+        ramHighIndice,
+        ramLowIndice,
+      ];
 
   @override
   List<int> get usedIndices => super.usedIndices
     ..addAll([
-      ramHighIndice,
-      ramLowIndice,
       unknownIndice,
     ]);
 }
@@ -810,7 +811,10 @@ class ShipAttributes extends ChunkAttributes {
   bool get unknown => bits[unknownIndice];
 
   @override
-  List<int> get visibilityFlags => [];
+  List<int> get visibilityFlags => [
+        ramHighIndice,
+        ramLowIndice,
+      ];
 
   @override
   bool isCompatible(ChunkAttributes filter) {

diff --git a/lib/widgets/header2/widgets/chunks/attributes/misc.dart b/lib/widgets/header2/widgets/chunks/attributes/misc.dart
@@ -82,18 +82,6 @@ class MiscFlagsDisplay extends StatelessWidget {
           ];
         case ModelType.vehi:
           return [
-            FlagBox(
-              label: "ram_high",
-              attributes: chunkAttributes,
-              indice: VehiAttributes.ramHighIndice,
-              onPress: onPress,
-            ),
-            FlagBox(
-              label: "ram_low",
-              attributes: chunkAttributes,
-              indice: VehiAttributes.ramLowIndice,
-              onPress: onPress,
-            ),
             FlagBox(
               label: "Unknown (light collision?)",
               attributes: chunkAttributes,
@@ -112,18 +100,6 @@ class MiscFlagsDisplay extends StatelessWidget {
           ];
         case ModelType.ship:
           return [
-            FlagBox(
-              label: "ram_high",
-              attributes: chunkAttributes,
-              indice: ShipAttributes.ramHighIndice,
-              onPress: onPress,
-            ),
-            FlagBox(
-              label: "ram_low",
-              attributes: chunkAttributes,
-              indice: ShipAttributes.ramLowIndice,
-              onPress: onPress,
-            ),
             FlagBox(
               label: "Use construction flags",
               attributes: chunkAttributes,

diff --git a/lib/widgets/header2/widgets/chunks/attributes/visibility.dart b/lib/widgets/header2/widgets/chunks/attributes/visibility.dart
@@ -192,6 +192,36 @@ class VisibilityFlagsDisplay extends StatelessWidget {
               onPress: onPress,
             ),
           ];
+        case ModelType.vehi:
+          return [
+            FlagBox(
+              label: "ram_high",
+              attributes: chunkAttributes,
+              indice: VehiAttributes.ramHighIndice,
+              onPress: onPress,
+            ),
+            FlagBox(
+              label: "ram_low",
+              attributes: chunkAttributes,
+              indice: VehiAttributes.ramLowIndice,
+              onPress: onPress,
+            ),
+          ];
+        case ModelType.ship:
+          return [
+            FlagBox(
+              label: "ram_high",
+              attributes: chunkAttributes,
+              indice: ShipAttributes.ramHighIndice,
+              onPress: onPress,
+            ),
+            FlagBox(
+              label: "ram_low",
+              attributes: chunkAttributes,
+              indice: ShipAttributes.ramLowIndice,
+              onPress: onPress,
+            ),
+          ];
         case ModelType.misc:
           return [
             FlagBox(