Prototype & Class both passing all

qapla47 · qapla47 · commit 8b1a2e153f77 · 2017-10-05T17:08:17.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/LambdaSchool/javascript-ii.git"
-  },  
+  },
   "devDependencies": {
     "babel-jest": "^19.0.0",
     "eslint": "^3.17.1",
diff --git a/src/class.js b/src/class.js
@@ -8,6 +8,17 @@
 // Return true if the potential password matches the `password` property.  Otherwise return false.
 
 // code here
+class User {
+  constructor(options) {
+    this.email = options.email;
+    this.password = options.password;
+  }
+  comparePasswords(pw) {
+    if (this.password === pw) {
+      return true;
+    } return false;
+  }
+}
 
 // Part 2
 // Create a class called `Animal` and a class called `Cat` using ES6 classes.
@@ -20,7 +31,23 @@
 // property set on the Cat instance.
 
 // code here
-
+class Animal {
+  constructor(options) {
+    this.age = options.age;
+  }
+  growOlder(options) {
+    return ++this.age;
+  }
+}
+class Cat extends Animal {
+  constructor(age, growOlder) {
+    super(age, growOlder);
+    this.name = Cat.name;
+  }
+  meow() {
+    return `${this.name} meowed!`;
+  }
+}
 /* eslint-disable no-undef */
 
 module.exports = {
diff --git a/src/prototype.js b/src/prototype.js
@@ -6,23 +6,49 @@
   GameObject
     createdAt
     dimensions
-    destroy() // prototype method -> returns the string 'Game object was removed from the game.'
-
-  NPC
+    destroy() // prototype method -> returns the string 'Game object was removed from the game.' */
+function GameObject(stats) {
+  this.createdAt = new Date();
+  this.dimensions = stats.dimensions;
+}
+GameObject.prototype.destroy = function () {
+  return 'Game object was removed from the game.';
+}; // in this notation format, the function must be created outside of the object
+// strings not incorporating methods from the Object must use '', not ``
+  /* NPC
     hp
     name
     takeDamage() // prototype method -> returns the string '<object name> took damage.'
-    // should inherit destroy() from GameObject's prototype
-
-  Humanoid
+    // should inherit destroy() from GameObject's prototype */
+function NPC(stats) {
+  GameObject.call(this, stats);
+  this.hp = stats.hp;
+  this.name = stats.name;
+}
+NPC.prototype = Object.create(GameObject.prototype);
+// ^^ you must complete the prototype chain here in order for it to work see p2 of your notes, the
+// example item doesn't stop at the first page
+NPC.prototype.takeDamage = function () {
+  return `${this.name} took damage.`; // this line can use `` because it's calling a method
+};
+/*  Humanoid
     faction
     weapons
     language
     greet() // prototype method -> returns the string '<object name> offers a greeting in <object language>.'
     // should inherit destroy() from GameObject through NPC
-    // should inherit takeDamage() from NPC
-
-  Inheritance chain: Humanoid -> NPC -> GameObject
+    // should inherit takeDamage() from NPC */
+function Humanoid(stats) {
+  NPC.call(this, stats);
+  this.faction = stats.faction;
+  this.weapons = stats.weapons;
+  this.language = stats.language;
+}
+Humanoid.prototype = Object.create(NPC.prototype); // don't forget to finish the prototype chain...
+Humanoid.prototype.greet = function () {
+  return `${this.name} offers a greeting in ${this.language}.`;
+};
+  /* Inheritance chain: Humanoid -> NPC -> GameObject
   Instances of Humanoid should have all of the same properties as NPC and GameObject.
   Instances of NPC should have all of the same properties as GameObject.
 
diff --git a/src/recursion.js b/src/recursion.js
@@ -8,6 +8,8 @@ const nFibonacci = (n) => {
 const nFactorial = (n) => {
   // factorial example: !5 = 5 * 4 * 3 * 2 * 1
   // return the factorial of `n`
+  if (n === 1) return 1;
+  return n * nFactorial(n - 1);
 };
 
 /* Extra Credit */
