diff --git a/src/components/utils/cardfiles/Dr.Dolly.png b/src/assets/cardfiles/Dr.Dolly.png similarity index 100% rename from src/components/utils/cardfiles/Dr.Dolly.png rename to src/assets/cardfiles/Dr.Dolly.png diff --git a/src/components/utils/cardfiles/Dr.Dolly.webp b/src/assets/cardfiles/Dr.Dolly.webp similarity index 100% rename from src/components/utils/cardfiles/Dr.Dolly.webp rename to src/assets/cardfiles/Dr.Dolly.webp diff --git a/src/components/utils/cardfiles/HQ_Dolly.png b/src/assets/cardfiles/HQ_Dolly.png similarity index 100% rename from src/components/utils/cardfiles/HQ_Dolly.png rename to src/assets/cardfiles/HQ_Dolly.png diff --git a/src/components/utils/cardfiles/HQ_Dolly.webp b/src/assets/cardfiles/HQ_Dolly.webp similarity index 100% rename from src/components/utils/cardfiles/HQ_Dolly.webp rename to src/assets/cardfiles/HQ_Dolly.webp diff --git a/src/assets/cardfiles/armedSupplier.jpg b/src/assets/cardfiles/armedSupplier.jpg new file mode 100644 index 00000000..139ee8e1 Binary files /dev/null and b/src/assets/cardfiles/armedSupplier.jpg differ diff --git a/src/components/utils/cardfiles/assoultHorse.jpg b/src/assets/cardfiles/assoultHorse.jpg similarity index 100% rename from src/components/utils/cardfiles/assoultHorse.jpg rename to src/assets/cardfiles/assoultHorse.jpg diff --git a/src/components/utils/cardfiles/automatedBotProduction.jpg b/src/assets/cardfiles/automatedBotProduction.jpg similarity index 100% rename from src/components/utils/cardfiles/automatedBotProduction.jpg rename to src/assets/cardfiles/automatedBotProduction.jpg diff --git a/src/components/utils/cardfiles/bello.jpg b/src/assets/cardfiles/bello.jpg similarity index 100% rename from src/components/utils/cardfiles/bello.jpg rename to src/assets/cardfiles/bello.jpg diff --git a/src/components/utils/cardfiles/botCommandCenter.jpg b/src/assets/cardfiles/botCommandCenter.jpg similarity index 100% rename from src/components/utils/cardfiles/botCommandCenter.jpg rename to src/assets/cardfiles/botCommandCenter.jpg diff --git a/src/assets/cardfiles/caroline.jpg b/src/assets/cardfiles/caroline.jpg new file mode 100644 index 00000000..a18b0fba Binary files /dev/null and b/src/assets/cardfiles/caroline.jpg differ diff --git a/src/assets/cardfiles/church.jpg b/src/assets/cardfiles/church.jpg new file mode 100644 index 00000000..39a84cfa Binary files /dev/null and b/src/assets/cardfiles/church.jpg differ diff --git a/src/components/utils/cardfiles/communityCard.jpg b/src/assets/cardfiles/communityCard.jpg similarity index 100% rename from src/components/utils/cardfiles/communityCard.jpg rename to src/assets/cardfiles/communityCard.jpg diff --git a/src/components/utils/cardfiles/daisy.jpg b/src/assets/cardfiles/daisy.jpg similarity index 100% rename from src/components/utils/cardfiles/daisy.jpg rename to src/assets/cardfiles/daisy.jpg diff --git a/src/components/utils/cardfiles/drDollyCard.jpg b/src/assets/cardfiles/drDollyCard.jpg similarity index 100% rename from src/components/utils/cardfiles/drDollyCard.jpg rename to src/assets/cardfiles/drDollyCard.jpg diff --git a/src/components/utils/cardfiles/evie.jpg b/src/assets/cardfiles/evie.jpg similarity index 100% rename from src/components/utils/cardfiles/evie.jpg rename to src/assets/cardfiles/evie.jpg diff --git a/src/components/utils/cardfiles/exoskeleton.jpg b/src/assets/cardfiles/exoskeleton.jpg similarity index 100% rename from src/components/utils/cardfiles/exoskeleton.jpg rename to src/assets/cardfiles/exoskeleton.jpg diff --git a/src/components/utils/cardfiles/furiousJack.jpg b/src/assets/cardfiles/furiousJack.jpg similarity index 100% rename from src/components/utils/cardfiles/furiousJack.jpg rename to src/assets/cardfiles/furiousJack.jpg diff --git a/src/assets/cardfiles/healingpriest.jpg b/src/assets/cardfiles/healingpriest.jpg new file mode 100644 index 00000000..22a6d859 Binary files /dev/null and b/src/assets/cardfiles/healingpriest.jpg differ diff --git a/src/components/utils/cardfiles/hurrwig.jpg b/src/assets/cardfiles/hurrwig.jpg similarity index 100% rename from src/components/utils/cardfiles/hurrwig.jpg rename to src/assets/cardfiles/hurrwig.jpg diff --git a/src/components/utils/cardfiles/miniLab.jpg b/src/assets/cardfiles/miniLab.jpg similarity index 100% rename from src/components/utils/cardfiles/miniLab.jpg rename to src/assets/cardfiles/miniLab.jpg diff --git a/src/components/utils/cardfiles/richard.jpg b/src/assets/cardfiles/richard.jpg similarity index 100% rename from src/components/utils/cardfiles/richard.jpg rename to src/assets/cardfiles/richard.jpg diff --git a/src/components/utils/cardfiles/sampleGradient.jpg b/src/assets/cardfiles/sampleGradient.jpg similarity index 100% rename from src/components/utils/cardfiles/sampleGradient.jpg rename to src/assets/cardfiles/sampleGradient.jpg diff --git a/src/components/utils/cardfiles/sampleGradient.jpg.kra b/src/assets/cardfiles/sampleGradient.jpg.kra similarity index 100% rename from src/components/utils/cardfiles/sampleGradient.jpg.kra rename to src/assets/cardfiles/sampleGradient.jpg.kra diff --git a/src/components/utils/cardfiles/sampleGradient.svg b/src/assets/cardfiles/sampleGradient.svg similarity index 100% rename from src/components/utils/cardfiles/sampleGradient.svg rename to src/assets/cardfiles/sampleGradient.svg diff --git a/src/components/utils/cardfiles/steam.jpg b/src/assets/cardfiles/steam.jpg similarity index 100% rename from src/components/utils/cardfiles/steam.jpg rename to src/assets/cardfiles/steam.jpg diff --git a/src/components/utils/cardfiles/timeDeviceCard.jpg b/src/assets/cardfiles/timeDeviceCard.jpg similarity index 100% rename from src/components/utils/cardfiles/timeDeviceCard.jpg rename to src/assets/cardfiles/timeDeviceCard.jpg diff --git a/src/components/utils/cardfiles/ulrich.jpg b/src/assets/cardfiles/ulrich.jpg similarity index 100% rename from src/components/utils/cardfiles/ulrich.jpg rename to src/assets/cardfiles/ulrich.jpg diff --git a/src/assets/cardfiles/wildAlliance.jpg b/src/assets/cardfiles/wildAlliance.jpg new file mode 100644 index 00000000..91d5027a Binary files /dev/null and b/src/assets/cardfiles/wildAlliance.jpg differ diff --git a/src/components/utils/cardfiles/wynn.jpg b/src/assets/cardfiles/wynn.jpg similarity index 100% rename from src/components/utils/cardfiles/wynn.jpg rename to src/assets/cardfiles/wynn.jpg diff --git a/src/components/elements/CardComponent.vue b/src/components/elements/CardComponent.vue index 1a03a3a9..fc12084d 100644 --- a/src/components/elements/CardComponent.vue +++ b/src/components/elements/CardComponent.vue @@ -23109,13 +23109,14 @@ import * as R from 'ramda' //import * as svg1 from 'save-svg-as-png' import { icon } from '@/components/utils/utils.js' import { emptyCard } from '../utils/utils' +import { Card } from "@/model/Card"; export default { name: 'CardComponent', props: { model: { - type: Object, - default: emptyCard + type: Card, + default: new Card() }, imageURL: { type: String, diff --git a/src/components/utils/sampleCards.js b/src/components/utils/sampleCards.js index 15944114..50d8bc69 100644 --- a/src/components/utils/sampleCards.js +++ b/src/components/utils/sampleCards.js @@ -1,28 +1,34 @@ -import * as R from "ramda" -import { emptyCard } from "@/components/utils/utils.js" -import daisyImg from "./cardfiles/daisy.jpg" -import richardImg from "./cardfiles/richard.jpg" -import hurrwigImg from './cardfiles/hurrwig.jpg' -import assoultHorseImg from './cardfiles/assoultHorse.jpg' -import ulrichImg from './cardfiles/ulrich.jpg' -import steamImg from './cardfiles/steam.jpg' -import automatedBotProductionImg from './cardfiles/automatedBotProduction.jpg' -import wynnImg from './cardfiles/wynn.jpg' -import furiousJackImg from './cardfiles/furiousJack.jpg' -import miniLabImg from './cardfiles/miniLab.jpg' -import evieImg from './cardfiles/evie.jpg' -import exoskeletonImg from './cardfiles/exoskeleton.jpg' -import communityCardImg from './cardfiles/communityCard.jpg' -import botCommandCenterImg from './cardfiles/botCommandCenter.jpg' -import drDollyImg from './cardfiles/drDollyCard.jpg' -import belloImg from './cardfiles/bello.jpg' -import timeDeviceImg from './cardfiles/timeDeviceCard.jpg' -import sampleGradient from './cardfiles/sampleGradient.jpg' +import healingPriestImg from "@/assets/cardfiles/healingpriest.jpg" +import churchImg from "@/assets/cardfiles/church.jpg" +import armedSupplierImg from "@/assets/cardfiles/armedSupplier.jpg" +import wildAllianceImg from "@/assets/cardfiles/wildAlliance.jpg" +import daisyImg from "@/assets/cardfiles/daisy.jpg" +import richardImg from "@/assets/cardfiles/richard.jpg" +import hurrwigImg from '@/assets/cardfiles/hurrwig.jpg' +import assoultHorseImg from '@/assets/cardfiles/assoultHorse.jpg' +import ulrichImg from '@/assets/cardfiles/ulrich.jpg' +import steamImg from '@/assets/cardfiles/steam.jpg' +import automatedBotProductionImg from '@/assets/cardfiles/automatedBotProduction.jpg' +import wynnImg from '@/assets/cardfiles/wynn.jpg' +import furiousJackImg from '@/assets/cardfiles/furiousJack.jpg' +import miniLabImg from '@/assets/cardfiles/miniLab.jpg' +import evieImg from '@/assets/cardfiles/evie.jpg' +import exoskeletonImg from '@/assets/cardfiles/exoskeleton.jpg' +import communityCardImg from '@/assets/cardfiles/communityCard.jpg' +import botCommandCenterImg from '@/assets/cardfiles/botCommandCenter.jpg' +import drDollyImg from '@/assets/cardfiles/drDollyCard.jpg' +import belloImg from '@/assets/cardfiles/bello.jpg' +import timeDeviceImg from '@/assets/cardfiles/timeDeviceCard.jpg' +import sampleGradient from '@/assets/cardfiles/sampleGradient.jpg' import { Card, CardClass } from "@/model/Card"; export const sampleGradientImg = sampleGradient export const cardJpgs = { + churchImg: churchImg, + armedSupplierImg: armedSupplierImg, + wildAllianceImg: wildAllianceImg, + healingPriestImg: healingPriestImg, daisyImg: daisyImg, richardImg: richardImg, hurrwigImg: hurrwigImg, @@ -45,24 +51,60 @@ export const cardJpgs = { export const sampleCard = Card.from({ CardName: 'Sample Card', FlavourText: 'Whenever you play CrowdControl your happiness increases by 1.', - abilities: [], - Notes: '', artist: " ", owner: " ", type: 'Entity', Tags: ['TECHNOCRAT','HUMAN'], tagDummy: 'TECHNOCRAT', - Class: { - Nature: false, - Culture: true, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 8, Health: 5, Attack: 3 }) + +export const churchCard = Card.from({ + CardName: 'Church', + RulesTexts: ["OnSpawn: Spawn 2 1/1 recruit", "Pay 1: Strengthen TARGET 1."], + type: 'Headquarter', + Tags: ['BUILDING'], + tagDummy: 'TECHNOCRAT', + Class: CardClass.culture(), + Delay: 1, + Health: 21 +}) + +export const armedSupplierCard = Card.from({ + CardName: 'Armed Supplier', + RulesTexts: ["OnConstruction: Produce 1."], + type: 'Entity', + Tags: ['HUMAN', 'TECHNOCRAT'], + tagDummy: 'TECHNOCRAT', + Class: CardClass.technology(), + CastingCost: 3, + Attack: 2, + Health: 4 +}) +export const healingPriestCard = Card.from({ + CardName: 'Healing Priest', + RulesTexts: ['OnSpawn: Heal TARGET'], + type: 'Entity', + Tags: ['HUMAN'], + tagDummy: 'TECHNOCRAT', + Class: CardClass.mysticism(), + CastingCost: 3, + Attack: 2, + Health: 3 +}) +export const wildAllianceCard = Card.from({ + CardName: 'Wild Alliance', + RulesTexts: ['Anthem ANIMAL.', 'Count Forces 3.', 'Spawn X 3/3 beast'], + type: 'Action', + Tags: ['ANIMAL', 'EVENT'], + tagDummy: 'TECHNOCRAT', + Class: CardClass.nature(), + CastingCost: 8 +}) + export const daisyData = Card.from({ CardName: 'Saint Daisy, Triplet', FlavourText: 'ETB - Create a 1/1 pet for each human you control', @@ -116,7 +158,7 @@ export const hurrwigData = Card.from({ Health: 5, Attack: 3 }) -export const assoultHorseData = R.merge(emptyCard, { +export const assoultHorseData = Card.from({ CardName: 'Assoult Horse', FlavourText: 'Charge!', type: 'Entity', @@ -127,295 +169,166 @@ export const assoultHorseData = R.merge(emptyCard, { Health: 3, Attack: 2 }) -export const ulrichData = R.merge(emptyCard, { +export const ulrichData = Card.from({ CardName: 'Ulrich, the Tinker', FlavourText: 'Whenever an Entity with the tag \'Bot\' is destroyed, draw a card.', - abilities: [], - Notes: '', type: 'Entity', Tags: ['TECHNOCRAT'], tagDummy: 'TECHNOCRAT', - Class: { - Nature: false, - Culture: true, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 3, Health: 7, Attack: 3 }) -export const steamData = R.merge(emptyCard, { +export const steamData = Card.from({ CardName: 'Steam Processor', FlavourText: 'Production: 6 \\nPay 6: gain 10 Wisdom.', - abilities: [], - Notes: '', type: 'Place', Tags: ['TECHNOCRAT'], tagDummy: 'TECHNOCRAT', - Class: { - Nature: false, - Culture: false, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 8, Health: 5, Attack: 3 }) -export const AutomatedBotProductionData = R.merge(emptyCard, { +export const AutomatedBotProductionData = Card.from({ CardName: 'Automated Bot Production', FlavourText: 'Periodic - Create a 1/1 Bot token.', - abilities: [], - Notes: '', type: 'Place', Tags: ['TECHNOCRAT'], tagDummy: 'TECHNOCRAT', - Class: { - Nature: false, - Culture: false, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 4, Health: 4, Attack: 3 }) -export const AutomatedBotProductionBotData = R.merge(emptyCard, { +export const AutomatedBotProductionBotData = Card.from({ CardName: 'Automated Bot Production', FlavourText: 'BOT', - abilities: [], - Notes: '', type: 'Entity', Tags: ['TECHNOCRAT'], tagDummy: 'TECHNOCRAT', - Class: { - Nature: false, - Culture: false, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 4, Health: 1, Attack: 1 }) -export const wynnData = R.merge(emptyCard, { +export const wynnData = Card.from({ CardName: 'Wynn, the Brainless Baby', FlavourText: 'Periodic - If Dr. Dolly is on your field. gain 5 Wisdom and +1/+1', - abilities: [], - Notes: '', type: 'Entity', Tags: ['HUMAN'], - tagDummy: '', - Class: { - Nature: false, - Culture: true, - Technology: false, - Mysticism: false, - - }, + Class: CardClass.culture(), CastingCost: 3, Health: 1, Attack: 1 }) -export const furiousJackData = R.merge(emptyCard, { +export const furiousJackData = Card.from({ CardName: 'Furious Jack', FlavourText: 'ETB - Deal 2 damage to target entity.', - abilities: [], - Notes: '', type: 'Entity', Tags: ['HUMAN'], tagDummy: 'HUMAN', - Class: { - Nature: false, - Culture: true, - Technology: false, - Mysticism: false, - - }, + Class: CardClass.culture(), CastingCost: 4, Health: 1, Attack: 2 }) -export const miniLabData = R.merge(emptyCard, { +export const miniLabData = Card.from({ CardName: 'Dr. Dolly\'s Mini Lab', FlavourText: 'Hand size 5. Additionally, start with Dr. Dolly in your hand. Produce Wisdom 10. Pay 3 Mana: Get 10 Wisdom. Whenever Dr. Dolly dies, move him back to your hand.', - abilities: [], - Notes: '', type: 'HQ', Tags: ['HUMAN'], tagDummy: 'HUMAN', - Class: { - Nature: true, - Culture: true, - Technology: false, - Mysticism: true, - - }, + Class: CardClass.mysticism(), CastingCost: 4, Health: 18, Attack: 2 }) -export const blasturnData = R.merge(emptyCard, { +export const blasturnData = Card.from({ CardName: 'Blasturn, the capital', FlavourText: 'Sacrifice a place: draw a card.', - abilities: [], - Notes: '', type: 'HQ', Tags: ['HUMAN','TECHNOCRAT'], tagDummy: 'HUMAN', - Class: { - Nature: false, - Culture: true, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 4, Health: 20, Attack: 2 }) -export const evieData = R.merge(emptyCard, { +export const evieData = Card.from({ CardName: 'Evie, Damsel in Distress', FlavourText: 'On materialization - Manipulate target entity on the field by +2 or -2 Attack.', - abilities: [], - Notes: '', type: 'Entity', Tags: ['HUMAN'], tagDummy: 'HUMAN', - Class: { - Nature: false, - Culture: true, - Technology: false, - Mysticism: false, - - }, + Class: CardClass.culture(), CastingCost: 1, Health: 2, Attack: 1 }) -export const exoskeletonData = R.merge(emptyCard, { +export const exoskeletonData = Card.from({ CardName: 'Provide Exoskeleton', FlavourText: 'Target entity gets +3 HP and gets the ability: Regeneration (whenever this Entity recieves damage, gain the same costAmount of health back.', - abilities: [], - Notes: '', type: 'Action', Tags: ['',null], - tagDummy: '', - Class: { - Nature: false, - Culture: false, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 6, Health: 2, Attack: 1 }) -export const communityCardData = R.merge(emptyCard, { +export const communityCardData = Card.from({ CardName: 'Crowd Created Content', FlavourText: 'Big corporations hate this trick! \n You will be surprised when you see what happens in a community creating their own content!', RulesTexts: ['Big corporations hate this trick! \n You will be surprised when you see what happens in a community creating their own content!'], - Keywords: [], - abilities: [], - Notes: '', type: 'HQ', Tags: ['Community','Awesome'], tagDummy: 'HUMAN', - Class: { - Nature: false, - Culture: true, - Technology: false, - Mysticism: false, - - }, + Class: CardClass.culture(), CastingCost: -1, Health: 1, Attack: 1 }) -export const botCommandCenterData = R.merge(emptyCard, { +export const botCommandCenterData = Card.from({ CardName: 'Bot Command Center', - FlavourText: '', - abilities: [], RulesTexts: ['OnSpawn: Anthem BOT. \\n Pay 2: Anthem BOT.'], - Keywords: [], - Notes: '', type: 'Place', Tags: ['Technocrat'], - tagDummy: '', - Class: { - Nature: false, - Culture: false, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 4, Health: 3, Attack: 1 }) -export const drDollyData = R.merge(emptyCard, { +export const drDollyData = Card.from({ CardName: 'Dr. Dolly', FlavourText: 'Whenever another entity dies, gain 1 Mana.', - abilities: [], RulesTexts: ['Avenge: Produce 1'], - Keywords: [], - Notes: '', type: 'Entity', Tags: ['HUMAN'], - tagDummy: '', - Class: { - Nature: false, - Culture: true, - Technology: false, - Mysticism: true, - - }, + Class: CardClass.mysticism(), CastingCost: 5, Health: 4, Attack: 1 }) -export const belloData = R.merge(emptyCard, { +export const belloData = Card.from({ CardName: 'Bello, man\'s best friend', FlavourText: 'Periodic - If you control a Human, gain 5 Wisdom. \n If it´s Dr. Dolly instead gain 10 Wisdom.', RulesTexts: ['Periodic: Count Human. Insight X'], - Keywords: [], - abilities: [], - Notes: '', type: 'Entity', Tags: ['Animal'], - tagDummy: '', - Class: { - Nature: true, - Culture: true, - Technology: false, - Mysticism: false, - }, + Class: CardClass.culture(), CastingCost: 3, Health: 2, Attack: 2 }) -export const timeDeviceData = R.merge(emptyCard, { +export const timeDeviceData = Card.from({ CardName: 'Time Manipulation Device', FlavourText: 'Periodic - Insight 3 \\n Pay 4: Bounce', - abilities: [], RulesTexts: ['Periodic: Insight 3 \\n Pay 4: Bounce TARGET'], - Notes: '', type: 'Place', Tags: ['TECHNOCRAT'], tagDummy: 'TECHNOCRAT', - Class: { - Nature: false, - Culture: false, - Technology: true, - Mysticism: false, - - }, + Class: CardClass.technology(), CastingCost: 8, Health: 5, Attack: 3 diff --git a/src/model/Card.js b/src/model/Card.js index 0a2574db..cbe0cc87 100644 --- a/src/model/Card.js +++ b/src/model/Card.js @@ -79,7 +79,7 @@ class Card { this.Keywords = []; } static from(json) { - return Object.assign(new ChainCard(), json); + return Object.assign(new Card(), json); } } exports.Card = Card; diff --git a/src/model/Card.ts b/src/model/Card.ts index 00d810a2..9e92ab8b 100644 --- a/src/model/Card.ts +++ b/src/model/Card.ts @@ -96,7 +96,7 @@ export class Card { Keywords: Array> = []; static from(json) { - return Object.assign(new ChainCard(), json); + return Object.assign(new Card(), json); } } diff --git a/src/views/AboutPage.vue b/src/views/AboutPage.vue index b035e06f..23a1ab40 100644 --- a/src/views/AboutPage.vue +++ b/src/views/AboutPage.vue @@ -42,8 +42,8 @@
@@ -96,8 +96,8 @@
@@ -105,8 +105,8 @@
@@ -158,8 +158,8 @@
@@ -181,7 +181,11 @@ import CardComponent from "@/components/elements/CardComponent"; import { cardJpgs, - communityCardData, botCommandCenterData, belloData, timeDeviceData, drDollyData + churchCard, + armedSupplierCard, + wildAllianceCard, + healingPriestCard, + communityCardData } from "../components/utils/sampleCards.js"; export default { @@ -190,7 +194,11 @@ export default { data() { return { cardJpgs:cardJpgs, - communityCardData:communityCardData , botCommandCenterData:botCommandCenterData, belloData:belloData, timeDeviceData:timeDeviceData, drDollyData:drDollyData + churchCard:churchCard, + armedSupplierCard:armedSupplierCard, + healingPriestCard:healingPriestCard, + wildAllianceCard:wildAllianceCard, + communityCardData:communityCardData }; }, mounted() {}, diff --git a/src/views/HowToPlayPage.vue b/src/views/HowToPlayPage.vue index cfcf27d5..13de2a1e 100644 --- a/src/views/HowToPlayPage.vue +++ b/src/views/HowToPlayPage.vue @@ -38,14 +38,14 @@ @@ -72,14 +72,14 @@ @@ -380,14 +380,14 @@ @@ -434,14 +434,14 @@ @@ -464,14 +464,14 @@ @@ -494,14 +494,14 @@ @@ -524,14 +524,14 @@ @@ -554,14 +554,14 @@