Fix the card changes and card1 value problem

mafromist · Mar 18, 2021 · b73f6cc · b73f6cc
1 parent 65cdc70
commit b73f6cc
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 48 deletions.
diff --git a/app.js b/app.js
@@ -1,6 +1,5 @@
 /* import { createCards } from 'newData';
 
-
  */ /*Background about the game
 The game is played taking turns between one players’ hand of 15 cards 
  AND the other player’s hand. 
@@ -97,9 +96,14 @@ const hideCard = () => {
 };
 
 const drawP1Card = () => {
- p1charName.textContent = name1;
+ p1charName.textContent = name1
  charImg1.src = img1;
  charImg1.alt = name1;
+ p1magicLevel.textContent = currentCard1.magic;
+ p1cunningLevel.textContent = currentCard1.cunning;
+ p1courageLevel.textContent = currentCard1.courage;
+ p1wisdomLevel.textContent = currentCard1.wisdom;
+ p1temperLevel.textContent = currentCard1.temper;
 };
 
 levels[0].dataset.level.value = magicLevel1;
@@ -114,12 +118,6 @@ levels[7].dataset.level.textContent = courageLevel2;
 levels[8].dataset.level.textContent = wisdomLevel2;
 levels[9].dataset.level.textContent = temperLevel2;
 
-console.log(levels);
-console.log(levels[0].dataset.type);
-console.log(levels[0].dataset.level);
-console.log(magicLevel1);
-console.log(levels[0].dataset.level);
-console.log(levels[0].dataset.level.value);
 
 const drawP2Card = () => {
  p2charName.textContent = currentCard2.name;
@@ -153,7 +151,7 @@ const revealCard = () => {
  newCardBtn.style.display = "block";
 };
 
-/* const winnerHand = (a, b) => {
+const winnerHand = (a, b) => {
  if (a > b) {
  alert("P1 won the turn");
  pScore1 += 1;
@@ -169,7 +167,7 @@ const revealCard = () => {
  tieScore++;
  console.log(currentPlayer);
  }
-}; */
+};
 
 //newCardBtn Function
 // step 1 - check currentPlayer
@@ -179,25 +177,22 @@ const revealCard = () => {
 // step 5 - if currentPlayer lost change the currentPlayer to opposite
 // step 6 - add to round value + 1
 
-const winnerHand = (a, b) => {
- const drawNewCards = () => {
- newCardBtn.addEventListener("click", () => {
- getNextCards();
- if (currentPlayer == 1) {
- hideCard();
- drawP1Card();
- drawP2Card();
- p1Score += tieScore;
- } else {
- hideCard();
- drawP1Card();
- drawP2Card();
- p2Score += tieScore;
- }
- round++;
- });
- };
-};
+const drawNewCards = () => {
+ newCardBtn.addEventListener("click", () => {
+ getNextCards();
+ if (currentPlayer == 1) {
+ hideCard();
+ drawP1Card();
+ drawP2Card();
+ p1Score += tieScore;
+ } else {
+ hideCard();
+ drawP1Card();
+ drawP2Card();
+ p2Score += tieScore;
+ }
+ round++;
+})};
 
 ///// FUNCTIONS TO COMPARE THE LEVELS
 
@@ -225,22 +220,11 @@ const selectAttributes = () => {
 newGameBtn.addEventListener("click", () => {
  createCards();
  gameInit();
+ getNextCards();
  newCardBtn.style.display = "none";
 });
 
-newCardBtn.addEventListener("click", () => {
- if (round < 15) {
- selectAttributes();
- } else {
- if (p1Score > p2Score) {
- alert("P1 WINS!");
- } else {
- alert("P2 WINS!");
- }
- }
-});
-
-/* const playGame = () => {
+ const playGame = () => {
  gameInit();
  if (round < 15) {
  selectAttributes();
@@ -255,7 +239,7 @@ newCardBtn.addEventListener("click", () => {
  }
  }
 
- playGame(); */
+ playGame();
 
 /*
 

diff --git a/newData.js b/newData.js
@@ -272,11 +272,6 @@ createCards();
 let currentCard1 = p1Cards[Math.floor(Math.random() * 14)];
 let currentCard2 = p2Cards[Math.floor(Math.random() * 14)];
 
-const getNextCards = () => {
- currentCard1 = p1Cards[Math.floor(Math.random() * 14)];
- currentCard2 = p2Cards[Math.floor(Math.random() * 14)];
-};
-
 let img1 = currentCard1.imgs;
 let img2 = currentCard2.imgs;
 
@@ -298,6 +293,34 @@ let wisdomLevel2 = currentCard2["wisdom"];
 let temperLevel1 = currentCard1["temper"];
 let temperLevel2 = currentCard2["temper"];
 
+const getNextCards = () => {
+ currentCard1 = p1Cards[Math.floor(Math.random() * 14)];
+ currentCard2 = p2Cards[Math.floor(Math.random() * 14)];
+
+ img1 = currentCard1.imgs;
+ img2 = currentCard2.imgs;
+
+ name1 = currentCard1.name;
+ name2 = currentCard2.name;
+
+ magicLevel1 = currentCard1["magic"];
+ magicLevel2 = currentCard2["magic"];
+
+ cunningLevel1 = currentCard1["cunning"];
+ cunningLevel2 = currentCard2["cunning"];
+
+ courageLevel1 = currentCard1["courage"];
+ courageLevel2 = currentCard2["courage"];
+
+ wisdomLevel1 = currentCard1["wisdom"];
+ wisdomLevel2 = currentCard2["wisdom"];
+
+ temperLevel1 = currentCard1["temper"];
+ temperLevel2 = currentCard2["temper"];
+};
+
+
+
 /* let cardNum = Math.floor(Math.random() * (cardData.length));
 
 const randCard = cardData[cardNum];