From c0d32b6dc38302d420e8a0ec46461d596e3e4637 Mon Sep 17 00:00:00 2001
From: bluesaxman <bluesaxman@murkfall.net>
Date: Fri, 4 Sep 2020 22:14:27 -0600
Subject: [PATCH] removed explicit indexing, since changing to an array of
 objects fixed the ordering problem already

---
 index.html        |  3 ---
 jokers.ddf        |  8 --------
 standardfaces.ddf |  4 ----
 uno.ddf           | 12 ------------
 4 files changed, 27 deletions(-)

diff --git a/index.html b/index.html
index 1b79db6..817e08f 100644
--- a/index.html
+++ b/index.html
@@ -27,9 +27,6 @@ function updateEvent() {
 
 function generateDeck(DDF) {
 	var cards = [""];
-	DDF.sort(function (a,b) {
-		return a.dataIndex - b.dataIndex;
-	});
 	DDF.forEach( function (dataBlock) {
 		var tempcards = [];
 		cards.forEach( function (current) {
diff --git a/jokers.ddf b/jokers.ddf
index 019bfbe..987cd29 100644
--- a/jokers.ddf
+++ b/jokers.ddf
@@ -1,22 +1,14 @@
 [
 	[{
-		"dataIndex":0,
-		"name":"value",
 		"data":[ "A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K"]
 	},
 	{
-		"dataIndex":1,
-		"name":"suit",
 		"data":[ "♥", "♣", "♠", "♦" ]
 	}],
 	[{
-		"dataIndex":0,
-		"name":"color",
 		"data":["red ", "black "]
 	},
 	{
-		"dataIndex":1,
-		"name":"joker",
 		"data":["joker"]
 	}]
 ]
diff --git a/standardfaces.ddf b/standardfaces.ddf
index 104f032..59dab3f 100644
--- a/standardfaces.ddf
+++ b/standardfaces.ddf
@@ -1,12 +1,8 @@
 [
 	{
-		"dataIndex":0,
-		"name":"value",
 		"data":[ "A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K"]
 	},
 	{
-		"dataIndex":1,
-		"name":"suit",
 		"data":[ "♥", "♣", "♠", "♦" ]
 	}
 ]
diff --git a/uno.ddf b/uno.ddf
index 8c55a52..1585813 100644
--- a/uno.ddf
+++ b/uno.ddf
@@ -1,32 +1,20 @@
 [
 	[{
-		"dataIndex":0,
-		"name":"color",
 		"data":[ "<div style=\"background:#f00;", "<div style=\"background:#0f0;", "<div style=\"background:#00f;", "<div style=\"background:#ff0;"]
 	},
 	{
-		"dataIndex":1,
-		"name":"style",
 		"data":[" color:#fff; text-shadow:1px 1px 0 #000, -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000; border:5px #fff solid; display:flex; justify-content:center; align-items:center; height:100%; width:100%; font-size:3em; box-sizing:border-box;\"><div style=\"display:flex; flex-direction:column; align-items:center; justify-content:center; overflow:hidden; text-align:center; border:5px #fff solid; box-sizing:border-box; border-radius:50%; height:90%; width:90%;\">"]
 	},
 	{
-		"dataIndex":2,
-		"name":"value",
 		"data":[ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "⮌<p>Reverse", "⊘<p>skip", "+2<p>Draw 2"]
 	},
 	{
-		"dataIndex":3,
-		"name":"end",
 		"data":["</div></div>"]
 	}],
 	[{
-		"dataIndex":0,
-		"name":"draw4",
 		"data":["<div style=\"background:#000; color:#fff; border:5px #fff solid; display:flex; justify-content:center; align-items:center; height:100%; width:100%; font-size:3em; box-sizing:border-box;\"><div style=\"text-align:center; display:flex; flex-direction:column;\">"]
 	},
 	{
-		"dataIndex":1,
-		"name":"cards",
 		"data":[ "+4<p>Draw 4</div></div>", "+4<p>Draw 4</div></div>", "+4<p>Draw 4</div></div>", "+4<p>Draw 4</div></div>"]
 	}]
 ]