Preparing release 1.1.6

Yemachu · Sep 14, 2019 · 8682861 · 8682861
2 parents b1d9aa2 + 2987162
commit 8682861
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/build/cardmaker.js b/build/cardmaker.js
diff --git a/src/tcg/ygo/CardMaker.js b/src/tcg/ygo/CardMaker.js
@@ -165,6 +165,7 @@ define(["react", "react-class", "./Card", "webfont"], function App(React, ReactC
 					e("label", null, "Defense and/or Link", e("input", { onChange: this.updateField("card.def"), type: "text", value: this.state.card.def })),
 					e("label", null, "Set id", e("input", { onChange: this.updateField("card.id"), type: "text", value: this.state.card.id })),
 					e("label", null, "Serial number", e("input", { onChange: this.updateField("card.serial"), type: "text", value: this.state.card.serial })),
+					e("button", {onClick: this.randomizeSerialNumber }, "Randomize"),
 					e("label", null, "Copyright", e("input", { onChange: this.updateField("card.copyright"), type: "text", value: this.state.card.copyright })),
 
 
@@ -340,6 +341,14 @@ define(["react", "react-class", "./Card", "webfont"], function App(React, ReactC
 					fr.readAsDataURL(files[0]);
 				}
 			}.bind(this);
+		},
+
+		randomizeSerialNumber: function()
+		{
+			var value = "0000000000" + (Math.random() * 10000000000).toFixed(0);
+			console.log(typeof value);
+
+			this.updateField("card.serial")({target:{value: value.substring(value.length-10)}});
 		}
 	});
 });
diff --git a/src/tcg/ygo/Rarities.js b/src/tcg/ygo/Rarities.js
@@ -4,6 +4,7 @@ define([], function()
 	return {
 		common:     { name: "Common", foil: undefined, color: undefined },
 		rare:       { name: "Rare", foil: undefined, color: "silver"},
-		secret: { name: "Secret rare", foil: [ path, "Secret.png" ].join("/"), color: "silver" }
+		ultra: { name: "Ultra rare", foil: [ path, "Secret.png" ].join("/"), color: "gold" },
+		secret: { name: "Secret rare", foil: [ path, "Secret.png" ].join("/"), color: "silver" },
 	};
 });
diff --git a/src/tcg/ygo/layout/component/CardName.js b/src/tcg/ygo/layout/component/CardName.js
@@ -32,7 +32,8 @@ define(["react", "react-class", "draw/Text", "../../Rarities"], function CardNam
 	var colors = {
 		default: { highlight: { color: "transparent" }, base: { color: "#000"} },
 		white: { highlight: { color: "transparent" }, base: { color: "#FFF"} },
-		silver: { highlight: { color: "#FFF" }, base: { color: "#222"} }
+		silver: { highlight: { color: "#b6b6b6" }, base: { color: "#1e1e1e"} },
+		gold: { highlight: { color: "#d3b146"}, base: {color: "#4e3518"}}
 	}
 
 	var CardName = ReactClass({
@@ -47,7 +48,7 @@ define(["react", "react-class", "draw/Text", "../../Rarities"], function CardNam
 				React.createElement(Text,
 				{
 					text: this.props.value,
-					style: Object.assign({}, style, (colors[color] || colors.default).highlight, { top: style.top+1 }),
+					style: Object.assign({}, style, (colors[color] || colors.default).highlight, { top: style.top-1, left: style.left-1 }),
 					repaint: this.props.repaint,
 					canvas: this.props.canvas
 				}),