summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/cashshophandler.h3
-rw-r--r--src/net/eathena/cashshophandler.cpp68
-rw-r--r--src/net/eathena/cashshophandler.h3
-rw-r--r--src/net/eathena/cashshoprecv.cpp34
-rw-r--r--src/net/tmwa/cashshophandler.cpp3
-rw-r--r--src/net/tmwa/cashshophandler.h3
6 files changed, 105 insertions, 9 deletions
diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h
index 18fbb207c..2d07be871 100644
--- a/src/net/cashshophandler.h
+++ b/src/net/cashshophandler.h
@@ -48,7 +48,8 @@ class CashShopHandler notfinal
const ItemColor color,
const int amount) const = 0;
- virtual void buyItems(const std::vector<ShopItem*> &items) const = 0;
+ virtual void buyItems(const int points,
+ const std::vector<ShopItem*> &items) const = 0;
virtual void close() const = 0;
diff --git a/src/net/eathena/cashshophandler.cpp b/src/net/eathena/cashshophandler.cpp
index 1179f0823..e5d40dca7 100644
--- a/src/net/eathena/cashshophandler.cpp
+++ b/src/net/eathena/cashshophandler.cpp
@@ -24,6 +24,8 @@
#include "net/eathena/messageout.h"
#include "net/eathena/protocolout.h"
+#include "resources/item/shopitem.h"
+
#include "debug.h"
extern Net::CashShopHandler *cashShopHandler;
@@ -54,10 +56,70 @@ void CashShopHandler::buyItem(const int points,
outMsg.writeInt16(CAST_S16(itemId), "item id");
}
-void CashShopHandler::buyItems(const std::vector<ShopItem*> &items A_UNUSED)
- const
+void CashShopHandler::buyItems(const int points,
+ const std::vector<ShopItem*> &items) const
{
- // +++ probably need impliment buy many items at same time
+ if (packetVersion < 20101124)
+ return;
+
+ int cnt = 0;
+ const int pairSize = 4;
+
+ FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ {
+ const ShopItem *const item = *it;
+ const int usedQuantity = item->getUsedQuantity();
+ const ItemTypeT type = item->getType();
+ if (!usedQuantity)
+ continue;
+ if (type == ItemType::Weapon ||
+ type == ItemType::Armor ||
+ type == ItemType::PetEgg ||
+ type == ItemType::PetArmor)
+ {
+ cnt += item->getUsedQuantity();
+ }
+ else
+ {
+ cnt ++;
+ }
+ }
+
+ if (cnt > 100)
+ return;
+
+ createOutPacket(CMSG_NPC_CASH_SHOP_BUY);
+ outMsg.writeInt16(CAST_S16(10 + pairSize * cnt), "len");
+ outMsg.writeInt32(points, "points");
+ outMsg.writeInt16(cnt, "count");
+ FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ {
+ ShopItem *const item = *it;
+ const int usedQuantity = item->getUsedQuantity();
+ if (!usedQuantity)
+ continue;
+ item->increaseQuantity(usedQuantity);
+ item->increaseUsedQuantity(-usedQuantity);
+ item->update();
+ const ItemTypeT type = item->getType();
+ if (type == ItemType::Weapon ||
+ type == ItemType::Armor ||
+ type == ItemType::PetEgg ||
+ type == ItemType::PetArmor)
+ {
+ for (int f = 0; f < usedQuantity; f ++)
+ {
+ outMsg.writeInt16(CAST_S16(1), "amount");
+ outMsg.writeInt16(CAST_S16(item->getId()),
+ "item id");
+ }
+ }
+ else
+ {
+ outMsg.writeInt16(CAST_S16(usedQuantity), "amount");
+ outMsg.writeInt16(CAST_S16(item->getId()), "item id");
+ }
+ }
}
void CashShopHandler::close() const
diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h
index c8b36f657..5fe2a6517 100644
--- a/src/net/eathena/cashshophandler.h
+++ b/src/net/eathena/cashshophandler.h
@@ -37,7 +37,8 @@ class CashShopHandler final : public Net::CashShopHandler
const ItemColor color,
const int amount) const override final;
- void buyItems(const std::vector<ShopItem*> &items) const override final
+ void buyItems(const int points,
+ const std::vector<ShopItem*> &items) const override final
A_CONST;
void close() const override final;
diff --git a/src/net/eathena/cashshoprecv.cpp b/src/net/eathena/cashshoprecv.cpp
index 6c75a1052..d9912342f 100644
--- a/src/net/eathena/cashshoprecv.cpp
+++ b/src/net/eathena/cashshoprecv.cpp
@@ -20,8 +20,12 @@
#include "net/eathena/cashshoprecv.h"
+#include "notifymanager.h"
+
#include "being/playerinfo.h"
+#include "enums/resources/notifytypes.h"
+
#include "gui/windows/buydialog.h"
#include "gui/widgets/createwidget.h"
@@ -69,11 +73,37 @@ void CashShopRecv::processCashShopOpen(Net::MessageIn &msg)
void CashShopRecv::processCashShopBuyAck(Net::MessageIn &msg)
{
- UNIMPLEMENTEDPACKET;
msg.readInt32("cash points");
if (packetVersion >= 20070711)
msg.readInt32("kafra points");
- msg.readInt16("error");
+ const uint16_t res = msg.readInt16("error");
+ switch (res)
+ {
+ case 0:
+ NotifyManager::notify(NotifyTypes::BUY_DONE);
+ break;
+ case 1:
+ NotifyManager::notify(NotifyTypes::BUY_FAILED_NPC_NOT_FOUND);
+ break;
+ case 2:
+ NotifyManager::notify(NotifyTypes::BUY_FAILED_SYSTEM_ERROR);
+ break;
+ case 3:
+ NotifyManager::notify(NotifyTypes::BUY_FAILED_OVERWEIGHT);
+ break;
+ case 4:
+ NotifyManager::notify(NotifyTypes::BUY_TRADE_FAILED);
+ break;
+ case 5:
+ NotifyManager::notify(NotifyTypes::BUY_FAILED_WRONG_ITEM);
+ break;
+ case 6:
+ NotifyManager::notify(NotifyTypes::BUY_FAILED_NO_MONEY);
+ break;
+ default:
+ UNIMPLEMENTEDPACKETFIELD(res);
+ break;
+ }
}
void CashShopRecv::processCashShopPoints(Net::MessageIn &msg)
diff --git a/src/net/tmwa/cashshophandler.cpp b/src/net/tmwa/cashshophandler.cpp
index d8263033e..8379de3ab 100644
--- a/src/net/tmwa/cashshophandler.cpp
+++ b/src/net/tmwa/cashshophandler.cpp
@@ -40,7 +40,8 @@ void CashShopHandler::buyItem(const int points A_UNUSED,
{
}
-void CashShopHandler::buyItems(const std::vector<ShopItem*> &items A_UNUSED)
+void CashShopHandler::buyItems(const int points A_UNUSED,
+ const std::vector<ShopItem*> &items A_UNUSED)
const
{
}
diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h
index 8100d6e50..6b43cdce6 100644
--- a/src/net/tmwa/cashshophandler.h
+++ b/src/net/tmwa/cashshophandler.h
@@ -38,7 +38,8 @@ class CashShopHandler final : public Net::CashShopHandler
const ItemColor color,
const int amount) const override final A_CONST;
- void buyItems(const std::vector<ShopItem*> &items) const override final
+ void buyItems(const int points,
+ const std::vector<ShopItem*> &items) const override final
A_CONST;
void close() const override final A_CONST;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-30 22:02:25 +0000