From fe26d911ca35fb6d4f886567d3c0e8f03120f4ef Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Sat, 13 Apr 2013 23:14:39 +0200 Subject: [Abilities] Renamed set to category On the one hand setSetName and setName could sound misleading in the qt client patch i plan. On the otherhand i never really liked the name "set". I think category is more general and obvious. --- src/game-server/abilitymanager.cpp | 36 ++++++++++++++++++------------------ src/game-server/abilitymanager.h | 14 +++++++------- src/game-server/character.cpp | 2 +- src/game-server/commandhandler.cpp | 2 +- src/game-server/settingsmanager.cpp | 4 ++-- src/scripting/lua.cpp | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/game-server/abilitymanager.cpp b/src/game-server/abilitymanager.cpp index 91669f1..eb89829 100644 --- a/src/game-server/abilitymanager.cpp +++ b/src/game-server/abilitymanager.cpp @@ -41,26 +41,25 @@ static AbilityManager::TargetMode getTargetByString(const std::string &str) * Read a element from settings. * Used by SettingsManager. */ -void AbilityManager::readAbilitySetNode(xmlNodePtr node, - const std::string &filename) +void AbilityManager::readAbilityCategoryNode(xmlNodePtr node, + const std::string &filename) { - std::string setName = XML::getProperty(node, "name", std::string()); - if (setName.empty()) + std::string categoryName = XML::getProperty(node, "name", std::string()); + if (categoryName.empty()) { LOG_WARN("The " << filename << " file contains unamed " - << " tags and will be ignored."); + << " tags and will be ignored."); return; } - setName = utils::toLower(setName); + categoryName = utils::toLower(categoryName); for_each_xml_child_node(specialNode, node) { if (xmlStrEqual(specialNode->name, BAD_CAST "ability")) { - readAbilityNode(specialNode, setName); + readAbilityNode(specialNode, categoryName); } } - } /** @@ -73,7 +72,7 @@ void AbilityManager::checkStatus() void AbilityManager::readAbilityNode(xmlNodePtr abilityNode, - const std::string &setName) + const std::string &categoryName) { std::string name = utils::toLower( XML::getProperty(abilityNode, "name", std::string())); @@ -81,7 +80,8 @@ void AbilityManager::readAbilityNode(xmlNodePtr abilityNode, if (id <= 0 || name.empty()) { - LOG_WARN("Invalid ability (empty name or id <= 0) in set: " << setName); + LOG_WARN("Invalid ability (empty name or id <= 0) in category: " + << categoryName); return; } @@ -104,14 +104,14 @@ void AbilityManager::readAbilityNode(xmlNodePtr abilityNode, if (rechargeable && neededMana <= 0) { LOG_WARN("Invalid ability '" << name - << "' (rechargable but no needed attribute) in set: " - << setName); + << "' (rechargable but no needed attribute) in category: " + << categoryName); return; } AbilityInfo *newInfo = new AbilityManager::AbilityInfo; - newInfo->setName = setName; + newInfo->categoryName = categoryName; newInfo->name = name; newInfo->id = id; newInfo->rechargeable = rechargeable; @@ -123,7 +123,7 @@ void AbilityManager::readAbilityNode(xmlNodePtr abilityNode, mAbilitiesInfo[newInfo->id] = newInfo; - std::string keyName = setName + "_" + newInfo->name; + std::string keyName = categoryName + "_" + newInfo->name; mNamedAbilitiesInfo[keyName] = newInfo; } @@ -148,10 +148,10 @@ void AbilityManager::clear() mNamedAbilitiesInfo.clear(); } -unsigned AbilityManager::getId(const std::string &set, +unsigned AbilityManager::getId(const std::string &category, const std::string &name) const { - std::string key = utils::toLower(set) + "_" + utils::toLower(name); + std::string key = utils::toLower(category) + "_" + utils::toLower(name); return getId(key); } @@ -169,10 +169,10 @@ const std::string AbilityManager::getAbilityName(int id) const return it != mAbilitiesInfo.end() ? it->second->name : ""; } -const std::string AbilityManager::getSetName(int id) const +const std::string AbilityManager::getCategoryName(int id) const { AbilitiesInfo::const_iterator it = mAbilitiesInfo.find(id); - return it != mAbilitiesInfo.end() ? it->second->setName : ""; + return it != mAbilitiesInfo.end() ? it->second->categoryName : ""; } AbilityManager::AbilityInfo *AbilityManager::getAbilityInfo(int id) diff --git a/src/game-server/abilitymanager.h b/src/game-server/abilitymanager.h index 969cd70..07bf4c3 100644 --- a/src/game-server/abilitymanager.h +++ b/src/game-server/abilitymanager.h @@ -50,7 +50,7 @@ public: unsigned id; std::string name; - std::string setName; + std::string categoryName; bool rechargeable; int defaultRechargeSpeed; unsigned neededPoints; @@ -76,23 +76,23 @@ public: void reload(); /** - * Gets the abilities Id from a set and a ability string. + * Gets the abilities Id from a category and a ability string. */ - unsigned getId(const std::string &set, const std::string &name) const; + unsigned getId(const std::string &category, const std::string &name) const; /** * Gets the abilities Id from a string formatted in this way: - * "setname_abilityname" + * "categoryname_skillname" */ unsigned getId(const std::string &abilityName) const; const std::string getAbilityName(int id) const; - const std::string getSetName(int id) const; + const std::string getCategoryName(int id) const; AbilityInfo *getAbilityInfo(int id); - void readAbilitySetNode(xmlNodePtr node, const std::string &filename); + void readAbilityCategoryNode(xmlNodePtr node, const std::string &filename); void checkStatus(); @@ -103,7 +103,7 @@ private: void clear(); void readAbilityNode(xmlNodePtr skillNode, - const std::string &setName); + const std::string &categoryName); typedef std::map AbilitiesInfo; AbilitiesInfo mAbilitiesInfo; diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp index ce8c6ca..25b9fbd 100644 --- a/src/game-server/character.cpp +++ b/src/game-server/character.cpp @@ -249,7 +249,7 @@ bool CharacterComponent::abilityUseCheck(AbilityMap::iterator it) if (!ability.abilityInfo->useCallback.isValid()) { LOG_WARN("No callback for use of ability " - << ability.abilityInfo->setName << "/" + << ability.abilityInfo->categoryName << "/" << ability.abilityInfo->name << ". Ignoring ability."); return false; } diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp index c93aeee..5abd722 100644 --- a/src/game-server/commandhandler.cpp +++ b/src/game-server/commandhandler.cpp @@ -1772,7 +1772,7 @@ static void handleListAbility(Entity *player, std::string &args) { const AbilityValue &info = it->second; std::stringstream str; - str << info.abilityInfo->id << ": " << info.abilityInfo->setName << "/" + str << info.abilityInfo->id << ": " << info.abilityInfo->categoryName << "/" << info.abilityInfo->name << " charge: " << info.currentPoints; say(str.str(), player); } diff --git a/src/game-server/settingsmanager.cpp b/src/game-server/settingsmanager.cpp index b909fb6..75aea3c 100644 --- a/src/game-server/settingsmanager.cpp +++ b/src/game-server/settingsmanager.cpp @@ -143,10 +143,10 @@ void SettingsManager::loadFile(const std::string &filename) // skills config skillManager->readSkillSetNode(childNode, filename); } - else if (xmlStrEqual(childNode->name, BAD_CAST "ability-set")) + else if (xmlStrEqual(childNode->name, BAD_CAST "ability-category")) { // ability config - abilityManager->readAbilitySetNode(childNode, filename); + abilityManager->readAbilityCategoryNode(childNode, filename); } else if (xmlStrEqual(childNode->name, BAD_CAST "slot")) { diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index b9ccaf5..d5831d6 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -3021,7 +3021,7 @@ static int abilityinfo_on_recharged(lua_State *s) static int abilitiyinfo_get_category(lua_State *s) { AbilityManager::AbilityInfo *info = LuaAbilityInfo::check(s, 1); - push(s, info->setName); + push(s, info->categoryName); return 1; } -- cgit