Preparing release 1.2.0.

Yemachu · Jun 27, 2018 · 20d7640 · 20d7640
2 parents f055aad + 2f39966
commit 20d7640
Show file tree

Hide file tree

Showing 23 changed files with 98 additions and 11 deletions.
diff --git a/build/cardmaker.js b/build/cardmaker.js
diff --git a/css/Default-Theme.css b/css/Default-Theme.css
@@ -279,3 +279,15 @@ pre
 	color: inherit;
 	color: var(--input-fg-color);
 }
+
+a
+{
+	color: #FFC107;
+	color: var(--accent-primary-bg-color);
+	text-decoration: none;
+}
+
+a:hover
+{
+	text-decoration: underline;
+}
diff --git a/css/Style.css b/css/Style.css
@@ -37,6 +37,7 @@ body > header
 
 body > header > h1
 {
+	display: inline-block;
 	margin: 0;
 	font-size: 2em;
 	white-space: nowrap;
@@ -45,7 +46,14 @@ body > header > h1
 body > article
 {
 	top: 3em;
+	bottom: 2em;
+}
+
+body > footer
+{
 	bottom: 0;
+	height: 2em;
+	text-align: right;
 }
 
 input, textarea, label, select

diff --git a/index.html b/index.html
@@ -44,6 +44,10 @@ <h1>Neo New Card maker</h1>
 				JavaScript seems to be unavailable.
 			</div>
 		</article>
+		<footer>
+
+			<a href="https://forum.yugiohcardmaker.net/topic/372510-neo-new-card-maker-110/">YCM Forum</a>
+		</footer>
 		<script src="src/config.js"></script>
 		<script src="https://unpkg.com/[email protected]/require.js" data-main="build/cardmaker"></script>
 		<script>window.define || document.write("<script src=\"lib/require/require.js\"><\/script>");</script>

diff --git a/src/tcg/ygo/CardMaker.js b/src/tcg/ygo/CardMaker.js
@@ -1,7 +1,7 @@
 define(["react", "react-class", "./Card", "webfont"], function App(React, ReactClass, Card, WebFont)
 {
 	var emptyCard = {
-		version: "1.1.0",
+		version: "1.2.0",
 		rarity: "Common",
 		name: "",
 		level: 0,
@@ -11,6 +11,7 @@ define(["react", "react-class", "./Card", "webfont"], function App(React, ReactC
 		def: "",
 		serial: "This card cannot be used in a Duel.",
 		copyright: "© 1993 YEMACHU",
+		id: "",
 		attribute: "None",
 		pendulum: 
 		{
@@ -59,6 +60,7 @@ define(["react", "react-class", "./Card", "webfont"], function App(React, ReactC
 					serial: "This card cannot be used in a Duel.",
 					copyright: "© 1993 YEMACHU",
 					attribute: "None",
+					id: "YCM - EN000",
 					pendulum: 
 					{
 						enabled: true,
@@ -86,6 +88,7 @@ define(["react", "react-class", "./Card", "webfont"], function App(React, ReactC
 					families: [
 						"Buenard", 
 						"Spectral SC:semi-bold,extra-bold", 
+						"Spectral",
 						"Amiri:italic", 
 						"Audiowide", 
 						"Crimson Text:semi-bold,bold"
@@ -159,6 +162,7 @@ define(["react", "react-class", "./Card", "webfont"], function App(React, ReactC
 
 					e("label", null, "Attack", e("input", { onChange: this.updateField("card.atk"), type: "text", value: this.state.card.atk })),
 					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("label", null, "Copyright", e("input", { onChange: this.updateField("card.copyright"), type: "text", value: this.state.card.copyright })),
 

diff --git a/src/tcg/ygo/layout/DarkSynchro.js b/src/tcg/ygo/layout/DarkSynchro.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function DarkS
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial, color: this.props.pendulum.enabled ? undefined : "white" }),
+				React.createElement(C.Id, { value: this.props.id, position: this.props.pendulum.enabled ? "pendulum" : "regular", color: this.props.pendulum.enabled ? undefined : "white" }),
 				React.createElement(C.Copyright, { value: this.props.copyright, color: this.props.pendulum.enabled ? undefined : "white" })
 			);
 		}

diff --git a/src/tcg/ygo/layout/Effect.js b/src/tcg/ygo/layout/Effect.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Effec
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: this.props.pendulum.enabled ? "pendulum" : "regular"}),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 

diff --git a/src/tcg/ygo/layout/Fusion.js b/src/tcg/ygo/layout/Fusion.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Fusio
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: this.props.pendulum.enabled ? "pendulum" : "regular"}),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 

diff --git a/src/tcg/ygo/layout/Link.js b/src/tcg/ygo/layout/Link.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Link(
 				React.createElement(C.Link, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: "link"}),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 

diff --git a/src/tcg/ygo/layout/Normal.js b/src/tcg/ygo/layout/Normal.js
@@ -21,6 +21,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Norma
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: this.props.pendulum.enabled ? "pendulum" : "regular"}),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 

diff --git a/src/tcg/ygo/layout/Ritual.js b/src/tcg/ygo/layout/Ritual.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Ritua
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: this.props.pendulum.enabled ? "pendulum" : "regular"}),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 		}

diff --git a/src/tcg/ygo/layout/Spell.js b/src/tcg/ygo/layout/Spell.js
@@ -15,6 +15,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Spell
 				React.createElement(C.Effect, { value: this.props.effect, type: "Backrow" }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: "regular" }),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 		}

