Anvil CUIItemUpgrade implemented

src/Client/WarFare/GameDef.h

@@ -441,6 +441,13 @@ enum e_ItemClass
 	ITEM_CLASS_UNKNOWN       = 0xffffffff
 }; //
 
+enum e_ItemEffect2
+{
+	ITEM_EFFECT2_RING_UPGRADE_REQ = 253,
+	ITEM_EFFECT2_RENTAL_SCROLL    = 254,
+	ITEM_EFFECT2_ITEM_UPGRADE_REQ = 255
+};
+
 enum e_ItemGrade
 {
 	ITEM_GRADE_LOW_CLASS    = 1,

src/Client/WarFare/GameProcMain.cpp

@@ -52,6 +52,7 @@
 #include "UIQuestTalk.h"
 #include "UIDead.h"
 #include "UIUpgradeSelect.h"
+#include "UIItemUpgrade.h"
 #include "UILevelGuide.h"
 #include "UIMsgBoxOkCancel.h"
 
@@ -141,6 +142,7 @@ CGameProcMain::CGameProcMain() // r기본 생성자.. 각 변수의 역활은 
 	m_pUIQuestTalk          = new CUIQuestTalk();
 	m_pUIDead               = new CUIDead();
 	m_pUIUpgradeSelect      = new CUIUpgradeSelect();
+	m_pUIItemUpgrade        = new CUIItemUpgrade();
 	m_pUILevelGuide         = new CUILevelGuide();
 
 	m_pSubProcPerTrade      = new CSubProcPerTrade();
@@ -191,6 +193,7 @@ CGameProcMain::~CGameProcMain()
 	delete m_pUIQuestTalk;
 	delete m_pUIDead;
 	delete m_pUIUpgradeSelect;
+	delete m_pUIItemUpgrade;
 	delete m_pUILevelGuide;
 
 	delete m_pSubProcPerTrade;
@@ -244,6 +247,7 @@ void CGameProcMain::ReleaseUIs()
 	m_pUIInn->Release();
 	m_pUICreateClanName->Release();
 	m_pUIUpgradeSelect->Release();
+	m_pUIItemUpgrade->Release();
 	m_pUILevelGuide->Release();
 
 	CN3UIBase::DestroyTooltip();
@@ -4253,6 +4257,14 @@ void CGameProcMain::InitUI()
 	m_pUIUpgradeSelect->SetState(UI_STATE_COMMON_NONE);
 	m_pUIUpgradeSelect->SetStyle(m_pUIUpgradeSelect->GetStyle() | UISTYLE_USER_MOVE_HIDE | UISTYLE_SHOW_ME_ALONE);
 
+	m_pUIItemUpgrade->Init(s_pUIMgr);
+	m_pUIItemUpgrade->LoadFromFile(pTbl->szItemUpgrade);
+	m_pUIItemUpgrade->SetVisibleWithNoSound(false);
+	rc = m_pUIItemUpgrade->GetRegion();
+	m_pUIItemUpgrade->SetPos(iW - (rc.right - rc.left), 10);
+	m_pUIItemUpgrade->SetState(UI_STATE_COMMON_NONE);
+	m_pUIItemUpgrade->SetStyle(UISTYLE_USER_MOVE_HIDE | UISTYLE_SHOW_ME_ALONE);
+
 	//ui level guide
 	m_pUILevelGuide->Init(s_pUIMgr);
 	m_pUILevelGuide->LoadFromFile(pTbl->szLvlGuide);
@@ -5753,6 +5765,13 @@ void CGameProcMain::MsgRecv_ObjectEvent(Packet& pkt)
 					{
 						bShouldBeRotate = false; // 돌려야 하는지??
 					}
+					else if (OBJECT_TYPE_ANVIL == iType)
+					{
+						/*
+						if (iResult == 0) // anvil object failed animation	
+						if (iResult == 1) // anvil object succeeded animation
+						*/
+					}
 
 					if (0x01 == iActivate)
 					{

src/Client/WarFare/GameProcMain.h

@@ -58,6 +58,7 @@ class CGameProcMain : public CGameProcedure
 	class CUITradeBBSEditDlg* m_pUITradeBBSEdit;      // 상거래 게시물 설명
 
 	class CUIUpgradeSelect* m_pUIUpgradeSelect;
+	class CUIItemUpgrade* m_pUIItemUpgrade;
 	class CUILevelGuide* m_pUILevelGuide;
 
 	class CN3Shape* m_pTargetSymbol;              // 플레이어가 타겟으로 잡은 캐릭터의 위치위에 그리면 된다..

src/Client/WarFare/IconItemSkill.cpp

@@ -1,6 +1,19 @@
 #include "StdAfx.h"
 #include "IconItemSkill.h"
 #include "GameDef.h"
+#include "N3UIWndBase.h"
+
+uint32_t __IconItemSkill::GetItemID() const
+{
+	if (pItemBasic == nullptr)
+		return 0;
+
+	uint32_t nItemID = pItemBasic->dwID;
+	if (pItemExt != nullptr)
+		nItemID += pItemExt->dwID;
+
+	return nItemID;
+}
 
 int __IconItemSkill::GetBuyPrice() const
 {
@@ -33,3 +46,11 @@ int __IconItemSkill::GetSellPrice(bool bHasPremium /*= false*/) const
 
 	return iSellPrice;
 }
+
+bool __IconItemSkill::IsStackable() const
+{
+	if (pItemBasic == nullptr)
+		return false;
+
+	return pItemBasic->byContable == UIITEM_TYPE_COUNTABLE || pItemBasic->byContable == UIITEM_TYPE_COUNTABLE_SMALL;
+}

src/Client/WarFare/IconItemSkill.h

@@ -22,6 +22,8 @@ struct __IconItemSkill
 		__TABLE_UPC_SKILL* pSkill; // Skill.. ^^
 	};
 
+	uint32_t GetItemID() const;
 	int GetBuyPrice() const;
 	int GetSellPrice(bool bHasPremium = false) const;
+	bool IsStackable() const;
 };

src/Client/WarFare/N3UIWndBase.h

@@ -47,6 +47,9 @@ enum e_UIWND_DISTRICT
 	UIWND_DISTRICT_SKILL_HOTKEY,       // Skillicon district of Hotkey icon wnd..
 	UIWND_DISTRICT_TRADE_MY,           // Npc 와의 거래에서 내 영역..
 	UIWND_DISTRICT_PER_TRADE_INV,      // Inv District of Per Trade Wnd ..
+	UIWND_DISTRICT_UPGRADE_INV,			// Upgrade Inv
+	UIWND_DISTRICT_UPGRADE_SLOT,		// Upgrade material slot
+	UIWND_DISTRICT_UPGRADE_RESULT_SLOT,	// Upgrade result slot
 	UIWND_DISTRICT_UNKNOWN,            // District Unknown..
 };