diff --git a/creator/index.html b/creator/index.html
index d6742b4c..727926ed 100644
--- a/creator/index.html
+++ b/creator/index.html
@@ -50,7 +50,7 @@
-
+
diff --git a/data/images/cardImages/expedition/expeditionMaskType.png b/data/images/cardImages/expedition/expeditionMaskType.png
deleted file mode 100644
index dcbab20d..00000000
Binary files a/data/images/cardImages/expedition/expeditionMaskType.png and /dev/null differ
diff --git a/data/images/cardImages/m15/invention/inventionPT.png b/data/images/cardImages/m15/invention/inventionPT.png
new file mode 100644
index 00000000..9ce256f5
Binary files /dev/null and b/data/images/cardImages/m15/invention/inventionPT.png differ
diff --git a/data/images/cardImages/m15/invention/m15InventionFrameA.png b/data/images/cardImages/m15/invention/m15InventionFrameA.png
new file mode 100644
index 00000000..38d41e11
Binary files /dev/null and b/data/images/cardImages/m15/invention/m15InventionFrameA.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInvention.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInvention.png
new file mode 100644
index 00000000..dc314193
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInvention.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionA.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionA.png
new file mode 100644
index 00000000..7a6190bc
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionA.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionB.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionB.png
new file mode 100644
index 00000000..0ef141e5
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionB.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionG.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionG.png
new file mode 100644
index 00000000..af61daf8
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionG.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionL.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionL.png
new file mode 100644
index 00000000..9894de19
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionL.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionM.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionM.png
new file mode 100644
index 00000000..fe999bc2
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionM.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionR.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionR.png
new file mode 100644
index 00000000..e0ee2dec
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionR.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionU.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionU.png
new file mode 100644
index 00000000..91010313
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionU.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionW.png b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionW.png
new file mode 100644
index 00000000..ae25b9ee
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionW.png differ
diff --git a/data/images/cardImages/m15Textless/invention/m15TextlessMaskInvention.png b/data/images/cardImages/m15Textless/invention/m15TextlessMaskInvention.png
new file mode 100644
index 00000000..1c04d018
Binary files /dev/null and b/data/images/cardImages/m15Textless/invention/m15TextlessMaskInvention.png differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessFrameInvention.png b/data/images/cardImages/m15Textless/m15TextlessFrameInvention.png
deleted file mode 100644
index ac4f91cf..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessFrameInvention.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessFrameInventionA.png b/data/images/cardImages/m15Textless/m15TextlessFrameInventionA.png
deleted file mode 100644
index 7a89764c..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessFrameInventionA.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessFrameInventionB.png b/data/images/cardImages/m15Textless/m15TextlessFrameInventionB.png
deleted file mode 100644
index babf0b60..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessFrameInventionB.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessFrameInventionG.png b/data/images/cardImages/m15Textless/m15TextlessFrameInventionG.png
deleted file mode 100644
index ceda4f32..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessFrameInventionG.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessFrameInventionM.png b/data/images/cardImages/m15Textless/m15TextlessFrameInventionM.png
deleted file mode 100644
index 607746aa..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessFrameInventionM.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessFrameInventionR.png b/data/images/cardImages/m15Textless/m15TextlessFrameInventionR.png
deleted file mode 100644
index c4a9e649..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessFrameInventionR.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessFrameInventionU.png b/data/images/cardImages/m15Textless/m15TextlessFrameInventionU.png
deleted file mode 100644
index f89267bb..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessFrameInventionU.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessFrameInventionW.png b/data/images/cardImages/m15Textless/m15TextlessFrameInventionW.png
deleted file mode 100644
index 8d00229b..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessFrameInventionW.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessMaskBorder.png b/data/images/cardImages/m15Textless/m15TextlessMaskBorder.png
deleted file mode 100644
index 4ec9ba1b..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessMaskBorder.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessMaskInvention.png b/data/images/cardImages/m15Textless/m15TextlessMaskInvention.png
deleted file mode 100644
index df725926..00000000
Binary files a/data/images/cardImages/m15Textless/m15TextlessMaskInvention.png and /dev/null differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessMaskPinline.png b/data/images/cardImages/m15Textless/m15TextlessMaskPinline.png
index 9d0fc193..c94df29b 100644
Binary files a/data/images/cardImages/m15Textless/m15TextlessMaskPinline.png and b/data/images/cardImages/m15Textless/m15TextlessMaskPinline.png differ
diff --git a/data/images/cardImages/m15Textless/m15TextlessMaskType.png b/data/images/cardImages/m15Textless/m15TextlessMaskType.png
index a2d56765..dcbab20d 100644
Binary files a/data/images/cardImages/m15Textless/m15TextlessMaskType.png and b/data/images/cardImages/m15Textless/m15TextlessMaskType.png differ
diff --git a/data/scripts/versions/expedition/regular.js b/data/scripts/versions/expedition/regular.js
index 44d1e828..44a01377 100644
--- a/data/scripts/versions/expedition/regular.js
+++ b/data/scripts/versions/expedition/regular.js
@@ -1,14 +1,14 @@
if (!loadedVersions.includes('expeditionRegular')) {
loadedVersions.push('expeditionRegular')
loadFrameImages([
- ['Land Frame', '/data/images/cardImages/expedition/expeditionFrameL.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (expedition)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
- ['White Frame', '/data/images/cardImages/expedition/expeditionFrameW.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (expedition)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
- ['Blue Frame', '/data/images/cardImages/expedition/expeditionFrameU.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (expedition)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
- ['Black Frame', '/data/images/cardImages/expedition/expeditionFrameB.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (expedition)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
- ['Red Frame', '/data/images/cardImages/expedition/expeditionFrameR.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (expedition)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
- ['Green Frame', '/data/images/cardImages/expedition/expeditionFrameG.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (expedition)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
- ['Multicolored Frame', '/data/images/cardImages/expedition/expeditionFrameM.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (expedition)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
- ['Artifact Frame', '/data/images/cardImages/expedition/expeditionFrameA.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (expedition)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
+ ['Land Frame', '/data/images/cardImages/expedition/expeditionFrameL.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (m15 textless)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
+ ['White Frame', '/data/images/cardImages/expedition/expeditionFrameW.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (m15 textless)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
+ ['Blue Frame', '/data/images/cardImages/expedition/expeditionFrameU.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (m15 textless)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
+ ['Black Frame', '/data/images/cardImages/expedition/expeditionFrameB.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (m15 textless)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
+ ['Red Frame', '/data/images/cardImages/expedition/expeditionFrameR.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (m15 textless)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
+ ['Green Frame', '/data/images/cardImages/expedition/expeditionFrameG.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (m15 textless)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
+ ['Multicolored Frame', '/data/images/cardImages/expedition/expeditionFrameM.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (m15 textless)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
+ ['Artifact Frame', '/data/images/cardImages/expedition/expeditionFrameA.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition)', 'Title (m15)', 'Type (m15 textless)', 'Frame (expedition)', 'Rules (expedition)', 'Border (m15)']],
['White Power/Toughness', '/data/images/cardImages/m15/m15PTW.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
['Blue Power/Toughness', '/data/images/cardImages/m15/m15PTU.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
['Black Power/Toughness', '/data/images/cardImages/m15/m15PTB.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
diff --git a/data/scripts/versions/expedition/version.js b/data/scripts/versions/expedition/version.js
index 220ac9ba..e53b92a9 100644
--- a/data/scripts/versions/expedition/version.js
+++ b/data/scripts/versions/expedition/version.js
@@ -1,6 +1,6 @@
if (!loadedVersions.includes('expedition')) {
loadedVersions.push('expedition')
- loadMaskImages([['Pinline (expedition)', '/data/images/cardImages/expedition/expeditionMaskPinline.png'], ['Type (expedition)', '/data/images/cardImages/expedition/expeditionMaskType.png'], ['Rules (expedition)', '/data/images/cardImages/expedition/expeditionMaskTextbox.png'], ['Frame (expedition)', '/data/images/cardImages/expedition/expeditionMaskFrame.png']])
+ loadMaskImages([['Pinline (expedition)', '/data/images/cardImages/expedition/expeditionMaskPinline.png'], ['Type (m15 textless)', '/data/images/cardImages/m15Textless/m15TextlessMaskType.png'], ['Rules (expedition)', '/data/images/cardImages/expedition/expeditionMaskTextbox.png'], ['Frame (expedition)', '/data/images/cardImages/expedition/expeditionMaskFrame.png']])
}
if (currentVersion != 'expedition') {
diff --git a/data/scripts/versions/m15/invention.js b/data/scripts/versions/m15/invention.js
index 1a79dd59..e3ace572 100644
--- a/data/scripts/versions/m15/invention.js
+++ b/data/scripts/versions/m15/invention.js
@@ -1,8 +1,8 @@
if (!loadedVersions.includes('m15Invention')) {
loadedVersions.push("m15Invention")
loadFrameImages([
- ['Invention Frame', '/data/images/cardImages/invention/inventionFrame.png', 0, 0, 1, 1, ['Full', 'Pinline Super (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)']],
- ['Invention Power/Toughness', '/data/images/cardImages/invention/inventionPT.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']]
+ ['Invention Frame', '/data/images/cardImages/m15/invention/m15InventionFrameA.png', 0, 0, 1, 1, ['Full', 'Pinline Super (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)']],
+ ['Invention Power/Toughness', '/data/images/cardImages/m15/invention/inventionPT.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']]
], 'frameClassM15Invention')
}
diff --git a/data/scripts/versions/m15Textless/regular.js b/data/scripts/versions/m15Textless/regular.js
index 6cd1659e..f01c56f7 100644
--- a/data/scripts/versions/m15Textless/regular.js
+++ b/data/scripts/versions/m15Textless/regular.js
@@ -1,15 +1,16 @@
if (!loadedVersions.includes('m15TextlessInvention')) {
loadedVersions.push('m15TextlessInvention')
loadFrameImages([
- ['Invention Frame', '/data/images/cardImages/m15Textless/m15TextlessFrameInvention.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Invention (m15 Textless)', 'Border (m15 Textless)']],
- ['Invention Power/Toughness', '/data/images/cardImages/invention/inventionPT.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
- ['White Invention Frame', '/data/images/cardImages/m15Textless/m15TextlessFrameInventionW.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Invention (m15 Textless)', 'Border (m15 Textless)']],
- ['Blue Invention Frame', '/data/images/cardImages/m15Textless/m15TextlessFrameInventionU.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Invention (m15 Textless)', 'Border (m15 Textless)']],
- ['Black Invention Frame', '/data/images/cardImages/m15Textless/m15TextlessFrameInventionB.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Invention (m15 Textless)', 'Border (m15 Textless)']],
- ['Red Invention Frame', '/data/images/cardImages/m15Textless/m15TextlessFrameInventionR.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Invention (m15 Textless)', 'Border (m15 Textless)']],
- ['Green Invention Frame', '/data/images/cardImages/m15Textless/m15TextlessFrameInventionG.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Invention (m15 Textless)', 'Border (m15 Textless)']],
- ['Multicolored Invention Frame', '/data/images/cardImages/m15Textless/m15TextlessFrameInventionM.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Invention (m15 Textless)', 'Border (m15 Textless)']],
- ['Artifact Invention Frame', '/data/images/cardImages/m15Textless/m15TextlessFrameInventionA.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Invention (m15 Textless)', 'Border (m15 Textless)']],
+ ['Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInvention.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
+ ['Invention Power/Toughness', '/data/images/cardImages/m15/invention/inventionPT.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
+ ['White Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionW.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
+ ['Blue Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionU.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
+ ['Black Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionB.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
+ ['Red Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionR.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
+ ['Green Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionG.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
+ ['Multicolored Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionM.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
+ ['Artifact Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionA.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
+ ['Land Invention Frame', '/data/images/cardImages/m15Textless/invention/m15TextlessFrameInventionL.png', 0, 0, 1, 1, ['Full', 'Pinline (m15 Textless)', 'Title (m15)', 'Type (m15 Textless)', 'Filigree (m15 Textless)', 'Border (m15)']],
['White Power/Toughness', '/data/images/cardImages/m15/m15PTW.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
['Blue Power/Toughness', '/data/images/cardImages/m15/m15PTU.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
['Black Power/Toughness', '/data/images/cardImages/m15/m15PTB.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
diff --git a/data/scripts/versions/m15Textless/version.js b/data/scripts/versions/m15Textless/version.js
index d2eb4e93..8c984cc1 100644
--- a/data/scripts/versions/m15Textless/version.js
+++ b/data/scripts/versions/m15Textless/version.js
@@ -1,6 +1,6 @@
if (!loadedVersions.includes('m15Textless')) {
loadedVersions.push('m15Textless')
- loadMaskImages([['Border (m15 Textless)', '/data/images/cardImages/m15Textless/m15TextlessMaskBorder.png'], ['Pinline (m15 Textless)', '/data/images/cardImages/m15Textless/m15TextlessMaskPinline.png'], ['Type (m15 Textless)', '/data/images/cardImages/m15Textless/m15TextlessMaskType.png'], ['Invention (m15 Textless)', '/data/images/cardImages/m15Textless/m15TextlessMaskInvention.png']])
+ loadMaskImages([['Border (m15)', '/data/images/cardImages/m15/m15MaskBorder.png'], ['Pinline (m15 Textless)', '/data/images/cardImages/m15Textless/m15TextlessMaskPinline.png'], ['Type (m15 Textless)', '/data/images/cardImages/m15Textless/m15TextlessMaskType.png'], ['Filigree (m15 Textless)', '/data/images/cardImages/m15Textless/invention/m15TextlessMaskInvention.png']])
}
if (currentVersion != 'm15Textless') {
@@ -8,7 +8,7 @@ if (currentVersion != 'm15Textless') {
loadTextOptions([
new cardText('Card Title', '', 126/1500, 188/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']),
- new cardText('Card Type', '', 126/1500, 1827/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']),
+ new cardText('Card Type', '', 126/1500, 1795/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']),
new cardText('Power/Toughness', '', 1191/1500, 1954/2100, 205/1500, 78/2100, 'belerenbsc', 78/2100, 'black', ['oneLine=true,textAlign="center"'])
])
@@ -24,7 +24,7 @@ if (currentVersion != 'm15Textless') {
manaCostDirection = 'reverse'
setSymbolX = [scaleX(1382/1500), 'right']
- setSymbolY = [scaleY(1804/2100), 'center']
+ setSymbolY = [scaleY(1772/2100), 'center']
setSymbolWidth = scaleX(180/1500)
setSymbolHeight = scaleY(86/2100)
diff --git a/data/scripts/versions/token/textless.js b/data/scripts/versions/token/textless.js
index 24263fff..8605a85b 100644
--- a/data/scripts/versions/token/textless.js
+++ b/data/scripts/versions/token/textless.js
@@ -1,15 +1,15 @@
if (!loadedVersions.includes('tokenTextless')) {
loadedVersions.push('tokenTextless')
- loadMaskImages([['Pinline (token textless)', '/data/images/cardImages/token/tokenMaskTextlessPinline.png'], ['Type (token textless)', '/data/images/cardImages/token/tokenMaskTextlessType.png']])
+ loadMaskImages([['Pinline (token textless)', '/data/images/cardImages/token/tokenMaskTextlessPinline.png'], ['Type (m15 textless)', '/data/images/cardImages/m15Textless/m15TextlessMaskType.png']])
loadFrameImages([
- ['White Frame', '/data/images/cardImages/token/tokenFrameWTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (token textless)', 'Border (m15)']],
- ['Blue Frame', '/data/images/cardImages/token/tokenFrameUTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (token textless)', 'Border (m15)']],
- ['Black Frame', '/data/images/cardImages/token/tokenFrameBTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (token textless)', 'Border (m15)']],
- ['Red Frame', '/data/images/cardImages/token/tokenFrameRTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (token textless)', 'Border (m15)']],
- ['Green Frame', '/data/images/cardImages/token/tokenFrameGTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (token textless)', 'Border (m15)']],
- ['Multicolored Frame', '/data/images/cardImages/token/tokenFrameMTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (token textless)', 'Border (m15)']],
- ['Artifact Frame', '/data/images/cardImages/token/tokenFrameATextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (token textless)', 'Border (m15)']],
- ['Land Frame', '/data/images/cardImages/token/tokenFrameLTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (token textless)', 'Border (m15)']],
+ ['White Frame', '/data/images/cardImages/token/tokenFrameWTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (m15 textless)', 'Border (m15)']],
+ ['Blue Frame', '/data/images/cardImages/token/tokenFrameUTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (m15 textless)', 'Border (m15)']],
+ ['Black Frame', '/data/images/cardImages/token/tokenFrameBTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (m15 textless)', 'Border (m15)']],
+ ['Red Frame', '/data/images/cardImages/token/tokenFrameRTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (m15 textless)', 'Border (m15)']],
+ ['Green Frame', '/data/images/cardImages/token/tokenFrameGTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (m15 textless)', 'Border (m15)']],
+ ['Multicolored Frame', '/data/images/cardImages/token/tokenFrameMTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (m15 textless)', 'Border (m15)']],
+ ['Artifact Frame', '/data/images/cardImages/token/tokenFrameATextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (m15 textless)', 'Border (m15)']],
+ ['Land Frame', '/data/images/cardImages/token/tokenFrameLTextless.png', 0, 0, 1, 1, ['Full', 'Pinline (token textless)', 'Title (m15)', 'Type (m15 textless)', 'Border (m15)']],
['White Power/Toughness', '/data/images/cardImages/m15/m15PTW.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
['Blue Power/Toughness', '/data/images/cardImages/m15/m15PTU.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
['Black Power/Toughness', '/data/images/cardImages/m15/m15PTB.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
diff --git a/data/styles/main.css b/data/styles/main.css
index 5368a076..53609540 100644
--- a/data/styles/main.css
+++ b/data/styles/main.css
@@ -174,6 +174,7 @@ img {
user-drag: none;
}
#framePicker, #maskPicker {
+ margin-top: 0.25rem;
padding-top: 0.25rem;
margin-bottom: 0.25rem;
max-height: 260pt;
@@ -240,7 +241,7 @@ img {
}
/*Gives non-text inputs the pointer cursor*/
-input:not([type='text']), select, option, button {
+input:not([type='text']):not([type='number']), select, option, button {
cursor: pointer;
}
/*Styles most of the inputs, except checkboxes*/