mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Perform item requirement check when entering vendors

pull/3753/head
Anders Jenbo 4 years ago
parent
bda0a0624b
commit
af08a99691
3 changed files with 41 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      Source/items.cpp
  2. 5
      Source/pack.cpp
  3. 47
      Source/stores.cpp

63
Source/items.cpp
Unescape View File

@ -517,31 +517,8 @@ void CalcPlrItemMin(Player &player)
}
}
void WitchBookLevel(Item &bookItem)
{
if (bookItem._iMiscId != IMISC_BOOK)
return;
bookItem._iMinMag = spelldata[bookItem._iSpell].sMinInt;
int8_t spellLevel = Players[MyPlayerId]._pSplLvl[bookItem._iSpell];
while (spellLevel > 0) {
bookItem._iMinMag += 20 * bookItem._iMinMag / 100;
spellLevel--;
if (bookItem._iMinMag + 20 * bookItem._iMinMag / 100 > 255) {
bookItem._iMinMag = 255;
spellLevel = 0;
}
}
}
void CalcPlrBookVals(Player &player)
{
if (currlevel == 0) {
for (int i = 1; !witchitem[i].isEmpty(); i++) {
WitchBookLevel(witchitem[i]);
witchitem[i]._iStatFlag = MyPlayer->CanUseItem(witchitem[i]);
}
}
for (Item &item : InventoryPlayerItemsRange { player }) {
if (item._itype == ItemType::Misc && item._iMiscId == IMISC_BOOK) {
item._iMinMag = spelldata[item._iSpell].sMinInt;
@ -2253,7 +2230,7 @@ void SpawnOnePremium(Item &premiumItem, int plvl, int playerId)
&& count < 150));
premiumItem._iCreateInfo = plvl | CF_SMITHPREMIUM;
premiumItem._iIdentified = true;
premiumItem._iStatFlag = MyPlayer->CanUseItem(premiumItem);
premiumItem._iStatFlag = player.CanUseItem(premiumItem);
}
bool WitchItemOk(int i)
@ -2416,35 +2393,6 @@ void RecreateTownItem(Item &item, int idx, uint16_t icreateinfo, int iseed)
RecreateHealerItem(item, idx, icreateinfo & CF_LEVEL, iseed);
}
void RecalcStoreStats()
{
// This function gets called when browsing the saved games list, the global MyPlayer pointer is nullptr at this point
// since we're not actually in a game yet. Previous code just blindly used Players[MyPlayerId] (where MyPlayerId = 0)
// so we do the same.
const auto &myPlayer = Players[MyPlayerId];
for (auto &item : smithitem) {
if (!item.isEmpty()) {
item._iStatFlag = myPlayer.CanUseItem(item);
}
}
for (auto &item : premiumitems) {
if (!item.isEmpty()) {
item._iStatFlag = myPlayer.CanUseItem(item);
}
}
for (int i = 0; i < 20; i++) {
if (!witchitem[i].isEmpty()) {
witchitem[i]._iStatFlag = myPlayer.CanUseItem(witchitem[i]);
}
}
for (auto &item : healitem) {
if (!item.isEmpty()) {
item._iStatFlag = myPlayer.CanUseItem(item);
}
}
boyitem._iStatFlag = myPlayer.CanUseItem(boyitem);
}
void CreateMagicItem(Point position, int lvl, ItemType itemType, int imid, int icurs, bool sendmsg, bool delta)
{
if (ActiveItemCount >= MAXITEMS)
@ -2960,8 +2908,6 @@ void CalcPlrInv(Player &player, bool loadgfx)
CalcPlrBookVals(player);
player.CalcScrolls();
CalcPlrStaff(player);
if (currlevel == 0)
RecalcStoreStats();
}
}
@ -4446,7 +4392,6 @@ void SpawnSmith(int lvl)
newItem._iCreateInfo = lvl | CF_SMITH;
newItem._iIdentified = true;
newItem._iStatFlag = MyPlayer->CanUseItem(newItem);
}
for (int i = iCnt; i < SMITH_ITEMS; i++)
smithitem[i]._itype = ItemType::None;
@ -4521,8 +4466,6 @@ void SpawnWitch(int lvl)
GetItemAttrs(item, bookType, lvl);
item._iCreateInfo = lvl | CF_WITCH;
item._iIdentified = true;
WitchBookLevel(item);
item._iStatFlag = MyPlayer->CanUseItem(item);
bookCount++;
continue;
}
@ -4551,8 +4494,6 @@ void SpawnWitch(int lvl)
item._iCreateInfo = lvl | CF_WITCH;
item._iIdentified = true;
WitchBookLevel(item);
item._iStatFlag = MyPlayer->CanUseItem(item);
}
SortVendor(witchitem + PinnedItemCount);
@ -4669,7 +4610,6 @@ void SpawnBoy(int lvl)
&& count < 250));
boyitem._iCreateInfo = lvl | CF_BOY;
boyitem._iIdentified = true;
boyitem._iStatFlag = MyPlayer->CanUseItem(boyitem);
boylevel = lvl / 2;
}
@ -4702,7 +4642,6 @@ void SpawnHealer(int lvl)
GetItemAttrs(item, itype, lvl);
item._iCreateInfo = lvl | CF_HEALER;
item._iIdentified = true;
item._iStatFlag = MyPlayer->CanUseItem(item);
}
SortVendor(healitem + PinnedItemCount);

