feat: Show weight in kg

Author: finduraf

FeLib/Include/festring.h

@@ -119,13 +119,17 @@ class festring
   void ExtractWord(festring&);
   long GetCheckSum() const;
   void EnsureOwnsData(bool = false);
+  inline bool IsUnique () const { return (OwnsData && Data && (REFS(Data) == 0)); }
+  void PutWeight (int w);  // Nicely formatted weight
  private:
   static void InstallIntegerMap();
   static void DeInstallIntegerMap();
   static void CheckNull(cchar*);
   void CreateNewData(sizetype);
   void CreateOwnData(cchar*, sizetype);
   festring& AppendInt(long);
+  festring& AppendIntr (cchar* CStr, sizetype clen);
+  festring& AppendStr (cchar* s);
   festring& Append(char);
   festring& Append(cchar*, sizetype);
   festring& Append(cfestring&);

FeLib/Source/festring.cpp

@@ -907,3 +907,66 @@ void festring::EnsureOwnsData(bool Unique)
     CreateOwnData(Data, Size);
   }
 }
+
+festring& festring::AppendIntr(cchar* CStr, sizetype N)
+{
+  if(N == 0)
+    return *this;
+
+  sizetype OldSize = Size;
+  sizetype NewSize = OldSize+N;
+  char* OldPtr = Data;
+
+  if(OwnsData && IsUnique() && NewSize <= Reserved) {
+    memmove(OldPtr + OldSize, CStr, N);
+    Size = NewSize;
+  } else {
+    SlowAppend(CStr, N);
+  }
+  return *this;
+}
+
+festring& festring::AppendStr(cchar* s)
+{
+  if(s && s[0]) {
+    return AppendIntr(s, (sizetype)strlen(s));
+  } else {
+    return *this;
+  }
+}
+
+void festring::PutWeight(int w) {
+  if(w < 1000) {
+    *this << w << "g";
+  } else {
+    int kg = w / 1000;
+    int g = w % 1000;
+
+    if(g != 0) {
+      if(g % 100 != 0) {
+        AppendStr("~");
+
+        if(g % 100 > 50)
+          g = g / 100 + 1;
+        else
+          g = g / 100;
+
+        if(g == 10) {
+          kg += 1;
+          g = 0;
+        }
+      } else {
+        g /= 100;
+      }
+    }
+
+    *this << kg;
+
+    if (g != 0) {
+      AppendStr(".");
+      (*this) << g;
+    }
+
+    AppendStr("kg");
+  }
+}

Main/Source/char.cpp

@@ -11542,9 +11542,7 @@ truth character::EquipmentScreen(stack* MainStack, stack* SecStack)
     if(IsPlayer())
     {
       festring Total("Total weight: ");
-      Total << TotalEquippedWeight;
-      Total << "g";
-
+      Total.PutWeight(TotalEquippedWeight);
       List.AddDescription(CONST_S(""));
       List.AddDescription(Total);
     }

Main/Source/command.cpp

