passed tests

dtacheny · dtacheny · commit 91ec8ca8c65d · 2018-01-11T18:22:30.000-06:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/class.js b/src/class.js
@@ -8,6 +8,15 @@
 // 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(potentialPassword) {
+    return this.password === potentialPassword;
+  }
+}
 
 // Part 2
 // Create a class called `Animal` and a class called `Cat` using ES6 classes.
@@ -20,6 +29,24 @@
 // property set on the Cat instance.
 
 // code here
+class Animal {
+  constructor(options) {
+    this.age = options.age;
+  }
+  growOlder() {
+    return ++this.age;
+  }
+}
+
+class Cat extends Animal {
+  constructor(options) {
+    super(options);
+    this.name = options.name;
+  }
+  meow() {
+    return `${this.name} meowed!`;
+  }
+}
 
 /* eslint-disable no-undef */
 
diff --git a/src/prototype.js b/src/prototype.js
@@ -1,3 +1,4 @@
+
 /*
   Object oriented design is commonly used in video games.  For this part of the assignment
   you will be implementing several classes with their correct inheritance heirarchy.
@@ -48,6 +49,38 @@
   hamsterHuey.takeDamage(); // returns 'Hamster Huey took damage.'
   hamsterHuey.destroy(); // returns 'Game object was removed from the game.'
 */
+class GameObject {
+  constructor(objAttr) {
+    this.createdAt = objAttr.createdAt;
+    this.dimensions = objAttr.dimensions;
+  }
+  destroy() {
+    const name = this.name;
+    return 'Game object was removed from the game.';
+  }
+}
+class NPC extends GameObject {
+  constructor(npcAttr) {
+    super(npcAttr);
+    this.hp = npcAttr.hp;
+    this.name = npcAttr.name;
+  }
+  takeDamage() {
+    return `${this.name} took damage.`;
+  }
+}
+
+class Humanoid extends NPC {
+  constructor(humAttr) {
+    super(humAttr);
+    this.faction = humAttr.faction;
+    this.weapons = humAttr.weapons;
+    this.language = humAttr.language;
+  }
+  greet() {
+    return `${this.name} offers a greeting in ${this.language}.`;
+  }
+}
 
 /* eslint-disable no-undef */
 
diff --git a/src/recursion.js b/src/recursion.js
@@ -4,9 +4,9 @@ const nFibonacci = (n) => {
   // fibonacci sequence: 1 1 2 3 5 8 13 ...
   // return the nth number in the sequence
   if (n <= 1) {
-    return 1;
+    return n;
   }
-  return nFibonacci(n - 1) + nFibonacci(n - 2);
+  return nFibonacci(n - 2) + nFibonacci(n - 1);
 };
 
 const nFactorial = (n) => {
@@ -22,6 +22,19 @@ const nFactorial = (n) => {
 const checkMatchingLeaves = (obj) => {
   // return true if every property on `obj` is the same
   // otherwise return false
+  // make a list of the values in obj
+  const values = [];
+  const getValues = (object) => {
+    Object.values(object).forEach((value) => {
+      if (Object(value) === value) {
+        getValues(value);
+      } else {
+        values.push(value);
+      }
+    });
+  };
+  getValues(obj);
+  return values.every(x => x === values[0]);
 };
 
 /* eslint-enable no-unused-vars */
diff --git a/src/this.js b/src/this.js
@@ -25,8 +25,6 @@ const me = new User({
 
 const result = me.checkPassword('correcthorsebatterystaple'); // should return `true`
 
-console.log(result);
-
 /* part 2 */
 
 const checkPassword = function comparePasswords(passwordToCompare) {
@@ -42,17 +40,15 @@ const checkPassword = function comparePasswords(passwordToCompare) {
 
 // .call
 
-console.log(checkPassword.call(me, 'correcthorsebatterystaple'));
-console.log(checkPassword.call(me, 'wrongpassword'));
+checkPassword.call(me, 'correcthorsebatterystaple');
+checkPassword.call(me, 'wrongpassword');
 
 // .apply
 
-console.log(checkPassword.apply(me, ['correcthorsebatterystaple']));
-console.log(checkPassword.apply(me, ['wrongpassword']));
+checkPassword.apply(me, ['correcthorsebatterystaple']);
+checkPassword.apply(me, ['wrongpassword']);
 
 // .bind
 
 const isTrue = checkPassword.bind(me, 'correcthorsebatterystaple');
 const isFalse = checkPassword.bind(me, 'wrongpassword');
-console.log(isTrue());
-console.log(isFalse());
