Merge branch 'feature/dataOriented' into develop

public/cards.js

@@ -0,0 +1,21 @@
+// 0,1,2 = white,blue,red (for now)
+// TODO: Use a DB in future, this is just for testing
+let cardArray =
+[
+  { id: 1, name: 'Red1', colour: 2, cost: 1, type: 'Goblin', atk: 500, rarity: 'common', effect:'[[Sneak]] 500'},
+  { id: 2, name: 'Red2', colour: 2, cost: 1, type: 'Goblin', atk: 1500, rarity: 'common', effect:'Cannot attack direct'},
+  { id: 3, name: 'Red3', colour: 2, cost: 2, type: 'Goblin', atk: 1000, rarity: 'common', effect:'[[DEATH]] deal 1500 extra to killer'},
+  { id: 4, name: 'Red4', colour: 2, cost: 2, type: 'Goblin', atk: 2000, rarity: 'common', effect:null},
+  { id: 5, name: 'White1', colour: 0, cost: 1, type: 'Weapon', atk: 500, rarity: 'common', effect:'[[Equip]]'},
+  { id: 6, name: 'White2', colour: 0, cost: 2, type: 'Human', atk: 1500, rarity: 'common', effect:null},
+  { id: 7, name: 'White3', colour: 0, cost: 2, type: 'Human', atk: 2000, rarity: 'common', effect:'[[TAUNT]]'},
+  { id: 8, name: 'White5', colour: 0, cost: 2, type: 'Human', atk: 1500, rarity: 'common', effect:'[[REACH]]'},
+  { id: 9, name: 'Blue1', colour: 1, cost: 2, type: 'Spirit', atk: 1000, rarity: 'common', effect:null},
+  { id: 10, name: 'Blue3', colour: 1, cost: 2, type: 'Spirit', atk: 1000, rarity: 'common', effect:'[[DRAW]] 1'},
+  { id: 11, name: 'Blue4', colour: 1, cost: 2, type: 'Spirit', atk: 1500, rarity: 'common', effect:null},
+  { id: 12, name: 'Blue5', colour: 1, cost: 3, type: 'Spirit', atk: 2500, rarity: 'common', effect:'[[FLIGHT]]'}
+]
+
+let deckListPlayer = [5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,8,9,9,9,9,10,10,10,10];
+let deckListOpponent = [1,1,1,1,2,2,3,3,4,4,7,7,7,7,5,5,5,3,3,8,8];
+

public/index.html

@@ -16,9 +16,48 @@
 			<button onclick="requestCreateRoom()" style="background:#EEE">Create Room</button>
 		</div>
 		<canvas id="canvas" width="1000" height="600"></canvas>
-		<button onclick="untapAll()">Untap all</button>
+		<button onclick="untapAllZones()">Untap all</button>
+		<button onclick="echoCards()">Print cardlist to console</button>
+		<button onclick="echoCardsInDeck(0)">Print cardsInDeck for player0</button>
+		<button onclick="echoCardsInDeck(1)">Print cardsInDeck for player1</button>
+
+		<hr>
+		<div>
+			<button onclick="getItemsAndPrintFrontEnd()">Echo cards: </button>
+
+			<select name="boardElementId" id="boardElementId">
+				<option value="">All</option>
+				<option value="realDeck">realDeck</option>
+				<option value="deck">deck</option>
+				<option value="hand">hand</option>
+				<option value="mana">mana</option>
+				<option value="shield">shield</option>
+				<option value="board">board</option>
+				<option value="grave">grave</option>
+			</select>
+
+			<select name="playerId" id="playerId">
+				<option value="">All</option>
+				<option value="0">Player0</option>
+				<option value="1">Player1/Opponent</option>
+			</select>
+
+			<input name="listPositionId" id="listPositionId" placeholder="In position 1,2,3..."></input>
+
+			<select name="cardStatusId" id="cardStatusId">
+				<option value="">All</option>
+				<option value="attacking">Attacking</option>
+				<option value="tapped">Tapped</option>
+			</select>
+
+			<select name="itemOrCardData" id="itemOrCardData">
+				<option value="item">Item Data</option>
+				<option value="card">Card Data</option>
+			</select>
+		</div>
 
 		<script src="/socket.io/socket.io.js"></script>
+		<script src="/cards.js"></script><!-- Temp until DB -->
 		<script src="/shapes.js"></script>
 		<script src="/board.js"></script>
 		<script src="/main.js"></script>