@@ -634,8 +634,8 @@ truth commandsystem::ShowInventory(character* Char)
 {
   itemvector WhichItem;
   festring Title("Your inventory (total weight: ");
-  Title << Char->GetStack()->GetWeight();
-  Title << "g)";
+  Title.PutWeight(Char->GetStack()->GetWeight());
+  Title << ")";
 
   Char->GetStack()->DrawContents(WhichItem, Char, Title, REMEMBER_SELECTED);
   return false;

Main/Source/gear.cpp

@@ -427,7 +427,8 @@ void meleeweapon::AddInventoryEntry(ccharacter* Viewer, festring& Entry,
 
   if(ShowSpecialInfo)
   {
-    Entry << " [" << GetWeight() << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight());
     if(ivanconfig::IsShowVolume())
       Entry << " " << GetVolume() << "cm3";
     Entry << ", DAM " << GetBaseMinDamage() << '-' << GetBaseMaxDamage();
@@ -646,7 +647,8 @@ void armor::AddInventoryEntry(ccharacter*, festring& Entry, int Amount, truth Sh
   }
 
   if(ShowSpecialInfo)
-    Entry << " [" << GetWeight() * Amount << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight() * Amount);
     if(ivanconfig::IsShowVolume())
       Entry << " " << GetVolume() << "cm3";
     Entry << ", AV " << GetStrengthValue() << ']';
@@ -659,7 +661,8 @@ void shield::AddInventoryEntry(ccharacter* Viewer, festring& Entry,
 
   if(ShowSpecialInfo)
   {
-    Entry << " [" << GetWeight() << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight());
     if(ivanconfig::IsShowVolume())
       Entry << " " << GetVolume() << "cm3";
     Entry << ", AV " << GetStrengthValue();
@@ -1408,7 +1411,8 @@ void taiaha::AddInventoryEntry(ccharacter* Viewer, festring& Entry, int, truth S
 
   if(ShowSpecialInfo)
   {
-    Entry << " [" << GetWeight() << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight());
     if(ivanconfig::IsShowVolume())
       Entry << " " << GetVolume() << "cm3";
     Entry << ", DAM " << GetBaseMinDamage() << '-' << GetBaseMaxDamage();
@@ -1913,7 +1917,8 @@ void chastitybelt::AddInventoryEntry(ccharacter*, festring& Entry, int Amount, t
   }
 
   if(ShowSpecialInfo)
-    Entry << " [" << GetWeight() * Amount << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight() * Amount);
     if(ivanconfig::IsShowVolume())
       Entry << ", " << GetVolume() << "cm3";
     Entry << ", AV " << GetStrengthValue();

Main/Source/item.cpp

@@ -864,8 +864,11 @@ void item::AddInventoryEntry(ccharacter*, festring& Entry, int Amount, truth Sho
   }
 
   if(ShowSpecialInfo){
-    Entry << " [" << GetWeight() * Amount << "g"; //TODO if the 1st and 2nd of 3 items have 100g and the last has 2000g, the weight shown would be 300g ... now that lumps, stones and sticks are useful, this may not be that good...
-    if(ivanconfig::IsShowVolume()){
+    //TODO if the 1st and 2nd of 3 items have 100g and the last has 2000g, the weight shown would be 300g ... now that lumps, stones and sticks are useful, this may not be that good...
+    Entry << " [";
+    Entry.PutWeight(GetWeight() * Amount);
+
+    if(ivanconfig::IsShowVolume()) {
       Entry << " " << GetVolume() * Amount << "cm3"; //the item can be seen therefore it's volume guessed already
       if(GetSecondaryMaterial()==NULL){ //simple items like ingots sticks etc
         static char density[20];

Main/Source/miscitem.cpp

@@ -1810,7 +1810,8 @@ void wand::AddInventoryEntry(ccharacter*, festring& Entry, int, truth ShowSpecia
 
   if(ShowSpecialInfo)
   {
-    Entry << " [" << GetWeight() << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight());
     if(ivanconfig::IsShowVolume())
       Entry << " " << GetVolume() << "cm3";
 
@@ -2735,7 +2736,8 @@ void holybanana::AddInventoryEntry(ccharacter* Viewer, festring& Entry, int, tru
 
   if(ShowSpecialInfo)
   {
-    Entry << " [" << GetWeight() << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight());
     if(ivanconfig::IsShowVolume())
       Entry << " " << GetVolume() << "cm3";
     Entry << ", DAM " << GetBaseMinDamage() << '-' << GetBaseMaxDamage();
@@ -3436,12 +3438,13 @@ void holyhandgrenade::AddInventoryEntry(ccharacter* Viewer, festring& Entry, int
 
   if(ShowSpecialInfo)
   {
-    Entry << " [" << GetWeight() << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight());
 
     if(!!WillExplodeSoon())
       Entry << ", " << "(armed)";
 
-    Entry << ']';
+    Entry << "]";
   }
 }
 
@@ -3829,7 +3832,8 @@ void ullrbone::AddInventoryEntry(const character* Viewer, festring& Entry, int,
 
   if(ShowSpecialInfo)
   {
-    Entry << " [" << GetWeight() << "g";
+    Entry << " [";
+    Entry.PutWeight(GetWeight());
     if(ivanconfig::IsShowVolume())
       Entry << " " << GetVolume() << "cm3";
     Entry << ", DAM " << GetBaseMinDamage() << '-' << GetBaseMaxDamage();