Started getting item equipping working.

afritz1 · Nov 15, 2024 · 9c4b703 · 9c4b703
1 parent f27438e
commit 9c4b703
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 15 deletions.
diff --git a/OpenTESArena/src/Interface/CharacterEquipmentPanel.cpp b/OpenTESArena/src/Interface/CharacterEquipmentPanel.cpp
@@ -69,6 +69,23 @@ bool CharacterEquipmentPanel::init()
 		auto &pair = elements[i];
 		this->inventoryListBox.add(std::move(pair.first));
 		this->inventoryListBox.setOverrideColor(i, pair.second);
+		this->inventoryListBox.setCallback(i,
+			[this, &game, i]()
+		{
+			ItemInventory &playerInventory = game.player.inventory;
+			ItemInstance &itemInst = playerInventory.getSlot(i);
+			itemInst.isEquipped = !itemInst.isEquipped;
+
+			const Color &equipColor = InventoryUiView::getItemDisplayColor(itemInst);
+			this->inventoryListBox.setOverrideColor(i, equipColor);
+		});
+
+		this->addButtonProxy(MouseButtonType::Left, this->inventoryListBox.getItemGlobalRect(i),
+			[this, i]()
+		{
+			const int firstVisibleIndex = this->inventoryListBox.getFirstVisibleItemIndex();
+			this->inventoryListBox.getCallback(firstVisibleIndex + i)();
+		});
 	}
 
 	this->backToStatsButton = Button<Game&>(
@@ -107,7 +124,7 @@ bool CharacterEquipmentPanel::init()
 	this->addButtonProxy(MouseButtonType::Left, this->dropButton.getRect(),
 		[this, &game]()
 	{
-		// @todo: give the index of the clicked item instead.
+		// @todo: give the index of the currently selected item instead.
 		const int itemIndex = 0;
 		this->dropButton.click(game, itemIndex);
 	});

diff --git a/OpenTESArena/src/Interface/InventoryUiModel.cpp b/OpenTESArena/src/Interface/InventoryUiModel.cpp
@@ -16,27 +16,22 @@ Buffer<InventoryUiModel::ItemUiDefinition> InventoryUiModel::getPlayerInventoryI
 {
 	const ItemLibrary &itemLibrary = ItemLibrary::getInstance();
 	const Player &player = game.player;
-
-	std::vector<const ItemDefinition*> itemDefs;
-	for (int i = 0; i < player.inventory.getTotalSlotCount(); i++)
+	const ItemInventory &playerInventory = player.inventory;
+	const int itemCount = playerInventory.getTotalSlotCount();
+	Buffer<ItemUiDefinition> buffer(itemCount);
+	for (int i = 0; i < itemCount; i++)
 	{
-		const ItemInstance &itemInst = player.inventory.getSlot(i);
-		if (itemInst.isValid())
+		const ItemInstance &itemInst = playerInventory.getSlot(i);
+		if (!itemInst.isValid())
 		{
-			const ItemDefinition &itemDef = itemLibrary.getDefinition(itemInst.defID);
-			itemDefs.emplace_back(&itemDef);
+			continue;
 		}
-	}
 
-	const int elementCount = static_cast<int>(itemDefs.size());
-	Buffer<ItemUiDefinition> buffer(elementCount);
-	for (int i = 0; i < elementCount; i++)
-	{
-		const ItemDefinition &itemDef = *itemDefs[i];
+		const ItemDefinition &itemDef = itemLibrary.getDefinition(itemInst.defID);
 
 		char itemDisplayName[64];
 		std::snprintf(std::begin(itemDisplayName), std::size(itemDisplayName), "%s (%.1fkg)", itemDef.getDisplayName().c_str(), itemDef.getWeight());
-		const Color &itemTextColor = InventoryUiView::PlayerInventoryEquipmentColor;
+		const Color &itemTextColor = InventoryUiView::getItemDisplayColor(itemInst);
 
 		ItemUiDefinition itemUiDef;
 		itemUiDef.init(itemDisplayName, itemTextColor);

diff --git a/OpenTESArena/src/Interface/InventoryUiView.cpp b/OpenTESArena/src/Interface/InventoryUiView.cpp
@@ -1,4 +1,5 @@
 #include "InventoryUiView.h"
+#include "../Items/ItemInstance.h"
 #include "../UI/ArenaFontName.h"
 #include "../UI/FontLibrary.h"
 #include "../UI/TextRenderUtils.h"
@@ -34,3 +35,17 @@ ListBox::Properties InventoryUiView::makePlayerInventoryListBoxProperties(const
 	return ListBox::Properties(fontDefIndex, &fontLibrary, textureGenInfo, fontDef.getCharacterHeight(),
 		InventoryUiView::PlayerInventoryEquipmentColor, scrollScale, rowSpacing);
 }
+
+const Color &InventoryUiView::getItemDisplayColor(const ItemInstance &itemInst)
+{
+	// @todo magic items
+
+	// @todo: class non-equippable items
+
+	if (itemInst.isEquipped)
+	{
+		return InventoryUiView::PlayerInventoryEquipmentEquippedColor;
+	}
+
+	return InventoryUiView::PlayerInventoryEquipmentColor;
+}
diff --git a/OpenTESArena/src/Interface/InventoryUiView.h b/OpenTESArena/src/Interface/InventoryUiView.h
@@ -7,6 +7,8 @@
 
 class FontLibrary;
 
+struct ItemInstance;
+
 namespace InventoryUiView
 {
 	const Rect PlayerInventoryRect(14, 50, 150, 75);
@@ -18,6 +20,8 @@ namespace InventoryUiView
 	const Color PlayerInventoryUnequipableColor(199, 32, 0);
 
 	ListBox::Properties makePlayerInventoryListBoxProperties(const FontLibrary &fontLibrary);
+
+	const Color &getItemDisplayColor(const ItemInstance &itemInst);
 }
 
 #endif
diff --git a/OpenTESArena/src/Items/ItemInstance.cpp b/OpenTESArena/src/Items/ItemInstance.cpp
@@ -3,11 +3,13 @@
 ItemInstance::ItemInstance()
 {
 	this->defID = -1;
+	this->isEquipped = false;
 }
 
 void ItemInstance::init(ItemDefinitionID defID)
 {
 	this->defID = defID;
+	this->isEquipped = false;
 }
 
 bool ItemInstance::isValid() const

diff --git a/OpenTESArena/src/Items/ItemInstance.h b/OpenTESArena/src/Items/ItemInstance.h
@@ -7,6 +7,7 @@
 struct ItemInstance
 {
 	ItemDefinitionID defID;
+	bool isEquipped;
 
 	ItemInstance();
 

diff --git a/OpenTESArena/src/UI/ListBox.cpp b/OpenTESArena/src/UI/ListBox.cpp
@@ -95,6 +95,11 @@ const ListBox::ItemCallback &ListBox::getCallback(int index) const
 	return this->items[index].callback;
 }
 
+int ListBox::getFirstVisibleItemIndex() const
+{
+	return static_cast<int>(this->scrollPixelOffset) / (this->properties.itemHeight + this->properties.itemSpacing);
+}
+
 UiTextureID ListBox::getTextureID()
 {
 	if (this->dirty)

diff --git a/OpenTESArena/src/UI/ListBox.h b/OpenTESArena/src/UI/ListBox.h
@@ -76,6 +76,8 @@ class ListBox
 	// falls within the list box rect.
 	const ItemCallback &getCallback(int index) const;
 
+	int getFirstVisibleItemIndex() const;
+
 	UiTextureID getTextureID();
 
 	void insert(int index, std::string &&text);