Completed JavaScript-II assignment

QueasyListening · QueasyListening · commit 973133193b8d · 2018-02-25T14:04:19.000-05:00
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(entered) {
+    return entered === this.password;
+  }
+}
 
 // Part 2
 // Create a class called `Animal` and a class called `Cat` using ES6 classes.
@@ -20,7 +29,25 @@
 // property set on the Cat instance.
 
 // code here
+class Animal {
+  constructor(options) {
+    this.age = options.age;
+  }
+  growOlder() {
+    this.age++;
+    return this.age;
+  }
+}
 
+class Cat extends Animal {
+  constructor(options) {
+    super(options);
+    this.name = options.name;
+  }
+  meow() {
+    return `${this.name} meowed!`;
+  }
+}
 /* eslint-disable no-undef */
 
 module.exports = {
diff --git a/src/prototype.js b/src/prototype.js
@@ -49,6 +49,80 @@
   hamsterHuey.destroy(); // returns 'Game object was removed from the game.'
 */
 
+// function GameObject(attr) {
+//   this.createdAt = attr.createdAt;
+//   this.dimensions = attr.dimensions;
+// }
+
+// GameObject.prototype.destroy = function () {
+//   return 'Game object was removed from the game.';
+// };
+
+// function NPC(npcAttrs) {
+//   GameObject.call(this, npcAttrs);
+//   this.hp = npcAttrs.hp;
+//   this.name = npcAttrs.name;
+// }
+
+// NPC.prototype = Object.create(GameObject.prototype);
+
+// NPC.prototype.takeDamage = function () {
+//   return `${this.name} took damage.`;
+// };
+
+// function Humanoid(humanAttrs) {
+//   NPC.call(this, humanAttrs);
+//   this.faction = humanAttrs.faction;
+//   this.weapons = humanAttrs.weapons;
+//   this.language = humanAttrs.language;
+// }
+
+// Humanoid.prototype = Object.create(NPC.prototype);
+
+// Humanoid.prototype.greet = function () {
+//   return `${this.name} offers a greeting in ${this.language}.`;
+// };
+
+class GameObject {
+  constructor(attrs) {
+    this.createdAt = attrs.createdAt;
+    this.dimensions = attrs.dimensions;
+  }
+  //This method was causing 'this expected' linter error.
+  // destroy() {
+  //   return 'Game object was removed from the game.';
+  // }
+}
+
+GameObject.prototype.destroy = function () {
+  return 'Game object was removed from the game.';
+};
+
+class NPC extends GameObject {
+  constructor(npcAttrs) {
+    super(npcAttrs);
+    this.hp = npcAttrs.hp;
+    this.name = npcAttrs.name;
+  }
+
+  takeDamage() {
+    return `${this.name} took damage.`;
+  }
+}
+
+class Humanoid extends NPC {
+  constructor(humanoidAttrs) {
+    super(humanoidAttrs);
+    this.faction = humanoidAttrs.faction;
+    this.weapons = humanoidAttrs.weapons;
+    this.language = humanoidAttrs.language;
+  }
+
+  greet() {
+    return `${this.name} offers a greeting in ${this.language}.`;
+  }
+}
+
 /* eslint-disable no-undef */
 
 module.exports = {
diff --git a/src/this.js b/src/this.js
@@ -7,7 +7,7 @@
 class User {
   constructor(options) {
     // set a username and password property on the user object that is created
-    this.username = options.user;
+    this.username = options.username;
     this.password = options.password;
   }
   // create a method on the User class called `checkPassword`
@@ -18,11 +18,10 @@ class User {
     return false;
   }
 }
+const filler = { username: 'LambdaSchool',
+  password: 'correcthorsebatterystaple' };
 
-const me = new User({
-  username: 'LambdaSchool',
-  password: 'correcthorsebatterystaple',
-});
+const me = new User(filler);
 
 const result = me.checkPassword('correcthorsebatterystaple'); // should return `true`
 // console.log(result);
@@ -47,7 +46,6 @@ const checkPassword = function comparePasswords(passwordToCompare) {
 
 // .call
 // console.log(checkPassword.call(me, 'correcthorsebatterystaple'));
-
 // .apply
 // console.log(checkPassword.apply(me, ['correcthorsebatterystaple']));
 
