Added generic items, worked on features

1 files changed, 2 insertions, 6 deletions

diff --git a/src/armor.cc b/src/armor.cc
index 3a429b3..cb73cb1 100644
--- a/src/armor.cc
+++ b/src/armor.cc
@@ -13,10 +13,8 @@ namespace entry{
         std::string armor_type;
         int strength;
         bool disadvantage;
-        int cost;
-        double weight;
     };
-    NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(armorImpl, ac, armor_type, strength, disadvantage, cost, weight);
+    NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(armorImpl, ac, armor_type, strength, disadvantage);
 
     NLOHMANN_FRIEND_DEFS(Item, Armor, data);
 
@@ -26,8 +24,6 @@ namespace entry{
     std::string Armor::getArmorType(void) const {return data->armor_type;}
     int Armor::getStrRequirement(void) const {return data->strength;}
     bool Armor::stealthDisadvantage(void) const {return data->disadvantage;}
-    int Armor::getCost(void) const {return data->cost;}
-    double Armor::getWeight(void) const {return data->weight;}
 
     string getTextHelper(const Armor& a, string dexBonusLight, string dexBonusMedium) {
         stringstream text;
@@ -43,7 +39,7 @@ namespace entry{
         if(a.stealthDisadvantage()) {
             text << ", Imposes stealth disadvantage";
         }
-        text << ". " << a.Substantial::getText();
+        text << ". " << a.getCostWeightText();
         return text.str();
     }