Add crossing off items in artifact analysis form (#18454)

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
goonstation · Apr 10, 2024 · 3355f92 · 3355f92
1 parent 5879091
commit 3355f92
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 21 deletions.
diff --git a/browserassets/tgui/tgui.bundle.css b/browserassets/tgui/tgui.bundle.css
diff --git a/browserassets/tgui/tgui.bundle.js b/browserassets/tgui/tgui.bundle.js
diff --git a/code/obj/artifacts/artifactanalysis.dm b/code/obj/artifacts/artifactanalysis.dm
@@ -12,6 +12,7 @@
 	var/artifactDetails = ""
 	var/lastAnalysis = 0
 	var/lastAnalysisErrors = ""
+	var/list/crossed = list()
 
 	proc/checkArtifactVars(obj/O)
 		if(!O.artifact)
@@ -127,7 +128,7 @@
 		. = ..()
 		if (.)
 			return
-		if (!params["hasPen"])
+		if (!usr.find_type_in_hand(/obj/item/pen))
 			boutput(usr, "You can't write without a pen!")
 			return FALSE
 
@@ -136,12 +137,28 @@
 			O = src.loc
 		switch(action)
 			if("origin")
-				artifactOrigin = params["newOrigin"]
+				if (artifactOrigin == params["newOrigin"])
+					artifactOrigin = ""
+					crossed += params["newOrigin"]
+				else
+					crossed -= params["newOrigin"]
+					artifactOrigin = params["newOrigin"]
 			if("type")
-				src.updateTypeLabel(params["newType"])
-				artifactType = params["newType"]
+				if (artifactType == params["newType"])
+					removeTypeLabel()
+					artifactType = ""
+					crossed += params["newType"]
+				else
+					crossed -= params["newType"]
+					src.updateTypeLabel(params["newType"])
+					artifactType = params["newType"]
 			if("trigger")
-				artifactTriggers = params["newTriggers"]
+				if (artifactTriggers == params["newTriggers"])
+					artifactTriggers = ""
+					crossed += params["newTriggers"]
+				else
+					crossed -= params["newTriggers"]
+					artifactTriggers = params["newTriggers"]
 			if("fault")
 				artifactFaults = params["newFaults"]
 			if("detail")
@@ -151,15 +168,14 @@
 			src.checkArtifactVars(O)
 
 	ui_data(mob/user)
-		var/obj/item/pen/P = user.find_type_in_hand(/obj/item/pen)
 		. = list(
 			"artifactName" = artifactName,
 			"artifactOrigin" = artifactOrigin,
 			"artifactType" = artifactType,
 			"artifactTriggers" = artifactTriggers,
 			"artifactFaults" = artifactFaults,
 			"artifactDetails" = artifactDetails,
-			"hasPen" = P
+			"crossed" = crossed
 		)
 
 	remove_from_attached(do_loc = TRUE)

diff --git a/tgui/packages/tgui/interfaces/ArtifactPaper.js b/tgui/packages/tgui/interfaces/ArtifactPaper.js
@@ -21,7 +21,7 @@ export const ArtifactPaper = (props, context) => {
     allArtifactOrigins,
     allArtifactTypes,
     allArtifactTriggers,
-    hasPen,
+    crossed,
   } = data;
 
   return (
@@ -39,35 +39,35 @@ export const ArtifactPaper = (props, context) => {
           <Flex direction={"column"} wrap={"wrap"} height={3}>
             {allArtifactOrigins.map(x => (
               <Flex.Item key={x.id}
-                onClick={(e, value) => act("origin", { newOrigin: x, hasPen: hasPen })}>
+                onClick={(e, value) => act("origin", { newOrigin: x })}>
                 <Button.Checkbox
                   checked={artifactOrigin === x}
                 />
-                <a>{x}</a>
+                <a>{crossed.includes(x) ? <s>{x}</s> : x}</a>
               </Flex.Item>
             ))}
           </Flex>
           <h3>Artifact Type</h3>
           <Flex direction={"column"} wrap={"wrap"} height={25} justify={"space-evenly"}>
             {allArtifactTypes.map(x => (
               <Flex.Item className={"artifactType" + x[1]} key={x[0].id}
-                onClick={(e, value) => act("type", { newType: x[0], hasPen: hasPen })}>
+                onClick={(e, value) => act("type", { newType: x[0] })}>
                 <Button.Checkbox
                   checked={artifactType === x[0]}
                 />
-                <a>{x[0]}</a>
+                <a>{crossed.includes(x[0]) ? <s>{x[0]}</s> : x[0]}</a>
               </Flex.Item>
             ))}
           </Flex>
           <h3>Artifact Triggers (If Applicable)</h3>
           <Flex direction={"column"} wrap={"wrap"} height={5}>
             {allArtifactTriggers.map(x => (
               <Flex.Item key={x.id}
-                onClick={(e, value) => act("trigger", { newTriggers: x, hasPen: hasPen })}>
+                onClick={(e, value) => act("trigger", { newTriggers: x })}>
                 <Button.Checkbox
                   checked={artifactTriggers === x}
                 />
-                <a>{x}</a>
+                <a>{crossed.includes(x) ? <s>{x}</s> : x}</a>
               </Flex.Item>
             ))}
           </Flex>
@@ -76,14 +76,14 @@ export const ArtifactPaper = (props, context) => {
             value={artifactFaults}
             fluid
             height={5}
-            onChange={(_, x) => act("fault", { newFaults: x, hasPen: hasPen })} />
+            onChange={(_, x) => act("fault", { newFaults: x })} />
 
           <h3>Additional Information</h3>
           <TextArea
             value={artifactDetails}
             fluid
             height={10}
-            onChange={(_, x) => act("detail", { newDetail: x, hasPen: hasPen })} />
+            onChange={(_, x) => act("detail", { newDetail: x })} />
         </Section>
       </Window.Content>
     </Window>