diff --git a/src/game/main.cpp b/src/game/main.cpp index 5779650..2454be0 100644 --- a/src/game/main.cpp +++ b/src/game/main.cpp @@ -48,7 +48,6 @@ #include "castle.h" #include "ani.h" #include "BattleArena.h" -#include "over9refine.h" #include "horsename_manager.h" #include "MarkManager.h" #include "spam.h" @@ -372,7 +371,6 @@ int main(int argc, char **argv) CPolymorphUtils polymorph_utils; CProfiler profiler; CBattleArena ba; - COver9RefineManager o9r; SpamManager spam_mgr; CThreeWayWar threeway_war; CDragonLairManager dl_manager; diff --git a/src/game/over9refine.cpp b/src/game/over9refine.cpp deleted file mode 100644 index 6b37234..0000000 --- a/src/game/over9refine.cpp +++ /dev/null @@ -1,110 +0,0 @@ -#include "stdafx.h" -#include "constants.h" -#include "log.h" -#include "char.h" -#include "item_manager.h" -#include "item.h" -#include "over9refine.h" - -void COver9RefineManager::enableOver9Refine(DWORD dwVnumFrom, DWORD dwVnumTo) -{ - m_mapItem.insert(std::make_pair(dwVnumFrom, dwVnumTo)); -} - -int COver9RefineManager::canOver9Refine(DWORD dwVnum) -{ - OVER9ITEM_MAP::iterator iter = m_mapItem.find(dwVnum); - - if (iter != m_mapItem.end()) - return 1; - - if (dwVnum % 10 == 9) - return 0; - - dwVnum -= dwVnum % 10; - - for (iter = m_mapItem.begin(); iter != m_mapItem.end(); ++iter) - if (iter->second == dwVnum) - return 2; - - return 0; -} - -bool COver9RefineManager::Change9ToOver9(LPCHARACTER pChar, LPITEM item) -{ - OVER9ITEM_MAP::iterator iter = m_mapItem.find(item->GetVnum()); - - if (iter == m_mapItem.end()) - return false; - - DWORD dwVnum = iter->second; - - LPITEM over9 = ITEM_MANAGER::instance().CreateItem(dwVnum, 1); - - if (over9 == NULL) - return false; - - item->CopySocketTo(over9); - item->CopyAttributeTo(over9); - - int iEmptyCell = pChar->GetEmptyInventory(over9->GetSize()); - - if (iEmptyCell == -1) - return false; - - item->RemoveFromCharacter(); - - over9->AddToCharacter(pChar, TItemPos(INVENTORY, iEmptyCell)); - - char szBuf[256]; - snprintf(szBuf, sizeof(szBuf), "SUCCESS %u %s %u", over9->GetID(), over9->GetName(), over9->GetOriginalVnum()); - LogManager::instance().ItemLog(pChar, item, "REFINE OVER9", szBuf); - return true; -} - -bool COver9RefineManager::Over9Refine(LPCHARACTER pChar, LPITEM item) -{ - DWORD dwVnum = item->GetRefinedVnum(); - - if (dwVnum == 0) - return false; - - LPITEM over9 = ITEM_MANAGER::instance().CreateItem(dwVnum, 1); - - if (over9 == NULL) - return false; - - item->CopySocketTo(over9); - item->CopyAttributeTo(over9); - - int iEmptyCell = pChar->GetEmptyInventory(over9->GetSize()); - - if (iEmptyCell == -1) - return false; - - item->RemoveFromCharacter(); - - over9->AddToCharacter(pChar, TItemPos(INVENTORY, iEmptyCell)); - - char szBuf[256]; - snprintf(szBuf, sizeof(szBuf), "SUCCESS %u %s %u", over9->GetID(), over9->GetName(), over9->GetOriginalVnum()); - LogManager::instance().ItemLog(pChar, item, "REFINE OVER9", szBuf); - return true; -} - -DWORD COver9RefineManager::GetMaterialVnum(DWORD baseVnum) -{ - OVER9ITEM_MAP::iterator iter = m_mapItem.find(baseVnum); - - if (iter != m_mapItem.end()) - return (baseVnum - (baseVnum % 10)); - - baseVnum -= baseVnum % 10; - - for (iter = m_mapItem.begin(); iter != m_mapItem.end(); ++iter) - if (iter->second == baseVnum) - return (iter->first - (iter->first % 10)); - - return 0; -} - diff --git a/src/game/over9refine.h b/src/game/over9refine.h deleted file mode 100644 index dc32207..0000000 --- a/src/game/over9refine.h +++ /dev/null @@ -1,25 +0,0 @@ - -#ifndef OVER_9_REFINE_MANAGER_H_ -#define OVER_9_REFINE_MANAGER_H_ - -#include - -class COver9RefineManager : public singleton -{ - private : - typedef std::unordered_map OVER9ITEM_MAP; - OVER9ITEM_MAP m_mapItem; - - public : - void enableOver9Refine(DWORD dwVnumFrom, DWORD dwVnumTo); - - int canOver9Refine(DWORD dwVnum); - - bool Change9ToOver9(LPCHARACTER pChar, LPITEM item); - bool Over9Refine(LPCHARACTER pChat, LPITEM item); - - DWORD GetMaterialVnum(DWORD baseVnum); -}; - -#endif /* OVER_9_REFINE_MANAGER_H_ */ - diff --git a/src/game/questlua_global.cpp b/src/game/questlua_global.cpp index 60a7fb6..83629e2 100644 --- a/src/game/questlua_global.cpp +++ b/src/game/questlua_global.cpp @@ -16,7 +16,6 @@ #include "item_manager.h" #include "mob_manager.h" #include "start_position.h" -#include "over9refine.h" #include "OXEvent.h" #include "regen.h" #include "cmd.h" @@ -1046,19 +1045,6 @@ namespace quest return 0; } - int _enable_over9refine( lua_State* L ) - { - if ( lua_isnumber(L, 1) == true && lua_isnumber(L, 2) == true ) - { - DWORD dwVnumFrom = (DWORD)lua_tonumber(L, 1); - DWORD dwVnumTo = (DWORD)lua_tonumber(L, 2); - - COver9RefineManager::instance().enableOver9Refine(dwVnumFrom, dwVnumTo); - } - - return 0; - } - int _add_ox_quiz(lua_State* L) { int level = (int)lua_tonumber(L, 1); @@ -1398,7 +1384,6 @@ namespace quest { "say_in_map", _say_in_map }, { "kill_all_in_map", _kill_all_in_map }, { "regen_in_map", _regen_in_map }, - { "enable_over9refine", _enable_over9refine }, { "block_chat", _block_chat }, { "spawn_mob", _spawn_mob }, { "get_locale_base_path", _get_locale_base_path }, diff --git a/src/game/questlua_item.cpp b/src/game/questlua_item.cpp index c44e005..96866cf 100644 --- a/src/game/questlua_item.cpp +++ b/src/game/questlua_item.cpp @@ -3,7 +3,6 @@ #include "char.h" #include "item.h" #include "item_manager.h" -#include "over9refine.h" #include "log.h" #undef sys_err @@ -337,52 +336,6 @@ namespace quest return 1; } - int item_can_over9refine(lua_State* L) - { - LPITEM item = CQuestManager::instance().GetCurrentItem(); - - if ( item == NULL ) return 0; - - lua_pushnumber(L, COver9RefineManager::instance().canOver9Refine(item->GetVnum())); - - return 1; - } - - int item_change_to_over9(lua_State* L) - { - LPCHARACTER ch = CQuestManager::instance().GetCurrentCharacterPtr(); - LPITEM item = CQuestManager::instance().GetCurrentItem(); - - if ( ch == NULL || item == NULL ) return 0; - - lua_pushboolean(L, COver9RefineManager::instance().Change9ToOver9(ch, item)); - - return 1; - } - - int item_over9refine(lua_State* L) - { - LPCHARACTER ch = CQuestManager::instance().GetCurrentCharacterPtr(); - LPITEM item = CQuestManager::instance().GetCurrentItem(); - - if ( ch == NULL || item == NULL ) return 0; - - lua_pushboolean(L, COver9RefineManager::instance().Over9Refine(ch, item)); - - return 1; - } - - int item_get_over9_material_vnum(lua_State* L) - { - if ( lua_isnumber(L, 1) == true ) - { - lua_pushnumber(L, COver9RefineManager::instance().GetMaterialVnum((DWORD)lua_tonumber(L, 1))); - return 1; - } - - return 0; - } - int item_get_level_limit (lua_State* L) { CQuestManager& q = CQuestManager::instance(); @@ -471,10 +424,6 @@ namespace quest { "get_refine_vnum", item_get_refine_vnum }, { "get_level", item_get_level }, { "next_refine_vnum", item_next_refine_vnum }, - { "can_over9refine", item_can_over9refine }, - { "change_to_over9", item_change_to_over9 }, - { "over9refine", item_over9refine }, - { "get_over9_material_vnum", item_get_over9_material_vnum }, { "get_level_limit", item_get_level_limit }, { "start_realtime_expire", item_start_realtime_expire }, { "copy_and_give_before_remove", item_copy_and_give_before_remove},