From dcca16c34978122d0f6b11ba6ee845a588008ce8 Mon Sep 17 00:00:00 2001 From: Serhii Date: Thu, 9 Jan 2025 10:05:52 +0200 Subject: [PATCH] solution --- .github/workflows/test.yml-template | 23 +++++++++++++++++++ package-lock.json | 9 ++++---- package.json | 2 +- src/herbivoresAndCarnivores.js | 34 ++++++++++++++++++++++++++--- 4 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/test.yml-template diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 000000000..bb13dfc45 --- /dev/null +++ b/.github/workflows/test.yml-template @@ -0,0 +1,23 @@ +name: Test + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [20.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm install + - run: npm test diff --git a/package-lock.json b/package-lock.json index 5794158b4..77e8d3a6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^1.9.12", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-node": "^11.1.0", @@ -1467,10 +1467,11 @@ } }, "node_modules/@mate-academy/scripts": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz", - "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", + "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 0df4c1ec0..f7c6e8733 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^1.9.12", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-node": "^11.1.0", diff --git a/src/herbivoresAndCarnivores.js b/src/herbivoresAndCarnivores.js index 637b47ba4..b81dad9dc 100644 --- a/src/herbivoresAndCarnivores.js +++ b/src/herbivoresAndCarnivores.js @@ -1,15 +1,43 @@ 'use strict'; class Animal { - // write your code here + static alive = []; + + constructor(name, health = 100) { + this.name = name; + this.health = health; + } } class Herbivore extends Animal { - // write your code here + hidden = false; + + constructor(name, health) { + super(name, health); + + Animal.alive.push(this); + } + + hide() { + this.hidden = true; + } } class Carnivore extends Animal { - // write your code here + constructor(name, health) { + super(name, health); + Animal.alive.push(this); + } + + bite(herbivore) { + if (!herbivore.hidden && herbivore instanceof Herbivore) { + herbivore.health -= 50; + + if (herbivore.health <= 0) { + Animal.alive = Animal.alive.filter((animal) => animal !== herbivore); + } + } + } } module.exports = {