From 84d60f5053876f80585bb6163b3642d27901c4b0 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Sat, 17 Aug 2024 15:42:22 +0200
Subject: [PATCH] ccmk2/ccmk2a: small update to internal artwork

---
 src/mame/layout/novag_mk2.lay  | 18 ++++----
 src/mame/layout/novag_mk2a.lay | 81 +++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/src/mame/layout/novag_mk2.lay b/src/mame/layout/novag_mk2.lay
index a8a361816b8..5c0532cbdf8 100644
--- a/src/mame/layout/novag_mk2.lay
+++ b/src/mame/layout/novag_mk2.lay
@@ -77,16 +77,16 @@ authors:hap
 
 		<element ref="black"><bounds x="-1.75" y="5.5" width="25.75" height="0.5" /></element>
 
-		<element name="4.0" ref="led"><bounds x="-1.375" y="7.1" width="1" height="1" /></element>
-		<element name="4.2" ref="led"><bounds x="4.625" y="7.1" width="1" height="1" /></element>
-		<element name="4.1" ref="led"><bounds x="10.625" y="7.1" width="1" height="1" /></element>
-		<element name="4.1" ref="ledi"><bounds x="16.625" y="7.1" width="1" height="1" /></element>
+		<element name="4.0" ref="led"><bounds xc="0.5" y="7.1" width="1" height="1" /></element>
+		<element name="4.2" ref="led"><bounds xc="5.583" y="7.1" width="1" height="1" /></element>
+		<element name="4.1" ref="led"><bounds xc="10.666" y="7.1" width="1" height="1" /></element>
+		<element name="4.1" ref="ledi"><bounds xc="15.75" y="7.1" width="1" height="1" /></element>
 
-		<element ref="text_u01"><bounds x="-2.375" y="8.35" width="3" height="1" /></element>
-		<element ref="text_u02"><bounds x="2.625" y="8.35" width="5" height="1" /></element>
-		<element ref="white2"><bounds x="10.725" y="8.45" width="0.8" height="0.8" /></element>
-		<element ref="blackb"><bounds x="10.85" y="8.575" width="0.55" height="0.55" /></element>
-		<element ref="white2"><bounds x="16.725" y="8.45" width="0.8" height="0.8" /></element>
+		<element ref="text_u01"><bounds xc="0.5" y="8.35" width="3" height="1" /></element>
+		<element ref="text_u02"><bounds xc="5.583" y="8.35" width="5" height="1" /></element>
+		<element ref="white2"><bounds xc="10.666" y="8.45" width="0.8" height="0.8" /></element>
+		<element ref="blackb"><bounds xc="10.666" y="8.575" width="0.55" height="0.55" /></element>
+		<element ref="white2"><bounds xc="15.75" y="8.45" width="0.8" height="0.8" /></element>
 
 		<element ref="orange"><bounds x="0"  y="10" width="4.25" height="4.25" /></element>
 		<element ref="orange"><bounds x="6"  y="10" width="4.25" height="4.25" /></element>
diff --git a/src/mame/layout/novag_mk2a.lay b/src/mame/layout/novag_mk2a.lay
index 290a9e62b9e..f4a92579ea2 100644
--- a/src/mame/layout/novag_mk2a.lay
+++ b/src/mame/layout/novag_mk2a.lay
@@ -10,10 +10,11 @@ authors:hap
 <!-- define elements -->
 
 	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
-	<element name="black"><rect><color red="0.12" green="0.12" blue="0.12" /></rect></element>
+	<element name="black"><rect><color red="0.05" green="0.05" blue="0.05" /></rect></element>
 	<element name="white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
 	<element name="white2"><rect><color red="0.65" green="0.65" blue="0.65" /></rect></element>
 	<element name="orange"><rect><color red="0.8" green="0.4" blue="0.1" /></rect></element>
+	<element name="brown"><rect><color red="0.2" green="0.1" blue="0.05" /></rect></element>
 
 	<element name="digit" defstate="0">
 		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
@@ -48,8 +49,8 @@ authors:hap
 		</disk>
 	</element>
 