5
Source/pack.cpp
Unescape View File

@ -275,11 +275,6 @@ bool UnPackPlayer(const PlayerPack *pPack, Player &player, bool netSync)
UnPackItem(packedItem, player.SpdList[i], isHellfire);
}
if (&player == &Players[MyPlayerId]) {
for (int i = 0; i < 20; i++)
witchitem[i]._itype = ItemType::None;
}
CalcPlrInv(player, false);
player.wReflections = SDL_SwapLE16(pPack->wReflections);
player.pTownWarps = 0;

47
Source/stores.cpp
Unescape View File

@ -365,7 +365,11 @@ void StartSmithBuy()
AddItemListBackButton();
storenumh = 0;
for (int i = 0; !smithitem[i].isEmpty(); i++) {
for (Item &item : smithitem) {
if (item.isEmpty())
continue;
item._iStatFlag = MyPlayer->CanUseItem(item);
storenumh++;
}
@ -402,9 +406,12 @@ void ScrollSmithPremiumBuy(int boughtitems)
bool StartSmithPremiumBuy()
{
storenumh = 0;
for (const auto &item : premiumitems) {
if (!item.isEmpty())
storenumh++;
for (Item &item : premiumitems) {
if (item.isEmpty())
continue;
item._iStatFlag = MyPlayer->CanUseItem(item);
storenumh++;
}
if (storenumh == 0) {
StartStore(STORE_SMITH);
@ -703,6 +710,22 @@ void ScrollWitchBuy(int idx)
stextsel = stextdown;
}
void WitchBookLevel(Item &bookItem)
{
if (bookItem._iMiscId != IMISC_BOOK)
return;
bookItem._iMinMag = spelldata[bookItem._iSpell].sMinInt;
int8_t spellLevel = Players[MyPlayerId]._pSplLvl[bookItem._iSpell];
while (spellLevel > 0) {
bookItem._iMinMag += 20 * bookItem._iMinMag / 100;
spellLevel--;
if (bookItem._iMinMag + 20 * bookItem._iMinMag / 100 > 255) {
bookItem._iMinMag = 255;
spellLevel = 0;
}
}
}
void StartWitchBuy()
{
stextsize = true;
@ -719,7 +742,12 @@ void StartWitchBuy()
AddItemListBackButton();
storenumh = 0;
for (int i = 0; !witchitem[i].isEmpty(); i++) {
for (Item &item : witchitem) {
if (item.isEmpty())
continue;
WitchBookLevel(item);
item._iStatFlag = MyPlayer->CanUseItem(item);
storenumh++;
}
stextsmax = std::max(storenumh - 4, 0);
@ -1004,12 +1032,13 @@ void SStartBoyBuy()
stextscrl = false;
/* TRANSLATORS: This text is white space sensitive. Check for correct alignment! */
strcpy(tempstr, fmt::format(_("I have this item for sale: Your gold: {:d}"), Players[MyPlayerId]._pGold).c_str());
strcpy(tempstr, fmt::format(_("I have this item for sale: Your gold: {:d}"), MyPlayer->_pGold).c_str());
AddSText(0, 1, tempstr, UiFlags::ColorWhitegold | UiFlags::AlignCenter, false);
AddSLine(3);
UiFlags itemColor = boyitem.getTextColorWithStatCheck();
boyitem._iStatFlag = MyPlayer->CanUseItem(boyitem);
if (boyitem._iMagical != ITEM_QUALITY_NORMAL)
AddSText(20, 10, boyitem._iIName, itemColor, true);
@ -1095,7 +1124,11 @@ void StartHealerBuy()
AddItemListBackButton();
storenumh = 0;
for (int i = 0; !healitem[i].isEmpty(); i++) {
for (Item &item : healitem) {
if (item.isEmpty())
continue;
item._iStatFlag = MyPlayer->CanUseItem(item);
storenumh++;
}

Write Preview
Loading…
Cancel
Save