diff --git a/package-lock.json b/package-lock.json index 62879f0..076e3be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,232 @@ { "name": "west", "version": "0.0.1", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "west", + "version": "0.0.1", + "dependencies": { + "http-server": "^0.12.3" + } + }, + "node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/basic-auth": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz", + "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/corser": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz", + "integrity": "sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/ecstatic": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz", + "integrity": "sha512-fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog==", + "deprecated": "This package is unmaintained and deprecated. See the GH Issue 259.", + "dependencies": { + "he": "^1.1.1", + "mime": "^1.6.0", + "minimist": "^1.1.0", + "url-join": "^2.0.5" + }, + "bin": { + "ecstatic": "lib/ecstatic.js" + } + }, + "node_modules/eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" + }, + "node_modules/follow-redirects": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", + "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "bin": { + "he": "bin/he" + } + }, + "node_modules/http-proxy": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "dependencies": { + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/http-server": { + "version": "0.12.3", + "resolved": "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz", + "integrity": "sha512-be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA==", + "dependencies": { + "basic-auth": "^1.0.3", + "colors": "^1.4.0", + "corser": "^2.0.1", + "ecstatic": "^3.3.2", + "http-proxy": "^1.18.0", + "minimist": "^1.2.5", + "opener": "^1.5.1", + "portfinder": "^1.0.25", + "secure-compare": "3.0.1", + "union": "~0.5.0" + }, + "bin": { + "hs": "bin/http-server", + "http-server": "bin/http-server" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "node_modules/mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/opener": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", + "bin": { + "opener": "bin/opener-bin.js" + } + }, + "node_modules/portfinder": { + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", + "dependencies": { + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" + }, + "engines": { + "node": ">= 0.12.0" + } + }, + "node_modules/qs": { + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==", + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + }, + "node_modules/secure-compare": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz", + "integrity": "sha1-8aAymzCLIh+uN7mXTz1XjQypmeM=" + }, + "node_modules/union": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz", + "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==", + "dependencies": { + "qs": "^6.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/url-join": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz", + "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=" + } + }, "dependencies": { "async": { "version": "2.6.3", diff --git a/src/TaskQueue.js b/src/TaskQueue.js index f3a9c6a..c55ddd3 100644 --- a/src/TaskQueue.js +++ b/src/TaskQueue.js @@ -1,12 +1,12 @@ -const TaskQueue = function() { - function TaskQueue() { +export default class TaskQueue { + constructor() { this.tasks = []; this.running = false; } - TaskQueue.prototype.push = function(run, dispose, duration) { + push(run, dispose, duration) { if (duration === undefined || duration === null) { - this.tasks.push({runAndContinue: run, dispose}); + this.tasks.push({ runAndContinue: run, dispose }); } else { this.tasks.push({ runAndContinue: (continuation) => { @@ -18,38 +18,33 @@ const TaskQueue = function() { dispose }); } - runNextTask(this); - }; + this.#runNextTask(); + } - TaskQueue.prototype.continueWith = function(action) { + continueWith(action) { this.push(action, null, 0); - }; + } - function runNextTask(taskQueue) { - if (taskQueue.running || taskQueue.tasks.length === 0) { + #runNextTask() { + if (this.running || this.tasks.length === 0) { return; } - taskQueue.running = true; - const task = taskQueue.tasks.shift(); + this.running = true; + const task = this.tasks.shift(); if (task.runAndContinue) { setTimeout(() => { task.runAndContinue(() => { task.dispose && task.dispose(); - taskQueue.running = false; + this.running = false; setTimeout(() => { - runNextTask(taskQueue); + this.#runNextTask(); }); }); }, 0); - } - else { - runNextTask(taskQueue); + } else { + this.#runNextTask(); } } - - return TaskQueue; -}(); - -export default TaskQueue; +} diff --git a/src/index.js b/src/index.js index a01f912..971214e 100644 --- a/src/index.js +++ b/src/index.js @@ -3,17 +3,14 @@ import Game from './Game.js'; import TaskQueue from './TaskQueue.js'; import SpeedRate from './SpeedRate.js'; -// Отвечает является ли карта уткой. function isDuck(card) { return card && card.quacks && card.swims; } -// Отвечает является ли карта собакой. function isDog(card) { return card instanceof Dog; } -// Дает описание существа по схожести с утками и собаками function getCreatureDescription(card) { if (isDuck(card) && isDog(card)) { return 'Утка-Собака'; @@ -27,40 +24,246 @@ function getCreatureDescription(card) { return 'Существо'; } +class Creature extends Card { + constructor(name, maxPower) { + super(name, maxPower); + } + get currentPower() { + return this._currentPower; + } -// Основа для утки. -function Duck() { - this.quacks = function () { console.log('quack') }; - this.swims = function () { console.log('float: both;') }; + set currentPower(value) { + this._currentPower = Math.min(Math.max(value, 0), this.maxPower); + } + + getDescriptions() { + return [getCreatureDescription(this), ...super.getDescriptions()]; + } } +class Duck extends Creature { + constructor(name = 'Мирная утка', maxPower = 2) { + super(name, maxPower); + } + + quacks() { + console.log('quack') + } -// Основа для собаки. -function Dog() { + swims() { + console.log('float: both;') + } } +class Dog extends Creature { + constructor(name = 'Пес-бандит', maxPower = 3) { + super(name, maxPower); + } +} -// Колода Шерифа, нижнего игрока. -const seriffStartDeck = [ - new Card('Мирный житель', 2), - new Card('Мирный житель', 2), - new Card('Мирный житель', 2), -]; +class Trasher extends Dog { + constructor() { + super('Громила', 5); + } + + modifyTakenDamage(value, fromCard, gameContext, continuation) { + const bonus = 1; + if (value > bonus) { + this.view.signalAbility(() => super.modifyTakenDamage(value - bonus, fromCard, gameContext, continuation)); + } else { + this.view.signalAbility(continuation); + } + } + + getDescriptions() { + const isTrasher = Trasher.prototype.hasOwnProperty('modifyTakenDamage'); + return isTrasher ? ['Получает на 1 меньше урона', ...super.getDescriptions()] : super.getDescriptions(); + } +} + +class Gatling extends Creature { + constructor(name = 'Гатлинг', maxPower = 6) { + super(name, maxPower); + } + + attack(gameContext, continuation) { + const taskQueue = new TaskQueue(); + const oppositePlayer = gameContext.oppositePlayer; + const oppositeTable = oppositePlayer.table + + oppositeTable.forEach(oppositeCard => { + if (oppositeCard) { + taskQueue.push(onDone => { + this.view.showAttack(() => this.dealDamageToCreature(2, oppositeCard, gameContext, onDone)); + }); + } + }); + + taskQueue.continueWith(continuation); + } +} + +class Lad extends Dog { + static #inGameCount = 0; + + constructor() { + super('Браток', 2); + } + + static get inGameCount() { + return this.#inGameCount; + } + + static getBonus() { + return 0.5 * this.#inGameCount * (this.#inGameCount + 1); + } + + doAfterComingIntoPlay(gameContext, continuation) { + Lad.#inGameCount += 1; + super.doAfterComingIntoPlay(gameContext, continuation); + } + + doBeforeRemoving(continuation) { + Lad.#inGameCount -= 1; + super.doBeforeRemoving(continuation); + } + + modifyDealedDamageToCreature(value, toCard, gameContext, continuation) { + this.view.signalAbility(() => super.modifyDealedDamageToCreature(value + Lad.getBonus(), toCard, gameContext, continuation)); + } -// Колода Бандита, верхнего игрока. + modifyTakenDamage(value, fromCard, gameContext, continuation) { + const bonus = Lad.getBonus(); + if (value >= bonus) { + this.view.signalAbility(() => super.modifyTakenDamage(value - bonus, fromCard, gameContext, continuation)); + } else { + this.view.signalAbility(continuation); + } + } + + getDescriptions() { + const requiredAbilities = ['modifyDealedDamageToCreature', 'modifyDealedDamageToPlayer'] + const isLad = requiredAbilities.some(ability => Lad.prototype.hasOwnProperty(ability)); + return isLad + ? ['Чем их больше, тем они сильнее', ...super.getDescriptions()] + : super.getDescriptions(); + } +} + +class Rogue extends Creature { + constructor(name = 'Изгой', maxPower = 2) { + super(name, maxPower); + } + + doBeforeAttack(gameContext, continuation) { + const taskQueue = new TaskQueue(); + const targetAbilities = ['modifyDealedDamageToCreature', 'modifyDealedDamageToPlayer', 'modifyTakenDamage']; + + const position = gameContext.position; + const oppositePlayer = gameContext.oppositePlayer; + const oppositeCard = oppositePlayer.table[position]; + + if (oppositeCard) { + taskQueue.push(onDone => { + const oppositeCardPrototype = Object.getPrototypeOf(oppositeCard); + targetAbilities.forEach(ability => { + if (oppositeCardPrototype.hasOwnProperty(ability)) { + this[ability] = oppositeCardPrototype[ability]; + delete oppositeCardPrototype[ability] + } + }); + this.view.signalAbility(onDone); + gameContext.updateView(); + }); + } + + taskQueue.continueWith(continuation); + } +} + +class Brewer extends Duck { + constructor() { + super('Пивовар', 2); + } + + doBeforeAttack(gameContext, continuation) { + const taskQueue = new TaskQueue(); + + const currentPlayer = gameContext.currentPlayer; + const oppositePlayer = gameContext.oppositePlayer; + const allCards = currentPlayer.table.concat(oppositePlayer.table); + + allCards.filter(isDuck).forEach(duck => { + taskQueue.push(onDone => { + duck.maxPower += 1; + duck.currentPower += 2; + duck.view.signalHeal(onDone); + duck.updateView(); + }); + }); + + taskQueue.continueWith(continuation); + } +} + +class PseudoDuck extends Dog { + constructor() { + super('Псевдоутка', 3); + } + + quacks() { + } + + swims() { + } +} + +class Nemo extends Creature { + constructor(name = 'Немо', maxPower = 4) { + super(name, maxPower); + } + + doBeforeAttack(gameContext, continuation) { + const taskQueue = new TaskQueue(); + + const position = gameContext.position; + const oppositePlayer = gameContext.oppositePlayer; + const oppositeCard = oppositePlayer.table[position]; + + if (oppositeCard) { + taskQueue.push(onDone => { + const oppositeCardPrototype = Object.getPrototypeOf(oppositeCard); + Object.setPrototypeOf(this, oppositeCardPrototype); + Object.setPrototypeOf(oppositeCard, Creature.prototype); + this.view.signalAbility(() => this.doBeforeAttack(gameContext, onDone)); + gameContext.updateView(); + }); + } + + taskQueue.continueWith(continuation); + } +} + +const sheriffStartDeck = [ + new Duck(), + new Gatling(), + new Nemo(), + new Rogue(), + new Nemo(), +]; const banditStartDeck = [ - new Card('Бандит', 3), + new Brewer(), + new Lad(), + new Nemo(), + new Lad(), + new PseudoDuck(), ]; +const game = new Game(sheriffStartDeck, banditStartDeck); -// Создание игры. -const game = new Game(seriffStartDeck, banditStartDeck); - -// Глобальный объект, позволяющий управлять скоростью всех анимаций. SpeedRate.set(1); -// Запуск игры. game.play(false, (winner) => { alert('Победил ' + winner.name); }); diff --git a/src/styles.css b/src/styles.css index 5715729..f0576ef 100644 --- a/src/styles.css +++ b/src/styles.css @@ -212,10 +212,6 @@ body { opacity: 0.0; } -.cardSignal { - transform: rotateY(180deg); -} - .cardSignal.damage, .playerSignal.damage { background: darkred;