-	<element name="text_on"><text string="ON" align="1"><color red="0.4" green="0.4" blue="0.4" /></text></element>
-	<element name="text_off"><text string="OFF" align="2"><color red="0.4" green="0.4" blue="0.4" /></text></element>
+	<element name="text_on"><text string="ON" align="1"><color red="0.65" green="0.65" blue="0.65" /></text></element>
+	<element name="text_off"><text string="OFF" align="2"><color red="0.65" green="0.65" blue="0.65" /></text></element>
 
 	<element name="text_n1"><text string="1" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
 	<element name="text_n2"><text string="2" align="1"><color red="0.1" green="0.1" blue="0.1" /></text></element>
@@ -100,7 +101,7 @@ authors:hap
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="-1.5" right="47.5" top="0" bottom="27.8" />
+		<bounds left="-1.5" right="47.5" top="0" bottom="27.3" />
 
 		<element name="digit0" ref="digit"><bounds x="2"  y="1" width="4" height="6" /></element>
 		<element name="digit1" ref="digit"><bounds x="6"  y="1" width="4" height="6" /></element>
@@ -118,66 +119,66 @@ authors:hap
 		<element ref="white2"><bounds x="26" y="6" width="1" height="1" /></element>
 		<element ref="blackb"><bounds x="26.15" y="6.15" width="0.7" height="0.7" /></element>
 
-		<element ref="black"><bounds x="-1.5" y="9" width="49" height="0.5" /></element>
+		<element ref="brown"><bounds x="-1.5" y="9" width="49" height="8" /></element>
 
-		<element ref="orange"><bounds x="0" y="11.5" width="4" height="4" /></element>
-		<element ref="orange"><bounds x="6" y="11.5" width="4" height="4" /></element>
-		<element ref="orange"><bounds x="12" y="11.5" width="10" height="4" /></element>
+		<element ref="orange"><bounds x="0" y="11" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="6" y="11" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="12" y="11" width="10" height="4" /></element>
 
-		<element ref="text_l01"><bounds x="-2" y="15.7" width="8" height="1.5" /></element>
-		<element ref="text_l02"><bounds x="6" y="15.7" width="4" height="1.5" /></element>
-		<element ref="text_l03"><bounds x="13" y="12.4" width="8" height="2.2" /></element>
-		<element ref="text_l07"><bounds x="23" y="15.7" width="6" height="1.5" /></element>
+		<element ref="text_l01"><bounds x="-2" y="15.2" width="8" height="1.5" /></element>
+		<element ref="text_l02"><bounds x="6" y="15.2" width="4" height="1.5" /></element>
+		<element ref="text_l03"><bounds x="13" y="11.9" width="8" height="2.2" /></element>
+		<element ref="text_l07"><bounds x="35" y="15.2" width="6" height="1.5" /></element>
 
-		<element ref="hl" inputtag="RESET" inputmask="0x01"><bounds x="0"  y="11.5" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x10"><bounds x="6"  y="11.5" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x08"><bounds x="12" y="11.5" width="10" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="RESET" inputmask="0x01"><bounds x="0"  y="11" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x10"><bounds x="6"  y="11" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x08"><bounds x="12" y="11" width="10" height="4" /><color alpha="0.2" /></element>
 
 		<repeat count="8">
 			<param name="x" start="0" increment="6" />
-			<element ref="white"><bounds x="~x~" y="20" width="4" height="4" /></element>
+			<element ref="white"><bounds x="~x~" y="19.5" width="4" height="4" /></element>
 		</repeat>
 		<repeat count="8">
 			<param name="x" start="0.4" increment="6" />
 			<param name="i" start="1" increment="1" />
-			<element ref="text_n~i~"><bounds x="~x~" y="20.1" width="1.5" height="2" /></element>
+			<element ref="text_n~i~"><bounds x="~x~" y="19.6" width="1.5" height="2" /></element>
 		</repeat>
 		<repeat count="8">
 			<param name="x" start="2.1" increment="6" />
 			<param name="i" start="1" increment="1" />
-			<element ref="text_l~i~"><bounds x="~x~" y="21.9" width="1.5" height="2" /></element>
+			<element ref="text_l~i~"><bounds x="~x~" y="21.4" width="1.5" height="2" /></element>
 		</repeat>
 
