Skip to content

Commit

Permalink
PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@captainurist
captainurist committed Sep 19, 2023
1 parent a5a8f97 commit 6125e13
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/Engine/Engine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ void Engine::_461103_load_level_sub() {
pActors[i].monsterInfo.uID <= MONSTER_PEASANT_GOBLIN_MALE_3_3)
v17 = 1;
// v1 = 0;
v4 = (std::to_underlying(pActors[i].monsterInfo.uID) - 1) % 3; // TODO(captainurist): what is this std::to_underlying doing?
v4 = (std::to_underlying(pActors[i].monsterInfo.uID) - 1) % 3; // TODO(captainurist): encapsulate monster tier calculation.
if (2 == v4) {
if (pActors[i].npcId && pActors[i].npcId < 5000) continue;
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/GUI/GUIEnums.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,6 @@ enum class ShopScreen {
SHOP_SCREEN_SELL = 3,
SHOP_SCREEN_IDENTIFY = 4,
SHOP_SCREEN_REPAIR = 5,
SHOP_SCREEN_SELL_FOR_CHEAP = 6, // Sell for half the price, doesn't seem to be used in the game. MM6 remnant?
SHOP_SCREEN_SELL_FOR_CHEAP = 6, // Sell for half the price, was used in MM6 general store, not used in MM7.
};
using enum ShopScreen;
26 changes: 13 additions & 13 deletions src/GUI/UI/Houses/Shops.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct ITEM_VARIATION {
std::array<RandomItemType, 4> item_class;
};

static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_WEAPON_SHOP, HOUSE_LAST_WEAPON_SHOP> weaponShopVariationStandart = {{
static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_WEAPON_SHOP, HOUSE_LAST_WEAPON_SHOP> weaponShopVariationStandard = {{
{HOUSE_WEAPON_SHOP_EMERALD_ISLAND, { ITEM_TREASURE_LEVEL_1, { RANDOM_ITEM_SWORD, RANDOM_ITEM_BOW, RANDOM_ITEM_WEAPON, RANDOM_ITEM_WEAPON } }},
{HOUSE_WEAPON_SHOP_HARMONDALE, { ITEM_TREASURE_LEVEL_1, { RANDOM_ITEM_SWORD, RANDOM_ITEM_DAGGER, RANDOM_ITEM_MACE, RANDOM_ITEM_WEAPON } }},
{HOUSE_WEAPON_SHOP_ERATHIA, { ITEM_TREASURE_LEVEL_2, { RANDOM_ITEM_SWORD, RANDOM_ITEM_DAGGER, RANDOM_ITEM_AXE, RANDOM_ITEM_WEAPON } }},
Expand Down Expand Up @@ -73,7 +73,7 @@ static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_WEAPON_SHOP, HOUSE_LAS
{HOUSE_14, { ITEM_TREASURE_LEVEL_4, { RANDOM_ITEM_MACE, RANDOM_ITEM_AXE, RANDOM_ITEM_MACE, RANDOM_ITEM_CLUB } }}
}};

static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_ARMOR_SHOP, HOUSE_LAST_ARMOR_SHOP> armorShopTopRowVariationStandart = {{
static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_ARMOR_SHOP, HOUSE_LAST_ARMOR_SHOP> armorShopTopRowVariationStandard = {{
{HOUSE_ARMOR_SHOP_EMERALD_ISLAND, { ITEM_TREASURE_LEVEL_1, { RANDOM_ITEM_HELMET, RANDOM_ITEM_HELMET, RANDOM_ITEM_GAUNTLETS, RANDOM_ITEM_GAUNTLETS } }},
{HOUSE_ARMOR_SHOP_HARMONDALE, { ITEM_TREASURE_LEVEL_1, { RANDOM_ITEM_HELMET, RANDOM_ITEM_HELMET, RANDOM_ITEM_GAUNTLETS, RANDOM_ITEM_GAUNTLETS } }},
{HOUSE_ARMOR_SHOP_ERATHIA, { ITEM_TREASURE_LEVEL_2, { RANDOM_ITEM_HELMET, RANDOM_ITEM_HELMET, RANDOM_ITEM_GAUNTLETS, RANDOM_ITEM_GAUNTLETS } }},
Expand All @@ -90,7 +90,7 @@ static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_ARMOR_SHOP, HOUSE_LAST
{HOUSE_28, { ITEM_TREASURE_LEVEL_4, { RANDOM_ITEM_HELMET, RANDOM_ITEM_HELMET, RANDOM_ITEM_GAUNTLETS, RANDOM_ITEM_GAUNTLETS } }}
}};

static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_ARMOR_SHOP, HOUSE_LAST_ARMOR_SHOP> armorShopBottomRowVariationStandart = {{
static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_ARMOR_SHOP, HOUSE_LAST_ARMOR_SHOP> armorShopBottomRowVariationStandard = {{
{HOUSE_ARMOR_SHOP_EMERALD_ISLAND, { ITEM_TREASURE_LEVEL_1, { RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_SHIELD } }},
{HOUSE_ARMOR_SHOP_HARMONDALE, { ITEM_TREASURE_LEVEL_1, { RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_SHIELD } }},
{HOUSE_ARMOR_SHOP_ERATHIA, { ITEM_TREASURE_LEVEL_2, { RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_LEATHER_ARMOR, RANDOM_ITEM_PLATE_ARMOR } }},
Expand Down Expand Up @@ -141,7 +141,7 @@ static constexpr IndexedArray<ITEM_VARIATION, HOUSE_FIRST_ARMOR_SHOP, HOUSE_LAST
{HOUSE_28, { ITEM_TREASURE_LEVEL_5, { RANDOM_ITEM_PLATE_ARMOR, RANDOM_ITEM_PLATE_ARMOR, RANDOM_ITEM_PLATE_ARMOR, RANDOM_ITEM_PLATE_ARMOR } }}
}};

static constexpr IndexedArray<ItemTreasureLevel, HOUSE_FIRST_MAGIC_SHOP, HOUSE_LAST_MAGIC_SHOP> magicShopVariationStandart = {{
static constexpr IndexedArray<ItemTreasureLevel, HOUSE_FIRST_MAGIC_SHOP, HOUSE_LAST_MAGIC_SHOP> magicShopVariationStandard = {{
{HOUSE_MAGIC_SHOP_EMERALD_ISLAND, ITEM_TREASURE_LEVEL_1},
{HOUSE_MAGIC_SHOP_HARMONDALE, ITEM_TREASURE_LEVEL_1},
{HOUSE_MAGIC_SHOP_ERATHIA, ITEM_TREASURE_LEVEL_2},
Expand Down Expand Up @@ -173,7 +173,7 @@ static constexpr IndexedArray<ItemTreasureLevel, HOUSE_FIRST_MAGIC_SHOP, HOUSE_L
{HOUSE_41, ITEM_TREASURE_LEVEL_3}
}};

static constexpr IndexedArray<ItemTreasureLevel, HOUSE_FIRST_ALCHEMY_SHOP, HOUSE_LAST_ALCHEMY_SHOP> alchemyShopVariationStandart = {{
static constexpr IndexedArray<ItemTreasureLevel, HOUSE_FIRST_ALCHEMY_SHOP, HOUSE_LAST_ALCHEMY_SHOP> alchemyShopVariationStandard = {{
{HOUSE_ALCHEMY_SHOP_EMERALD_ISLAND, ITEM_TREASURE_LEVEL_1},
{HOUSE_ALCHEMY_SHOP_HARMONDALE, ITEM_TREASURE_LEVEL_1},
{HOUSE_ALCHEMY_SHOP_ERATHIA, ITEM_TREASURE_LEVEL_2},
Expand Down Expand Up @@ -634,7 +634,7 @@ void GUIWindow_MagicAlchemyShop::shopWaresDialogue(bool isSpecial) {

void GUIWindow_WeaponShop::generateShopItems(bool isSpecial) {
std::array<ItemGen, 12> &itemArray = isSpecial ? pParty->specialItemsInShops[houseId()] : pParty->standartItemsInShops[houseId()];
const ITEM_VARIATION variation = isSpecial ? weaponShopVariationSpecial[houseId()] : weaponShopVariationStandart[houseId()];
const ITEM_VARIATION variation = isSpecial ? weaponShopVariationSpecial[houseId()] : weaponShopVariationStandard[houseId()];

for (int i = 0; i < itemAmountInShop[buildingType()]; i++) {
RandomItemType itemClass = variation.item_class[grng->random(4)];
Expand All @@ -647,8 +647,8 @@ void GUIWindow_WeaponShop::generateShopItems(bool isSpecial) {

void GUIWindow_ArmorShop::generateShopItems(bool isSpecial) {
std::array<ItemGen, 12> &itemArray = isSpecial ? pParty->specialItemsInShops[houseId()] : pParty->standartItemsInShops[houseId()];
const ITEM_VARIATION variationTop = isSpecial ? armorShopTopRowVariationSpecial[houseId()] : armorShopTopRowVariationStandart[houseId()];
const ITEM_VARIATION variationBottom = isSpecial ? armorShopBottomRowVariationSpecial[houseId()] : armorShopBottomRowVariationStandart[houseId()];
const ITEM_VARIATION variationTop = isSpecial ? armorShopTopRowVariationSpecial[houseId()] : armorShopTopRowVariationStandard[houseId()];
const ITEM_VARIATION variationBottom = isSpecial ? armorShopBottomRowVariationSpecial[houseId()] : armorShopBottomRowVariationStandard[houseId()];

for (int i = 0; i < itemAmountInShop[buildingType()]; i++) {
RandomItemType itemClass;
Expand All @@ -670,7 +670,7 @@ void GUIWindow_ArmorShop::generateShopItems(bool isSpecial) {

void GUIWindow_MagicShop::generateShopItems(bool isSpecial) {
std::array<ItemGen, 12> &itemArray = isSpecial ? pParty->specialItemsInShops[houseId()] : pParty->standartItemsInShops[houseId()];
ItemTreasureLevel treasureLvl = isSpecial ? magicShopVariationSpecial[houseId()] : magicShopVariationStandart[houseId()];
ItemTreasureLevel treasureLvl = isSpecial ? magicShopVariationSpecial[houseId()] : magicShopVariationStandard[houseId()];

for (int i = 0; i < itemAmountInShop[buildingType()]; i++) {
pItemTable->generateItem(treasureLvl, RANDOM_ITEM_MICS, &itemArray[i]);
Expand All @@ -682,7 +682,7 @@ void GUIWindow_MagicShop::generateShopItems(bool isSpecial) {

void GUIWindow_AlchemyShop::generateShopItems(bool isSpecial) {
std::array<ItemGen, 12> &itemArray = isSpecial ? pParty->specialItemsInShops[houseId()] : pParty->standartItemsInShops[houseId()];
ItemTreasureLevel treasureLvl = isSpecial ? alchemyShopVariationSpecial[houseId()] : alchemyShopVariationStandart[houseId()];
ItemTreasureLevel treasureLvl = isSpecial ? alchemyShopVariationSpecial[houseId()] : alchemyShopVariationStandard[houseId()];
RandomItemType bottomRowItemClass = isSpecial ? RANDOM_ITEM_POTION : RANDOM_ITEM_REAGENT;

for (int i = 0; i < itemAmountInShop[buildingType()]; i++) {
Expand All @@ -706,7 +706,7 @@ std::vector<DIALOGUE_TYPE> GUIWindow_WeaponShop::listShopLearnableSkills() {
std::vector<RandomItemType> itemClasses;
std::vector<DIALOGUE_TYPE> skillsOptions;

addUniqueItemClasses(weaponShopVariationStandart[houseId()], itemClasses);
addUniqueItemClasses(weaponShopVariationStandard[houseId()], itemClasses);
addUniqueItemClasses(weaponShopVariationSpecial[houseId()], itemClasses);

for (RandomItemType itemClass : itemClasses) {
Expand All @@ -723,8 +723,8 @@ std::vector<DIALOGUE_TYPE> GUIWindow_ArmorShop::listShopLearnableSkills() {
std::vector<RandomItemType> itemClasses;
std::vector<DIALOGUE_TYPE> skillsOptions;

addUniqueItemClasses(armorShopTopRowVariationStandart[houseId()], itemClasses);
addUniqueItemClasses(armorShopBottomRowVariationStandart[houseId()], itemClasses);
addUniqueItemClasses(armorShopTopRowVariationStandard[houseId()], itemClasses);
addUniqueItemClasses(armorShopBottomRowVariationStandard[houseId()], itemClasses);
addUniqueItemClasses(armorShopTopRowVariationSpecial[houseId()], itemClasses);
addUniqueItemClasses(armorShopBottomRowVariationSpecial[houseId()], itemClasses);

Expand Down

0 comments on commit 6125e13

Please sign in to comment.