From 821076ae59b9e4686a3239b950a70fe380950ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:01:26 -0600
Subject: [PATCH] fix: spaced and external swapped

---
 src/components/ArmorMesh/components/Armor/index.tsx        | 4 ++--
 src/components/ArmorMesh/components/ExternalModuleMask.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ArmorMesh/components/Armor/index.tsx b/src/components/ArmorMesh/components/Armor/index.tsx
index 783f3a9e3..f5b39d131 100644
--- a/src/components/ArmorMesh/components/Armor/index.tsx
+++ b/src/components/ArmorMesh/components/Armor/index.tsx
@@ -174,7 +174,7 @@ export function ArmorMesh({
           const armorPiercingLayers = intersectionsTillFirstCoreArmor.map(
             (event, index) => {
               switch (event.object.userData.type) {
-                case 'spacedArmor': {
+                case 'externalModule': {
                   accumulatedThickness += event.object.userData.thickness;
 
                   return {
@@ -188,7 +188,7 @@ export function ArmorMesh({
                   } satisfies ArmorPiercingLayer;
                 }
 
-                case 'externalModule':
+                case 'spacedArmor':
                 case 'coreArmor': {
                   const threeCalibersRule =
                     shell.caliber > 3 * event.object.userData.thickness;
diff --git a/src/components/ArmorMesh/components/ExternalModuleMask.tsx b/src/components/ArmorMesh/components/ExternalModuleMask.tsx
index 7ecc59653..02cba6c83 100644
--- a/src/components/ArmorMesh/components/ExternalModuleMask.tsx
+++ b/src/components/ArmorMesh/components/ExternalModuleMask.tsx
@@ -23,7 +23,7 @@ export function ArmorMeshExternalModuleMask({
 }: ArmorMeshExternalModuleMaskProps) {
   return (
     <>
-      {(props.exclude || ornamental) && (
+      {props.exclude && !ornamental && (
         <mesh {...props} renderOrder={0}>
           <meshBasicMaterial colorWrite={false} />
         </mesh>