From 88524a71b8d3727b5ad4a8a60e146fd8e786b7ad Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 23 Apr 2010 22:15:26 -0600 Subject: Make ManaServ player stats softcoded A new stats.xml file is parsed for player stats for ManaServ. The old hardcoded stats remain as backup. Reviewed-by: Bertram --- src/net/tmwa/generalhandler.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index a975abe8..14f48055 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -98,12 +98,12 @@ GeneralHandler::GeneralHandler(): generalHandler = this; std::list stats; - stats.push_back(ItemDB::Stat("str", N_("Strength %+d"))); - stats.push_back(ItemDB::Stat("agi", N_("Agility %+d"))); - stats.push_back(ItemDB::Stat("vit", N_("Vitality %+d"))); - stats.push_back(ItemDB::Stat("int", N_("Intelligence %+d"))); - stats.push_back(ItemDB::Stat("dex", N_("Dexterity %+d"))); - stats.push_back(ItemDB::Stat("luck", N_("Luck %+d"))); + stats.push_back(ItemDB::Stat("str", _("Strength %+d"))); + stats.push_back(ItemDB::Stat("agi", _("Agility %+d"))); + stats.push_back(ItemDB::Stat("vit", _("Vitality %+d"))); + stats.push_back(ItemDB::Stat("int", _("Intelligence %+d"))); + stats.push_back(ItemDB::Stat("dex", _("Dexterity %+d"))); + stats.push_back(ItemDB::Stat("luck", _("Luck %+d"))); ItemDB::setStatsList(stats); } @@ -214,20 +214,20 @@ void GeneralHandler::guiWindowsLoaded() inventoryWindow->setSplitAllowed(false); skillDialog->loadSkills("ea-skills.xml"); - statusWindow->addAttribute(STR, _("Strength"), true); - statusWindow->addAttribute(AGI, _("Agility"), true); - statusWindow->addAttribute(VIT, _("Vitality"), true); - statusWindow->addAttribute(INT, _("Intelligence"), true); - statusWindow->addAttribute(DEX, _("Dexterity"), true); - statusWindow->addAttribute(LUK, _("Luck"), true); - - statusWindow->addAttribute(ATK, _("Attack"), false); - statusWindow->addAttribute(DEF, _("Defense"), false); - statusWindow->addAttribute(MATK, _("M.Attack"), false); - statusWindow->addAttribute(MDEF, _("M.Defense"), false); - statusWindow->addAttribute(HIT, _("% Accuracy"), false); - statusWindow->addAttribute(FLEE, _("% Evade"), false); - statusWindow->addAttribute(CRIT, _("% Critical"), false); + statusWindow->addAttribute(STR, _("Strength"), true, ""); + statusWindow->addAttribute(AGI, _("Agility"), true, ""); + statusWindow->addAttribute(VIT, _("Vitality"), true, ""); + statusWindow->addAttribute(INT, _("Intelligence"), true, ""); + statusWindow->addAttribute(DEX, _("Dexterity"), true, ""); + statusWindow->addAttribute(LUK, _("Luck"), true, ""); + + statusWindow->addAttribute(ATK, _("Attack"), false, ""); + statusWindow->addAttribute(DEF, _("Defense"), false, ""); + statusWindow->addAttribute(MATK, _("M.Attack"), false, ""); + statusWindow->addAttribute(MDEF, _("M.Defense"), false, ""); + statusWindow->addAttribute(HIT, _("% Accuracy"), false, ""); + statusWindow->addAttribute(FLEE, _("% Evade"), false, ""); + statusWindow->addAttribute(CRIT, _("% Critical"), false, ""); } void GeneralHandler::guiWindowsUnloaded() -- cgit v1.2.3-70-g09d2 From 375ceb6c78f79e0144c2d63e0f9cda170288da8b Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 26 Apr 2010 21:56:31 -0600 Subject: Clear NPC dialogs when the player dies Reviewed-by: Freeyorp --- src/net/manaserv/npchandler.cpp | 5 +++++ src/net/manaserv/npchandler.h | 2 ++ src/net/manaserv/playerhandler.cpp | 5 +++++ src/net/tmwa/npchandler.cpp | 5 +++++ src/net/tmwa/npchandler.h | 2 ++ src/net/tmwa/playerhandler.cpp | 5 +++++ 6 files changed, 24 insertions(+) (limited to 'src/net/tmwa') diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp index 258c72c0..392ec4fd 100644 --- a/src/net/manaserv/npchandler.cpp +++ b/src/net/manaserv/npchandler.cpp @@ -225,4 +225,9 @@ void NpcHandler::endShopping(int beingId) // TODO } +void NpcHandler::clearDialogs() +{ + mNpcDialogs.clear(); +} + } // namespace ManaServ diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h index 7f48c738..689fdc1d 100644 --- a/src/net/manaserv/npchandler.h +++ b/src/net/manaserv/npchandler.h @@ -66,6 +66,8 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler void endShopping(int beingId); + void clearDialogs(); + private: typedef struct { NpcDialog* dialog; diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index 3a5d68a2..f6207800 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -40,6 +40,7 @@ #include "net/manaserv/connection.h" #include "net/manaserv/messagein.h" #include "net/manaserv/messageout.h" +#include "net/manaserv/npchandler.h" #include "net/manaserv/protocol.h" /** @@ -57,6 +58,10 @@ namespace ManaServ { void RespawnRequestListener::action(const gcn::ActionEvent &event) { Net::getPlayerHandler()->respawn(); + + ManaServ::NpcHandler *handler = + static_cast(Net::getNpcHandler()); + handler->clearDialogs(); } extern Connection *gameServerConnection; diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index e6b16f2d..5888c679 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -223,4 +223,9 @@ void NpcHandler::endShopping(int beingId) // TODO } +void NpcHandler::clearDialogs() +{ + mNpcDialogs.clear(); +} + } // namespace TmwAthena diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index a40371a6..bd696bdd 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -67,6 +67,8 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler void endShopping(int beingId); + void clearDialogs(); + private: typedef struct { NpcDialog* dialog; diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index afa2c71b..5aab94b8 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -42,6 +42,7 @@ #include "net/messageout.h" #include "net/tmwa/protocol.h" +#include "net/tmwa/npchandler.h" #include "utils/stringutils.h" #include "utils/gettext.h" @@ -86,6 +87,10 @@ namespace { SellDialog::closeAll(); viewport->closePopupMenu(); + + TmwAthena::NpcHandler *handler = + static_cast(Net::getNpcHandler()); + handler->clearDialogs(); } } deathListener; -- cgit v1.2.3-70-g09d2