mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-05 06:50:04 +00:00
Fix vehicle type override
This commit is contained in:
parent
b929d12902
commit
d1c5e272a8
@ -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);
|
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
|
}
|
||||||
|
@ -4,4 +4,6 @@
|
|||||||
namespace TableData {
|
namespace TableData {
|
||||||
void init();
|
void init();
|
||||||
void cleanup();
|
void cleanup();
|
||||||
|
|
||||||
|
int getItemType(int);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user