-		<element ref="hl" inputtag="IN.0" inputmask="0x20"><bounds x="0"  y="20" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x10"><bounds x="6"  y="20" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x08"><bounds x="12" y="20" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x04"><bounds x="18" y="20" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x02"><bounds x="24" y="20" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x01"><bounds x="30" y="20" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x40"><bounds x="36" y="20" width="4" height="4" /><color alpha="0.2" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x20"><bounds x="42" y="20" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x20"><bounds x="0"  y="19.5" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x10"><bounds x="6"  y="19.5" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x08"><bounds x="12" y="19.5" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x04"><bounds x="18" y="19.5" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x02"><bounds x="24" y="19.5" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x01"><bounds x="30" y="19.5" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x40"><bounds x="36" y="19.5" width="4" height="4" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x20"><bounds x="42" y="19.5" width="4" height="4" /><color alpha="0.2" /></element>
 
-		<element ref="text_pp"><bounds x="1"  y="17.9" width="2" height="2" /></element>
-		<element ref="text_pn"><bounds x="7"  y="17.9" width="2" height="2" /></element>
-		<element ref="text_pb"><bounds x="13" y="17.9" width="2" height="2" /></element>
-		<element ref="text_pr"><bounds x="25" y="17.9" width="2" height="2" /></element>
-		<element ref="text_pq"><bounds x="43" y="17.9" width="2" height="2" /></element>
+		<element ref="text_pp"><bounds x="1"  y="17.4" width="2" height="2" /></element>
+		<element ref="text_pn"><bounds x="7"  y="17.4" width="2" height="2" /></element>
+		<element ref="text_pb"><bounds x="13" y="17.4" width="2" height="2" /></element>
+		<element ref="text_pr"><bounds x="25" y="17.4" width="2" height="2" /></element>
+		<element ref="text_pq"><bounds x="43" y="17.4" width="2" height="2" /></element>
 
 		<repeat count="6">
 			<param name="x" start="5" increment="6" />
 			<param name="i" start="2" increment="1" />
-			<element ref="text_l~i~a"><bounds x="~x~" y="24.2" width="6" height="1.5" /></element>
-			<element ref="text_l~i~b"><bounds x="~x~" y="25.7" width="6" height="1.5" /></element>
+			<element ref="text_l~i~a"><bounds x="~x~" y="23.7" width="6" height="1.5" /></element>
+			<element ref="text_l~i~b"><bounds x="~x~" y="25.2" width="6" height="1.5" /></element>
 		</repeat>
 
-		<element ref="white2"><bounds x="1.3" y="24.5" width="1.4" height="1.4" /></element>
-		<element ref="white2"><bounds x="43.3" y="24.5" width="1.4" height="1.4" /></element>
-		<element ref="blackb"><bounds x="43.5" y="24.7" width="1.0" height="1.0" /></element>
+		<element ref="white2"><bounds x="1.3" y="24" width="1.4" height="1.4" /></element>
+		<element ref="white2"><bounds x="43.3" y="24" width="1.4" height="1.4" /></element>
+		<element ref="blackb"><bounds x="43.5" y="24.2" width="1.0" height="1.0" /></element>
 
-		<element ref="black"><bounds x="24.25" y="12.9" width="3.5" height="1.4" /></element>
-		<element ref="sound" inputtag="IN.4" inputmask="0x01"><bounds x="24.15" y="12.7" width="3.7" height="1.8" /></element>
-		<element ref="text_on"><bounds x="24" y="14.5" width="4" height="1" /></element>
-		<element ref="text_off"><bounds x="24" y="14.5" width="4" height="1" /></element>
+		<element ref="black"><bounds x="36.25" y="12.4" width="3.5" height="1.4" /></element>
+		<element ref="sound" inputtag="IN.4" inputmask="0x01"><bounds x="36.15" y="12.2" width="3.7" height="1.8" /></element>
+		<element ref="text_on"><bounds x="36" y="14" width="4" height="1" /></element>
+		<element ref="text_off"><bounds x="36" y="14" width="4" height="1" /></element>
 
 	</view>
 </mamelayout>