summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-31 18:57:07 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-31 18:57:07 +0300
commit5719a23f9b0729f04ed1fa5dc6cc680c58d514d4 (patch)
treed4fc1a73ea263a737e56d740a266bea34a1bbfcd /src/resources
parent31e7a7d05f36495df0176fc31d5894e216c3cdf4 (diff)
downloadplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.gz
plus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.bz2
plus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.xz
plus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.zip
Move units into db directory.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/unitsdb.cpp328
-rw-r--r--src/resources/db/unitsdb.h56
-rw-r--r--src/resources/item/shopitem.cpp6
3 files changed, 387 insertions, 3 deletions
diff --git a/src/resources/db/unitsdb.cpp b/src/resources/db/unitsdb.cpp
new file mode 100644
index 000000000..7e1e8f880
--- /dev/null
+++ b/src/resources/db/unitsdb.cpp
@@ -0,0 +1,328 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2017 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/db/unitsdb.h"
+
+#include "configuration.h"
+#include "logger.h"
+
+#include "resources/beingcommon.h"
+
+#include <climits>
+
+#include "debug.h"
+
+struct UnitLevel final
+{
+ A_DEFAULT_COPY(UnitLevel)
+
+ std::string symbol;
+ int count;
+ int round;
+ std::string separator;
+};
+
+struct UnitDescription final
+{
+ A_DEFAULT_COPY(UnitDescription)
+
+ std::vector<struct UnitLevel> levels;
+ double conversion;
+ bool mix;
+};
+
+enum UnitType
+{
+ UNIT_WEIGHT = 0,
+ UNIT_CURRENCY = 1,
+ UNIT_END
+};
+
+static std::string formatUnit(const int value, const int type);
+
+static std::string splitNumber(std::string str, const std::string &separator);
+
+struct UnitDescription units[UNIT_END];
+
+void UnitsDb::loadUnits()
+{
+ { // Setup default weight
+ UnitDescription ud;
+
+ ud.conversion = 1.0;
+ ud.mix = false;
+
+ const UnitLevel bu =
+ {
+ "g",
+ 1,
+ 0,
+ ""
+ };
+ ud.levels.push_back(bu);
+
+ const UnitLevel ul =
+ {
+ "kg",
+ 1000,
+ 2,
+ ""
+ };
+ ud.levels.push_back(ul);
+
+ units[UNIT_WEIGHT] = ud;
+ }
+
+ { // Setup default currency
+ UnitDescription ud;
+
+ ud.conversion = 1.0;
+ ud.mix = false;
+
+ UnitLevel bu = {"¤", 1, 0, ""};
+ ud.levels.push_back(bu);
+
+ units[UNIT_CURRENCY] = ud;
+ }
+
+ loadXmlFile(paths.getStringValue("unitsFile"), SkipError_false);
+ loadXmlFile(paths.getStringValue("unitsPatchFile"), SkipError_true);
+ loadXmlDir("unitsPatchDir", loadXmlFile);
+}
+
+void UnitsDb::loadXmlFile(const std::string &fileName,
+ const SkipError skipError)
+{
+ XML::Document doc(fileName, UseResman_true, skipError);
+ const XmlNodePtrConst root = doc.rootNode();
+
+ if (!root || !xmlNameEqual(root, "units"))
+ {
+ logger->log("Error loading unit definition file: "
+ + paths.getStringValue("unitsFile"));
+ return;
+ }
+
+ for_each_xml_child_node(node, root)
+ {
+ if (xmlNameEqual(node, "include"))
+ {
+ const std::string name = XML::getProperty(node, "name", "");
+ if (!name.empty())
+ loadXmlFile(name, skipError);
+ continue;
+ }
+ else if (xmlNameEqual(node, "unit"))
+ {
+ UnitDescription ud;
+ int level = 1;
+ const std::string type = XML::getProperty(node, "type", "");
+ ud.conversion = XML::getProperty(node, "conversion", 1);
+ ud.mix = XML::getProperty(node, "mix", "no") == "yes";
+
+ UnitLevel bu;
+ bu.symbol = XML::getProperty(node, "base", "¤");
+ bu.count = 1;
+ bu.round = XML::getProperty(node, "round", 2);
+ bu.separator = XML::getProperty(node, "separator", " ");
+
+ ud.levels.push_back(bu);
+
+ for_each_xml_child_node(uLevel, node)
+ {
+ if (xmlNameEqual(uLevel, "level"))
+ {
+ const UnitLevel ul =
+ {
+ XML::getProperty(uLevel, "symbol",
+ strprintf("¤%d", level)),
+ XML::getProperty(uLevel, "count", -1),
+ XML::getProperty(uLevel, "round", bu.round),
+ XML::getProperty(uLevel, "separator", bu.separator)
+ };
+
+ if (ul.count > 0)
+ {
+ ud.levels.push_back(ul);
+ level++;
+ }
+ else
+ {
+ logger->log("Error bad unit count: %d for %s in %s",
+ ul.count, ul.symbol.c_str(),
+ bu.symbol.c_str());
+ }
+ }
+ }
+
+ // Add one more level for saftey
+ const UnitLevel lev =
+ {
+ "",
+ INT_MAX,
+ 0,
+ ""
+ };
+ ud.levels.push_back(lev);
+
+ if (type == "weight")
+ units[UNIT_WEIGHT] = ud;
+ else if (type == "currency")
+ units[UNIT_CURRENCY] = ud;
+ else
+ logger->log("Error unknown unit type: %s", type.c_str());
+ }
+ }
+}
+
+static std::string formatUnit(const int value,
+ const int type)
+{
+ const UnitDescription ud = units[type];
+ UnitLevel ul;
+
+ // Shortcut for 0; do the same for values less than 0 (for now)
+ if (value <= 0)
+ {
+ ul = ud.levels[0];
+ return strprintf("0%s", ul.symbol.c_str());
+ }
+ else
+ {
+ double amount = ud.conversion * value;
+ const unsigned int sz = CAST_U32(ud.levels.size());
+
+ // If only the first level is needed, act like mix if false
+ if (ud.mix && !ud.levels.empty() && ud.levels[1].count < amount)
+ {
+ std::string output;
+ UnitLevel pl = ud.levels[0];
+ ul = ud.levels[1];
+ int levelAmount = CAST_S32(amount);
+ int nextAmount = 0;
+
+ if (ul.count)
+ levelAmount /= ul.count;
+
+ amount -= static_cast<double>(levelAmount * ul.count);
+
+ if (amount > 0)
+ {
+ output = splitNumber(strprintf("%.*f", pl.round,
+ amount), pl.separator).append(pl.symbol);
+ }
+
+ for (unsigned int i = 2; i < sz; i++)
+ {
+ pl = ul;
+ ul = ud.levels[i];
+
+ if (ul.count)
+ {
+ nextAmount = levelAmount / ul.count;
+ levelAmount %= ul.count;
+ }
+
+ if (levelAmount > 0)
+ {
+ output = splitNumber(strprintf("%d", levelAmount),
+ pl.separator).append(pl.symbol).append(output);
+ }
+
+ if (!nextAmount)
+ break;
+ levelAmount = nextAmount;
+ }
+
+ return output;
+ }
+ else
+ {
+ ul.round = 0;
+ for (unsigned int i = 0; i < sz; i++)
+ {
+ ul = ud.levels[i];
+ if (amount < ul.count && ul.count > 0)
+ {
+ ul = ud.levels[i - 1];
+ break;
+ }
+ if (ul.count)
+ amount /= ul.count;
+ }
+
+ return splitNumber(strprintf("%.*f", ul.round, amount),
+ ul.separator).append(ul.symbol);
+ }
+ }
+}
+
+std::string UnitsDb::formatCurrency(const int value)
+{
+ return formatUnit(value, UNIT_CURRENCY);
+}
+
+std::string UnitsDb::formatWeight(const int value)
+{
+ return formatUnit(value, UNIT_WEIGHT);
+}
+
+static std::string splitNumber(std::string str,
+ const std::string &separator)
+{
+ std::string lastPart;
+ const size_t point = str.find('.');
+ if (point != std::string::npos)
+ {
+ lastPart = str.substr(point);
+ str = str.substr(0, point);
+ }
+ std::string result;
+
+ if (!str.empty())
+ {
+ size_t sz = str.size();
+ while (sz >= 3)
+ {
+ if (sz >= 6)
+ {
+ result = std::string(separator).append(str.substr(
+ sz - 3)).append(result);
+ }
+ else
+ {
+ result = str.substr(sz - 3).append(result);
+ }
+ str = str.substr(0, str.size() - 3);
+ sz = str.size();
+ }
+ if (!str.empty())
+ {
+ if (!result.empty())
+ result = std::string(str).append(separator).append(result);
+ else
+ result = str;
+ }
+ }
+
+ return result + lastPart;
+}
diff --git a/src/resources/db/unitsdb.h b/src/resources/db/unitsdb.h
new file mode 100644
index 000000000..b8c81cfc3
--- /dev/null
+++ b/src/resources/db/unitsdb.h
@@ -0,0 +1,56 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2017 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_DB_UNITSDB_H
+#define RESOURCES_DB_UNITSDB_H
+
+#include "enums/simpletypes/skiperror.h"
+
+#include <string>
+
+#include "localconsts.h"
+
+class UnitsDb final
+{
+ public:
+ A_DELETE_COPY(UnitsDb)
+
+ /**
+ * Loads and parses the units.xml file (if found).
+ */
+ static void loadUnits();
+
+ static void loadXmlFile(const std::string &fileName,
+ const SkipError skipError);
+
+ /**
+ * Formats the given number in the correct currency format.
+ */
+ static std::string formatCurrency(const int value) A_WARN_UNUSED;
+
+ /**
+ * Formats the given number in the correct weight/mass format.
+ */
+ static std::string formatWeight(const int value) A_WARN_UNUSED;
+};
+
+#endif // RESOURCES_DB_UNITSDB_H
diff --git a/src/resources/item/shopitem.cpp b/src/resources/item/shopitem.cpp
index 74b4f2de8..b3d088b36 100644
--- a/src/resources/item/shopitem.cpp
+++ b/src/resources/item/shopitem.cpp
@@ -22,14 +22,14 @@
#include "resources/item/shopitem.h"
-#include "units.h"
-
#include "resources/iteminfo.h"
#include "utils/stringutils.h"
#include "net/serverfeatures.h"
+#include "resources/db/unitsdb.h"
+
#include "debug.h"
ShopItem::ShopItem(const int inventoryIndex,
@@ -99,7 +99,7 @@ void ShopItem::updateDisplayName(const int quantity)
if (mPrice)
{
mDisplayName.append(" (").append(
- Units::formatCurrency(mPrice)).append(") ");
+ UnitsDb::formatCurrency(mPrice)).append(") ");
}
if (mShowQuantity && quantity > 1)
mDisplayName.append("[").append(toString(quantity)).append("]");