From 51bb7abf780fac40cd7b1586a1323aa309f4efc0 Mon Sep 17 00:00:00 2001 From: JaceRiehl Date: Tue, 5 Jun 2018 08:27:44 -0600 Subject: [PATCH 1/5] Committing to switch branches --- src/components/MainGame/MainComponent.vue | 8 +- src/components/MainGame/PlayerInfoPanel.vue | 4 +- src/components/Modals/OpponentCardsModal.vue | 101 +++++++++++++++++++ 3 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 src/components/Modals/OpponentCardsModal.vue diff --git a/src/components/MainGame/MainComponent.vue b/src/components/MainGame/MainComponent.vue index 6932d292..478cf0aa 100755 --- a/src/components/MainGame/MainComponent.vue +++ b/src/components/MainGame/MainComponent.vue @@ -19,6 +19,8 @@ data-backdrop="static" data-keyboard="false"> + @@ -86,11 +88,13 @@ import Overclock from '../Modals/CardModals/OverclockModal' import AntiVirus from '../Modals/CardModals/AntiVirusModal' import Generator from '../Modals/CardModals/Generator' import Firewall from '../Modals/CardModals/Firewall' +import OpponentCards from '../Modals/OpponentCardsModal' import Card from '../../classes/Card' import Player from '../../classes/Player' import { bus } from '../SharedComponents/Bus'; +import OpponentCardsModal from "../Modals/OpponentCardsModal"; export default { name: 'main-component', @@ -116,6 +120,7 @@ export default { } }, components: { + OpponentCardsModal, HackDiscard, 'player-info-panel': PlayerInfoPanel, 'playfield': Playfield, @@ -135,7 +140,8 @@ export default { 'overclock-modal': Overclock, 'firewall-modal': Firewall, 'generator-modal': Generator, - 'anti-virus-modal': AntiVirus + 'anti-virus-modal': AntiVirus, + 'opponent-cards-modal': OpponentCards, }, methods: { diff --git a/src/components/MainGame/PlayerInfoPanel.vue b/src/components/MainGame/PlayerInfoPanel.vue index 80c0d7e6..af19dc37 100755 --- a/src/components/MainGame/PlayerInfoPanel.vue +++ b/src/components/MainGame/PlayerInfoPanel.vue @@ -174,7 +174,7 @@ export default { 'card': Card, 'modal': Modal, 'stats-panel': StatsPanel, - 'display-used-cards': DisplayUsedCards + 'display-used-cards': DisplayUsedCards, }, methods: { getScore(player){ @@ -192,7 +192,7 @@ export default { return{trueScore: trueSide, falseScore:falseSide} }, openModal() { - $('.hack').modal('show'); + $('.opponentCards').modal('show'); }, discardSelected() { if (this.$store.getters.getActiveCard !== undefined) { diff --git a/src/components/Modals/OpponentCardsModal.vue b/src/components/Modals/OpponentCardsModal.vue new file mode 100644 index 00000000..c36754b1 --- /dev/null +++ b/src/components/Modals/OpponentCardsModal.vue @@ -0,0 +1,101 @@ + + + + + From 7bc1fea028ca2f29c99461ce56fda60693a66596 Mon Sep 17 00:00:00 2001 From: JaceRiehl Date: Tue, 5 Jun 2018 12:58:16 -0600 Subject: [PATCH 2/5] Commiting random changes to merge master --- src/components/Modals/CardModals/HackModal.vue | 6 +++--- src/components/Modals/OpponentCardsModal.vue | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/Modals/CardModals/HackModal.vue b/src/components/Modals/CardModals/HackModal.vue index 2bbdd5a7..6a62c456 100644 --- a/src/components/Modals/CardModals/HackModal.vue +++ b/src/components/Modals/CardModals/HackModal.vue @@ -15,10 +15,10 @@
- + +
- - +
diff --git a/src/components/Modals/OpponentCardsModal.vue b/src/components/Modals/OpponentCardsModal.vue index c36754b1..c0a18f35 100644 --- a/src/components/Modals/OpponentCardsModal.vue +++ b/src/components/Modals/OpponentCardsModal.vue @@ -8,16 +8,17 @@

Opponent Stacks

-
-
    - +
    + -
    +
    -
    +
    +
    From 615ac1404b800690d894d0d038046d1cc1c628d0 Mon Sep 17 00:00:00 2001 From: JaceRiehl Date: Tue, 5 Jun 2018 14:07:02 -0600 Subject: [PATCH 3/5] During the Ai turns it now shows their attack and safety cards. Fixes #307 --- src/components/MainGame/MainComponent.vue | 7 +- src/components/MainGame/PlayerInfoPanel.vue | 2 +- .../Modals/CardModals/HackModal.vue | 2 +- src/components/Modals/OpponentCardsModal.vue | 102 ------------------ src/components/SharedComponents/Card.vue | 6 +- 5 files changed, 8 insertions(+), 111 deletions(-) delete mode 100644 src/components/Modals/OpponentCardsModal.vue diff --git a/src/components/MainGame/MainComponent.vue b/src/components/MainGame/MainComponent.vue index 478cf0aa..4b653fc4 100755 --- a/src/components/MainGame/MainComponent.vue +++ b/src/components/MainGame/MainComponent.vue @@ -19,8 +19,7 @@ data-backdrop="static" data-keyboard="false"> - + @@ -88,13 +87,11 @@ import Overclock from '../Modals/CardModals/OverclockModal' import AntiVirus from '../Modals/CardModals/AntiVirusModal' import Generator from '../Modals/CardModals/Generator' import Firewall from '../Modals/CardModals/Firewall' -import OpponentCards from '../Modals/OpponentCardsModal' import Card from '../../classes/Card' import Player from '../../classes/Player' import { bus } from '../SharedComponents/Bus'; -import OpponentCardsModal from "../Modals/OpponentCardsModal"; export default { name: 'main-component', @@ -120,7 +117,6 @@ export default { } }, components: { - OpponentCardsModal, HackDiscard, 'player-info-panel': PlayerInfoPanel, 'playfield': Playfield, @@ -141,7 +137,6 @@ export default { 'firewall-modal': Firewall, 'generator-modal': Generator, 'anti-virus-modal': AntiVirus, - 'opponent-cards-modal': OpponentCards, }, methods: { diff --git a/src/components/MainGame/PlayerInfoPanel.vue b/src/components/MainGame/PlayerInfoPanel.vue index ed48575b..dd2922fe 100755 --- a/src/components/MainGame/PlayerInfoPanel.vue +++ b/src/components/MainGame/PlayerInfoPanel.vue @@ -192,7 +192,7 @@ export default { return{trueScore: trueSide, falseScore:falseSide} }, openModal() { - $('.opponentCards').modal('show'); + $('.hack').modal('show'); }, discardSelected() { if (this.$store.getters.getActiveCard !== undefined) { diff --git a/src/components/Modals/CardModals/HackModal.vue b/src/components/Modals/CardModals/HackModal.vue index 6a62c456..fbb01c9d 100644 --- a/src/components/Modals/CardModals/HackModal.vue +++ b/src/components/Modals/CardModals/HackModal.vue @@ -15,7 +15,7 @@
    - +
diff --git a/src/components/Modals/OpponentCardsModal.vue b/src/components/Modals/OpponentCardsModal.vue deleted file mode 100644 index c0a18f35..00000000 --- a/src/components/Modals/OpponentCardsModal.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - - - diff --git a/src/components/SharedComponents/Card.vue b/src/components/SharedComponents/Card.vue index d6d56ead..05a5e951 100755 --- a/src/components/SharedComponents/Card.vue +++ b/src/components/SharedComponents/Card.vue @@ -1,6 +1,6 @@ @@ -99,6 +99,10 @@ export default { return ''; } } + }, + showCard(){ + return (this.isAi && this.cardData.type !== 'GENERATOR' && this.cardData.type !== 'FIREWALL' && this.cardData.type !== 'ANTIVIRUS' + && this.cardData.type !=='VIRUS' && this.cardData.type !=='H' && this.cardData.type !=='POWEROUTAGE'); } } } From ca0d8e1e121afedc4b5633bd3c07bbf438ba9cf2 Mon Sep 17 00:00:00 2001 From: JaceRiehl Date: Thu, 7 Jun 2018 12:18:32 -0600 Subject: [PATCH 4/5] Fixed changes for pull request --- src/classes/Card.js | 5 +++++ src/components/SharedComponents/Card.vue | 17 ++++++++++------- src/store/mutations.js | 7 +++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/classes/Card.js b/src/classes/Card.js index 315406ee..09442ecd 100755 --- a/src/classes/Card.js +++ b/src/classes/Card.js @@ -18,6 +18,11 @@ export default class Card { this.selected = false; this.id = id; this.cardImg = cardImg; + this.showFace = false; + } + + flipCardFace() { + this.showFace = !this.showFace; } } diff --git a/src/components/SharedComponents/Card.vue b/src/components/SharedComponents/Card.vue index 05a5e951..b28c28f6 100755 --- a/src/components/SharedComponents/Card.vue +++ b/src/components/SharedComponents/Card.vue @@ -1,6 +1,6 @@ @@ -15,7 +15,8 @@ export default { return { msg: 'Programming Wars', valueCss: 'value', - typeCss: 'type' + typeCss: 'type', + showFace: false } }, computed: { @@ -64,7 +65,11 @@ export default { }else{ return this.cardData.value } - } + }, + showCard() { + return !(this.isAi && this.cardData.showFace && (this.cardData.type === 'GENERATOR' || this.cardData.type === 'FIREWALL' || this.cardData.type === 'ANTIVIRUS' + || this.cardData.type ==='VIRUS' || this.cardData.type ==='POWEROUTAGE' || this.cardData.type ==='OVERCLOCK')); + }, }, methods: { cardClicked(e) { @@ -100,10 +105,8 @@ export default { } } }, - showCard(){ - return (this.isAi && this.cardData.type !== 'GENERATOR' && this.cardData.type !== 'FIREWALL' && this.cardData.type !== 'ANTIVIRUS' - && this.cardData.type !=='VIRUS' && this.cardData.type !=='H' && this.cardData.type !=='POWEROUTAGE'); - } + + } } diff --git a/src/store/mutations.js b/src/store/mutations.js index f1cda7ad..51ded747 100755 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -379,12 +379,14 @@ export default { }); } else { state.players[payload].hasVirus = true; + state.activeCard.flipCardFace(); state.players[payload].attackedCards.push(state.activeCard); } state.players[payload].hadVirus = true; }, givePowerOutage(state,payload) { state.players[payload].hasPowerOutage = true; + state.activeCard.flipCardFace(); state.players[payload].attackedCards.push(state.activeCard); }, @@ -400,11 +402,13 @@ export default { if(state.players[payload].hasVirus) { state.players[payload].hasVirus = false; + state.activeCard.flipCardFace(); state.players[payload].attackedCards = state.players[payload].attackedCards.filter(( obj ) => { return obj.type !== "VIRUS"; }); } else { state.players[payload].hasOverclock = true; + state.activeCard.flipCardFace(); state.players[payload].usedBonusCards.push(state.activeCard); state.players[payload].hasHadOverclock = true; } @@ -413,6 +417,7 @@ export default { giveFirewall(state, payload){ let bonus = 5; state.players[payload].hasFirewall = true; + state.activeCard.flipCardFace(); state.players[payload].usedBonusCards.push(state.activeCard); state.players[payload].updateBonus(bonus,bonus); state.players[payload].protectionCardsBonus += bonus; @@ -425,6 +430,7 @@ export default { let bonus = 5; state.players[payload].hasGenerator = true; state.players[payload].hasPowerOutage = false; + state.activeCard.flipCardFace(); state.players[payload].usedBonusCards.push(state.activeCard); state.players[payload].updateBonus(bonus,bonus); state.players[payload].protectionCardsBonus += bonus; @@ -436,6 +442,7 @@ export default { let bonus = 5; state.players[payload].hasAntiVirus = true; state.players[payload].numViruses = 0; + state.activeCard.flipCardFace(); state.players[payload].usedBonusCards.push(state.activeCard); state.players[payload].updateBonus(bonus,bonus); state.players[payload].protectionCardsBonus += bonus; From 83429e15639a67a2faeb6211208af809faefcdd0 Mon Sep 17 00:00:00 2001 From: JaceRiehl Date: Thu, 7 Jun 2018 12:51:04 -0600 Subject: [PATCH 5/5] Fixed the bug with it not showing the non Ai hands. --- src/components/SharedComponents/Card.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/SharedComponents/Card.vue b/src/components/SharedComponents/Card.vue index b28c28f6..28925750 100755 --- a/src/components/SharedComponents/Card.vue +++ b/src/components/SharedComponents/Card.vue @@ -67,8 +67,8 @@ export default { } }, showCard() { - return !(this.isAi && this.cardData.showFace && (this.cardData.type === 'GENERATOR' || this.cardData.type === 'FIREWALL' || this.cardData.type === 'ANTIVIRUS' - || this.cardData.type ==='VIRUS' || this.cardData.type ==='POWEROUTAGE' || this.cardData.type ==='OVERCLOCK')); + return (this.isAi && !this.cardData.showFace && (this.cardData.type !== 'GENERATOR' || this.cardData.type !== 'FIREWALL' || this.cardData.type !== 'ANTIVIRUS' + || this.cardData.type !=='VIRUS' || this.cardData.type !=='POWEROUTAGE' || this.cardData.type !=='OVERCLOCK')); }, }, methods: {