diff --git a/src/tcg/ygo/layout/Synchro.js b/src/tcg/ygo/layout/Synchro.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Synch
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: this.props.pendulum.enabled ? "pendulum" : "regular" }),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 		}

diff --git a/src/tcg/ygo/layout/Token.js b/src/tcg/ygo/layout/Token.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Token
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: this.props.pendulum.enabled ? "pendulum" : "regular" }),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 

diff --git a/src/tcg/ygo/layout/Trap.js b/src/tcg/ygo/layout/Trap.js
@@ -15,6 +15,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Trap(
 				React.createElement(C.Effect, { value: this.props.effect, type: "Backrow" }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: "regular" }),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 		}

diff --git a/src/tcg/ygo/layout/Unity.js b/src/tcg/ygo/layout/Unity.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Ritua
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial }),
+				React.createElement(C.Id, { value: this.props.id, position: "pendulum" }),
 				React.createElement(C.Copyright, { value: this.props.copyright })
 			);
 		}

diff --git a/src/tcg/ygo/layout/Xyz.js b/src/tcg/ygo/layout/Xyz.js
@@ -20,6 +20,7 @@ define(["react", "react-class", "draw/Group", "./component/All"], function Xyz(R
 				React.createElement(C.Def, { value: this.props.def }),
 
 				React.createElement(C.Serial, { value: this.props.serial, color: this.props.pendulum.enabled ? undefined : "white" }),
+				React.createElement(C.Id, { value: this.props.id, position: this.props.pendulum.enabled ? "pendulum" : "regular", color: this.props.pendulum.enabled ? undefined : "white" }),
 				React.createElement(C.Copyright, { value: this.props.copyright, color: this.props.pendulum.enabled ? undefined : "white" })
 			);
 		}

