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/Card.js b/src/Card.js index 9a059b5..ec8e25b 100644 --- a/src/Card.js +++ b/src/Card.js @@ -109,6 +109,7 @@ const Card = function () { taskQueue.continueWith(continuation); }; + // Изменяет урон, наносимый картой при атаке карт противника. // Можно переопределить в наследниках. // Позволяет определять способности, которые меняют наносимый урон при атаке карт противника. diff --git a/src/TaskQueue.js b/src/TaskQueue.js index f3a9c6a..5004215 100644 --- a/src/TaskQueue.js +++ b/src/TaskQueue.js @@ -1,10 +1,33 @@ -const TaskQueue = function() { - function TaskQueue() { +function runNextTask(taskQueue) { + if (taskQueue.running || taskQueue.tasks.length === 0) { + return; + } + taskQueue.running = true; + const task = taskQueue.tasks.shift(); + + if (task.runAndContinue) { + setTimeout(() => { + task.runAndContinue(() => { + task.dispose && task.dispose(); + taskQueue.running = false; + + setTimeout(() => { + runNextTask(taskQueue); + }); + }); + }, 0); + } else { + runNextTask(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}); } else { @@ -19,37 +42,9 @@ const TaskQueue = function() { }); } runNextTask(this); - }; + } - TaskQueue.prototype.continueWith = function(action) { + continueWith(action) { this.push(action, null, 0); - }; - - function runNextTask(taskQueue) { - if (taskQueue.running || taskQueue.tasks.length === 0) { - return; - } - taskQueue.running = true; - const task = taskQueue.tasks.shift(); - - if (task.runAndContinue) { - setTimeout(() => { - task.runAndContinue(() => { - task.dispose && task.dispose(); - taskQueue.running = false; - - setTimeout(() => { - runNextTask(taskQueue); - }); - }); - }, 0); - } - else { - runNextTask(taskQueue); - } } - - return TaskQueue; -}(); - -export default TaskQueue; +} \ No newline at end of file diff --git a/src/images/brewer.jpg b/src/images/brewer.jpg new file mode 100644 index 0000000..b40b72a Binary files /dev/null and b/src/images/brewer.jpg differ diff --git a/src/images/doggo.jpg b/src/images/doggo.jpg new file mode 100644 index 0000000..8cfc55a Binary files /dev/null and b/src/images/doggo.jpg differ diff --git a/src/images/duck.jpg b/src/images/duck.jpg new file mode 100644 index 0000000..0f56ea6 Binary files /dev/null and b/src/images/duck.jpg differ diff --git a/src/images/lads.jpg b/src/images/lads.jpg new file mode 100644 index 0000000..97d540b Binary files /dev/null and b/src/images/lads.jpg differ diff --git a/src/images/noname.png b/src/images/noname.png new file mode 100644 index 0000000..b5d86bf Binary files /dev/null and b/src/images/noname.png differ diff --git a/src/images/pseudo.jpg b/src/images/pseudo.jpg new file mode 100644 index 0000000..5d55dfc Binary files /dev/null and b/src/images/pseudo.jpg differ diff --git a/src/images/ratata.jpg b/src/images/ratata.jpg new file mode 100644 index 0000000..596003d Binary files /dev/null and b/src/images/ratata.jpg differ diff --git a/src/images/rogue.png b/src/images/rogue.png new file mode 100644 index 0000000..fad902a Binary files /dev/null and b/src/images/rogue.png differ diff --git a/src/images/trasher.jpg b/src/images/trasher.jpg new file mode 100644 index 0000000..eebf9df Binary files /dev/null and b/src/images/trasher.jpg differ diff --git a/src/index.js b/src/index.js index a01f912..8351e95 100644 --- a/src/index.js +++ b/src/index.js @@ -27,33 +27,225 @@ function getCreatureDescription(card) { return 'Существо'; } +class Creature extends Card{ + constructor(name, maxPower, image) { + super(name, maxPower, image); + } + + getDescriptions() { + return [getCreatureDescription(this)].concat(super.getDescriptions()); + } + getCurrentPower() { + return this.currentPower; + } -// Основа для утки. -function Duck() { - this.quacks = function () { console.log('quack') }; - this.swims = function () { console.log('float: both;') }; + setCurrentPower(value) { + this.currentPower = Math.min(this.maxPower, this.currentPower + value); + } } +class Duck extends Creature { + constructor(name='Мирная утка', maxPower=2, image = 'duck.jpg'){ + super(name, maxPower, image) + } + + quacks() { console.log('quack') }; + swims() { console.log('float: both;') }; +} -// Основа для собаки. -function Dog() { +class Dog extends Creature { + constructor(name='Пес-бандит', maxPower=3, image = 'doggo.jpg'){ + super(name, maxPower, image) + } } +class Trasher extends Dog{ + constructor(name='Громила', maxPower=5, image='trasher.jpg') { + super(name, maxPower, image); + } -// Колода Шерифа, нижнего игрока. -const seriffStartDeck = [ - new Card('Мирный житель', 2), - new Card('Мирный житель', 2), - new Card('Мирный житель', 2), -]; + modifyTakenDamage(value, fromCard, gameContext, continuation) { + this.view.signalAbility(() => continuation(value - 1)); + } + + getDescriptions() { + return ['Урон снижен на 1'].concat(super.getDescriptions()); + } +} + +class Gatling extends Creature{ + constructor(name='Гатлинг', maxPower=6, image='ratata.jpg'){ + super(name, maxPower, image) + } + + attack(gameContext, continuation) { + const taskQueue = new TaskQueue(); + const oppositeCards = gameContext.oppositePlayer.table; + if (oppositeCards) { + for (let oppositeCard of oppositeCards) { + taskQueue.push(onDone => this.view.showAttack(onDone)); + taskQueue.push(onDone => { + this.dealDamageToCreature(2, oppositeCard, gameContext, onDone); + }); + } + } + + taskQueue.continueWith(continuation); + game.updateView(); + }; + + getDescriptions() { + return ['РА-ТА-ТА по всем врагам противника'].concat(super.getDescriptions()); + }; +} + +class Lad extends Dog{ + static getInGameCount() { return this.inGameCount || 0; } + static setInGameCount(value) { this.inGameCount = value; } + static getBonus() { return this.getInGameCount() * (this.getInGameCount() + 1) / 2; } + + constructor(name='Браток', maxPower=2, image='lads.jpg') { + super(name, maxPower, image); + } -// Колода Бандита, верхнего игрока. + modifyTakenDamage(value, fromCard, gameContext, continuation) { + this.view.signalAbility(() => continuation(value - Lad.getBonus())); + } + + modifyDealedDamageToCreature(value, toCard, gameContext, continuation) { + this.view.signalAbility(() => continuation(value + Lad.getBonus())); + } + + doAfterComingIntoPlay(gameContext, continuation) { + Lad.setInGameCount(Lad.getInGameCount() + 1); + continuation(); + } + + doBeforeRemoving(continuation) { + Lad.setInGameCount(Lad.getInGameCount() - 1); + continuation(); + }; + + getDescriptions() { + let descriptions = []; + if (Lad.prototype.hasOwnProperty('modifyDealedDamageToCreature') || + Lad.prototype.hasOwnProperty('modifyTakenDamage')) { + descriptions = ["Чем их больше, тем они сильнее"]; + } + return descriptions.concat(super.getDescriptions()); + } +} + +class Rogue extends Creature{ + constructor(name='Изгой', maxPower=2, image='rogue.png') { + super(name, maxPower, image); + } + + doBeforeAttack(gameContext, continuation) { + const {currentPlayer, oppositePlayer, position, updateView} = gameContext; + const oppositeCard = oppositePlayer.table[position]; + + if (oppositeCard) { + const obj = Object.getPrototypeOf(oppositeCard); + if (obj.hasOwnProperty('modifyDealedDamageToCreature')) { + this.modifyDealedDamageToCreature = obj.modifyDealedDamageToCreature; + delete obj['modifyDealedDamageToCreature']; + } + if (obj.hasOwnProperty('modifyDealedDamageToPlayer')) { + this.modifyDealedDamageToPlayer = obj.modifyDealedDamageToPlayer; + delete obj['modifyDealedDamageToPlayer']; + } + if (obj.hasOwnProperty('modifyTakenDamage')) { + this.modifyTakenDamage = obj.modifyTakenDamage; + delete obj['modifyTakenDamage']; + } + } + updateView(); + continuation(); + } + + getDescriptions() { + return ["Ворует способности врагов на увеличение урона или защиты"].concat(super.getDescriptions()); + } +} + +class Brewer extends Duck{ + constructor(name = "Пивовар", maxPower = 2, image='brewer.jpg') { + super(name, maxPower, image); + } + + doBeforeAttack(gameContext, continuation) { + const {currentPlayer, oppositePlayer, position, updateView} = gameContext; + const cards = currentPlayer.table.concat(oppositePlayer.table); + for (let card of cards) { + if (isDuck(card)) { + card.view.signalHeal(() => { + card.maxPower += 1; + card.power += 2; + card.updateView(); + }); + } + } + continuation(); + + } + + getDescriptions() { + return ["Пивка для рывка (только уткам)"].concat(super.getDescriptions()); + } +} + +class PseudoDuck extends Dog { + constructor(name = "Псевдоутка", maxPower = 3, image='pseudo.jpg' ) { + super(name, maxPower, image); + } + quacks() { + console.log('кря') + }; + swims() { + console.log('float: both;') + }; + getDescriptions() { + return ["Кря! Пива мне, бармен"].concat(super.getDescriptions()); + } +} + +class Nemo extends Creature { + constructor(name = "Немо", maxPower = 4, image='noname.png') { + super(name, maxPower, image); + } + + doBeforeAttack(gameContext, continuation) { + this.view.signalAbility(() => { + const {currentPlayer, oppositePlayer, position, updateView} = gameContext; + const oppositeCard = oppositePlayer.table[position]; + + if (oppositeCard) { + Object.setPrototypeOf(this, Object.getPrototypeOf(oppositeCard)); + gameContext.updateView(); + continuation(); + } + }); + } + + getDescriptions() { + return ["Крадет все способности врага"].concat(super.getDescriptions()); + } +} + + const seriffStartDeck = [ + new Duck(), + new Duck(), + new Duck(), + new Gatling(), + ]; const banditStartDeck = [ - new Card('Бандит', 3), + new Trasher(), + new Dog(), + new Dog(), ]; - // Создание игры. const game = new Game(seriffStartDeck, banditStartDeck); diff --git a/src/styles.css b/src/styles.css index 5715729..b4b01b4 100644 --- a/src/styles.css +++ b/src/styles.css @@ -167,8 +167,8 @@ body { } .cardImage { - left: 5px; - right: 5px; + left: 0; + right: 0; position: absolute; height: 100%; text-align: center; @@ -176,6 +176,7 @@ body { .cardImage img { height: 100%; + width: 100%; } .cardDescriptions {