OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 21:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vehicle type override

Browse Source
This commit is contained in:
Gent 2020-09-17 12:59:30 -04:00
parent b929d12902
commit d1c5e272a8
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/NPCManager.hpp
View File

@ -34,5 +34,4 @@ namespace NPCManager {
void npcVendorBuyback(CNSocket* sock, CNPacketData* data); void npcVendorBuyback(CNSocket* sock, CNPacketData* data);
void npcVendorBuyBattery(CNSocket* sock, CNPacketData* data); void npcVendorBuyBattery(CNSocket* sock, CNPacketData* data);
void npcCombineItems(CNSocket* sock, CNPacketData* data); void npcCombineItems(CNSocket* sock, CNPacketData* data);
void updatePlayerNPCS(CNSocket* sock, PlayerView& plr);
} }

22
src/TableData.cpp
View File

@ -112,7 +112,8 @@ void TableData::init() {
itemSet = xdtData[setNames[i]]["m_pItemData"]; itemSet = xdtData[setNames[i]]["m_pItemData"];
for (nlohmann::json::iterator _item = itemSet.begin(); _item != itemSet.end(); _item++) { for (nlohmann::json::iterator _item = itemSet.begin(); _item != itemSet.end(); _item++) {
auto item = _item.value(); auto item = _item.value();
ItemManager::ItemData[std::pair<int32_t, int32_t>(item["m_iItemNumber"], i == 11 ? 9 : (i == 10 ? 7 : (int)item["m_iEquipLoc"]))] int typeOverride = getItemType(i);
ItemManager::ItemData[std::pair<int32_t, int32_t>(item["m_iItemNumber"], typeOverride != -1 ? typeOverride : (int)item["m_iEquipLoc"])]
= { item["m_iTradeAble"] == 1, item["m_iSellAble"] == 1, item["m_iItemPrice"], item["m_iItemSellPrice"], item["m_iStackNumber"], i > 9 ? 0 : (int)item["m_iMinReqLev"], = { item["m_iTradeAble"] == 1, item["m_iSellAble"] == 1, item["m_iItemPrice"], item["m_iItemSellPrice"], item["m_iStackNumber"], i > 9 ? 0 : (int)item["m_iMinReqLev"],
i > 9 ? 1 : (int)item["m_iRarity"] }; i > 9 ? 1 : (int)item["m_iRarity"] };
} }
@ -190,3 +191,22 @@ void TableData::cleanup() {
for (auto& pair : NPCManager::NPCs) for (auto& pair : NPCManager::NPCs)
delete pair.second; delete pair.second;
} }
int TableData::getItemType(int itemSet) {
int overriden;
switch (itemSet)
{
case 11:
overriden = 9;
break;
case 10:
overriden = 7;
break;
case 9:
overriden = 10;
break;
default:
overriden = -1;
}
return overriden;
}

2
src/TableData.hpp
View File

@ -4,4 +4,6 @@
namespace TableData { namespace TableData {
void init(); void init();
void cleanup(); void cleanup();
int getItemType(int);
} }