diff --git a/src/tcg/ygo/layout/component/All.js b/src/tcg/ygo/layout/component/All.js
@@ -12,8 +12,9 @@ define([
 	"./Link",
 	"./Serial",
 	"./Copyright",
-	"./LinkMarkers"
-], function ygo_template_all(CardName, Attribute, Border, Image, Level, Type, Effect, Atk, Def, Pendulum, Link, Serial, Copyright, LinkMarkers)
+	"./LinkMarkers",
+	"./Id"
+], function ygo_template_all(CardName, Attribute, Border, Image, Level, Type, Effect, Atk, Def, Pendulum, Link, Serial, Copyright, LinkMarkers, Id)
 {
 	return {
 		CardName: CardName,
@@ -29,6 +30,7 @@ define([
 		Link: Link,
 		Serial: Serial,
 		Copyright: Copyright,
-		LinkMarkers: LinkMarkers
+		LinkMarkers: LinkMarkers,
+		Id: Id
 	};
 });
diff --git a/src/tcg/ygo/layout/component/Copyright.js b/src/tcg/ygo/layout/component/Copyright.js
@@ -4,7 +4,7 @@ define(["react", "react-class", "draw/Text"], function Copyright(React, ReactCla
 		render: function render()
 		{
 			return React.createElement(Text, { text: this.props.value, style: {
-				fontFamily: ["Buenard", "serif"],
+				fontFamily: ["Spectral", "serif"],
 				color: this.props.color,
 				fontSize: 12,
 				textAlign: "right",

diff --git a/src/tcg/ygo/layout/component/Effect.js b/src/tcg/ygo/layout/component/Effect.js
@@ -2,7 +2,7 @@ define(["react", "react-class", "draw/Text"], function Effect(React, ReactClass,
 {
 	var styles = {
 		Monster: {
-			fontFamily: ["Buenard", "serif"],
+			fontFamily: ["Spectral", "serif"],
 
 			fontSize: 13,
 			textAlign: "justify",
@@ -13,7 +13,7 @@ define(["react", "react-class", "draw/Text"], function Effect(React, ReactClass,
 			height: 75
 		},
 		Backrow: {
-			fontFamily: ["Buenard", "serif"],
+			fontFamily: ["Spectral", "serif"],
 
 			fontSize: 13,
 			textAlign: "justify",

diff --git a/src/tcg/ygo/layout/component/Id.js b/src/tcg/ygo/layout/component/Id.js
@@ -0,0 +1,45 @@
+define(["react", "react-class", "draw/Text"], function Id(React, ReactClass, Text)
+{
+	var shared = {
+			fontFamily: ["Spectral", "serif"],
+			fontSize: 12,
+			whitespace: "nowrap",
+
+			height: undefined
+	}
+	var styles = {
+		regular: {
+			textAlign: "right",
+			left: 290,
+			top: 437,
+			width: 80,
+		},
+		pendulum: {
+			color: "black",
+			textAlign: "left",
+			left: 35,
+			top: 555,
+			width: 80,
+		},
+		link: {
+			textAlign: "right",
+			left: 265,
+			top: 437,
+			width: 80,
+		}
+	};
+
+	var Id = ReactClass({
+		render: function render()
+		{
+			return React.createElement(Text, { text: this.props.value, style: Object.assign({color: this.props.color}, shared, styles[this.props.position]), canvas: this.props.canvas, repaint: this.props.repaint })
+		}
+	});
+	Id.displayName = "Id";
+	Id.defaultProps = {
+		value: "",
+		color: "black",
+		position: "regular"
+	};
+	return Id;
+});
diff --git a/src/tcg/ygo/layout/component/Pendulum.js b/src/tcg/ygo/layout/component/Pendulum.js
@@ -11,7 +11,7 @@ define(["react", "react-class", "draw/Group", "draw/Text"], function Pendulum(Re
 					{ 
 						text: this.props.effect,
 						style: {
-							fontFamily: ["Buenard", "serif"],
+							fontFamily: ["Spectral", "serif"],
 
 							fontSize: 13,
 							textAlign: "justify",

diff --git a/src/tcg/ygo/layout/component/Serial.js b/src/tcg/ygo/layout/component/Serial.js
@@ -4,7 +4,7 @@ define(["react", "react-class", "draw/Text"], function Serial(React, ReactClass,
 		render: function render()
 		{
 			return React.createElement(Text, { text: this.props.value, style: {
-				fontFamily: ["Buenard", "serif"],
+				fontFamily: ["Spectral", "serif"],
 				color: this.props.color,
 				fontSize: 12,
 				textAlign: "left",