Prep for test.

kennyqiyenkan · Sep 10, 2016 · 30925a3 · 30925a3
1 parent 10e5b8a
commit 30925a3
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 13 deletions.
diff --git a/Project-Uragon/app/model/creature/stats/mainStats.ts b/Project-Uragon/app/model/creature/stats/mainStats.ts
@@ -16,20 +16,58 @@ export class MainStats
   private lukMod:number; //- Luck Modifier
 
   constructor()
+  constructor(json:any)
+  constructor(json?:any)
   {
-    this.str = 0;
-    this.int = 0;
-    this.dex = 0;
-    this.vit = 0;
-    this.agi = 0;
-    this.luk = 0;
+    if(json)
+    {
+      this.str = json[StatsEnum.STRENGTH];
+      this.int = json[StatsEnum.INTELLIGENCE];
+      this.dex = json[StatsEnum.DEXTERITY];
+      this.vit = json[StatsEnum.VITALITY];
+      this.agi = json[StatsEnum.AGILITY];
+      this.luk = json[StatsEnum.LUCK];
+
+      this.strMod = json[StatsEnum.STRENGTH_MOD];
+      this.intMod = json[StatsEnum.INTELLIGENCE_MOD];
+      this.dexMod = json[StatsEnum.DEXTERITY_MOD];
+      this.vitMod = json[StatsEnum.VITALITY_MOD];
+      this.agiMod = json[StatsEnum.AGILITY_MOD];
+      this.lukMod = json[StatsEnum.LUCK_MOD];
+    }else{
+      this.str = 0;
+      this.int = 0;
+      this.dex = 0;
+      this.vit = 0;
+      this.agi = 0;
+      this.luk = 0;
 
-    this.strMod = 0;
-    this.intMod = 0;
-    this.dexMod = 0;
-    this.vitMod = 0;
-    this.agiMod = 0;
-    this.lukMod = 0;
+      this.strMod = 0;
+      this.intMod = 0;
+      this.dexMod = 0;
+      this.vitMod = 0;
+      this.agiMod = 0;
+      this.lukMod = 0;
+    }
+  }
+
+  public toJSON()
+  {
+    return
+    {
+      StatsEnum.STRENGTH:this.str,
+      StatsEnum.INTELLIGENCE:this.int,
+      StatsEnum.DEXTERITY:this.dex,
+      StatsEnum.VITALITY:this.vit,
+      StatsEnum.AGILITY:this.agi,
+      StatsEnum.LUCK:this.luk,
+      StatsEnum.STRENGTH_MOD:this.strMod,
+      StatsEnum.INTELLIGENCE_MOD:this.intMod,
+      StatsEnum.DEXTERITY_MOD:this.dexMod,
+      StatsEnum.VITALITY_MOD:this.vitMod,
+      StatsEnum.AGILITY_MOD:this.agiMod,
+      StatsEnum.LUCK_MOD:this.lukMod
+    };
   }
 
   public getSTR() { return (this.str + this.strMod); }

diff --git a/Project-Uragon/app/model/creature/stats/statsEnum.ts b/Project-Uragon/app/model/creature/stats/statsEnum.ts
@@ -5,5 +5,11 @@ export enum StatsEnum
   DEXTERITY = "dex",
   VITALITY = "vit",
   AGILITY = "agi",
-  LUCK = "luk"
+  LUCK = "luk",
+  STRENGTH_MOD = "strMod",
+  INTELLIGENCE_MOD = "intMod",
+  DEXTERITY_MOD = "dexMod",
+  VITALITY_MOD = "vitMod",
+  AGILITY_MOD = "agiMod",
+  LUCK_MOD = "lukMod"
 }