Reworked player attribute types.

Started showing proper attribute values in character sheet.

OpenTESArena/CMakeLists.txt

@@ -478,17 +478,8 @@ SET(TES_SKY
     "${SRC_ROOT}/Sky/SkyVisibilityManager.h")
 
 SET(TES_STATS
-    "${SRC_ROOT}/Stats/AttributeModifier.cpp"
-    "${SRC_ROOT}/Stats/AttributeModifier.h"
-    "${SRC_ROOT}/Stats/AttributeModifierName.h"
-    "${SRC_ROOT}/Stats/DerivedAttribute.cpp"
-    "${SRC_ROOT}/Stats/DerivedAttribute.h"
-    "${SRC_ROOT}/Stats/DerivedAttributeName.h"
     "${SRC_ROOT}/Stats/PrimaryAttribute.cpp"
-    "${SRC_ROOT}/Stats/PrimaryAttribute.h"
-    "${SRC_ROOT}/Stats/PrimaryAttributeName.h"
-    "${SRC_ROOT}/Stats/PrimaryAttributeSet.cpp"
-    "${SRC_ROOT}/Stats/PrimaryAttributeSet.h")
+    "${SRC_ROOT}/Stats/PrimaryAttribute.h")
 
 SET(TES_TIME
     "${SRC_ROOT}/Time/ArenaClockUtils.cpp"

OpenTESArena/src/Assets/ExeData.cpp

@@ -360,6 +360,7 @@ bool ExeData::Entities::init(const char *data, const KeyValueFile &keyValueFile)
 		return false;
 	}
 
+	const int attributeNamesOffset = ExeData::get(*section, "AttributeNames");
 	const int creatureNamesOffset = ExeData::get(*section, "CreatureNames");
 	const int creatureLevelsOffset = ExeData::get(*section, "CreatureLevels");
 	const int creatureHitPointsOffset = ExeData::get(*section, "CreatureHitPoints");
@@ -389,6 +390,7 @@ bool ExeData::Entities::init(const char *data, const KeyValueFile &keyValueFile)
 	const int citizenColorBaseOffset = ExeData::get(*section, "CitizenColorBase");
 	const int citizenSkinColorsOffset = ExeData::get(*section, "CitizenSkinColors");
 
+	initStringArray(this->attributeNames, data + attributeNamesOffset);
 	initStringArray(this->creatureNames, data + creatureNamesOffset);
 	initInt8Array(this->creatureLevels, data + creatureLevelsOffset);
 	initInt16PairArray(this->creatureHitPoints, data + creatureHitPointsOffset);

OpenTESArena/src/Assets/ExeData.h

@@ -124,6 +124,8 @@ class ExeData
 
 	struct Entities
 	{
+		std::array<std::string, 8> attributeNames; // Strength, ... Luck.
+
 		// Creature races are 1-based.
 		std::array<std::string, 23> creatureNames; // Rat, Goblin, ...
 		std::array<uint8_t, 24> creatureLevels; // Zero-based, as with the player.

OpenTESArena/src/Entities/Player.cpp

@@ -21,7 +21,6 @@
 #include "../Math/Constants.h"
 #include "../Math/Quaternion.h"
 #include "../Math/Random.h"
-#include "../Stats/PrimaryAttributeName.h"
 #include "../Voxels/VoxelChunkManager.h"
 #include "../World/CardinalDirection.h"
 
@@ -165,7 +164,7 @@ void Player::init(const std::string &displayName, bool male, int raceID, int cha
 	this->portraitID = portraitID;
 	this->maxWalkSpeed = maxWalkSpeed;
 	this->weaponAnimation.init(weaponID, exeData);
-	this->attributes.init(raceID, male, random);
+	this->primaryAttributes.init(raceID, male, exeData);
 	this->inventory.clear();
 
 	if (!TryCreatePhysicsCharacters(physicsSystem, &this->physicsCharacter, &this->physicsCharacterVirtual, &this->physicsCharVsCharCollision))
@@ -179,7 +178,7 @@ void Player::init(const std::string &displayName, bool male, int raceID, int cha
 }
 
 void Player::init(const std::string &displayName, bool male, int raceID, int charClassDefID,
-	PrimaryAttributeSet &&attributes, int portraitID, const CoordDouble3 &position, const Double3 &direction,
+	const PrimaryAttributes &primaryAttributes, int portraitID, const CoordDouble3 &position, const Double3 &direction,
 	const Double3 &velocity, double maxWalkSpeed, int weaponID, const ExeData &exeData, JPH::PhysicsSystem &physicsSystem)
 {
 	this->displayName = displayName;
@@ -189,8 +188,8 @@ void Player::init(const std::string &displayName, bool male, int raceID, int cha
 	this->charClassDefID = charClassDefID;
 	this->portraitID = portraitID;
 	this->maxWalkSpeed = maxWalkSpeed;
-	this->weaponAnimation.init(weaponID, exeData);
-	this->attributes = std::move(attributes);
+	this->weaponAnimation.init(weaponID, exeData);	
+	this->primaryAttributes = primaryAttributes;
 	this->inventory.clear();
 
 	if (!TryCreatePhysicsCharacters(physicsSystem, &this->physicsCharacter, &this->physicsCharacterVirtual, &this->physicsCharVsCharCollision))
@@ -216,8 +215,7 @@ void Player::initRandom(const CharacterClassLibrary &charClassLibrary, const Exe
 	const CharacterClassDefinition &charClassDef = charClassLibrary.getDefinition(this->charClassDefID);
 	const int weaponID = GetRandomWeaponIdForClass(charClassDef, random);
 	this->weaponAnimation.init(weaponID, exeData);
-	this->attributes.init(this->raceID, this->male, random);
-
+	this->primaryAttributes.init(this->raceID, this->male, exeData);	
 	this->inventory.clear();
 	const ItemLibrary &itemLibrary = ItemLibrary::getInstance();
 	for (int i = 0; i < itemLibrary.getCount(); i++)

OpenTESArena/src/Entities/Player.h

@@ -10,7 +10,7 @@
 #include "../Assets/MIFUtils.h"
 #include "../Items/ItemInventory.h"
 #include "../Math/MathUtils.h"
-#include "../Stats/PrimaryAttributeSet.h"
+#include "../Stats/PrimaryAttribute.h"
 #include "../World/Coord.h"
 
 class CharacterClassLibrary;
@@ -52,7 +52,7 @@ struct Player
 	int portraitID;
 	double maxWalkSpeed; // Eventually a function of 'Speed' attribute
 	WeaponAnimation weaponAnimation;
-	PrimaryAttributeSet attributes;
+	PrimaryAttributes primaryAttributes;
 	ItemInventory inventory;
 
 	Player();
@@ -64,7 +64,7 @@ struct Player
 		double maxWalkSpeed, int weaponID, const ExeData &exeData, JPH::PhysicsSystem &physicsSystem, Random &random);
 
 	// Make player with given attributes.
-	void init(const std::string &displayName, bool male, int raceID, int charClassDefID, PrimaryAttributeSet &&attributes,
+	void init(const std::string &displayName, bool male, int raceID, int charClassDefID, const PrimaryAttributes &primaryAttributes,
 		int portraitID, const CoordDouble3 &position, const Double3 &direction, const Double3 &velocity,
 		double maxWalkSpeed, int weaponID, const ExeData &exeData, JPH::PhysicsSystem &physicsSystem);
 

OpenTESArena/src/Game/CharacterCreationState.cpp

@@ -1,6 +1,7 @@
 #include <cstdio>
 
 #include "CharacterCreationState.h"
+#include "../Assets/BinaryAssetLibrary.h"
 
 #include "components/debug/Debug.h"
 
@@ -24,7 +25,7 @@ int CharacterCreationState::getRaceIndex() const
 	return this->raceIndex;
 }
 
-const PrimaryAttributeSet &CharacterCreationState::getAttributes() const
+const PrimaryAttributes &CharacterCreationState::getAttributes() const
 {
 	return this->attributes;
 }
@@ -56,7 +57,9 @@ void CharacterCreationState::setRaceIndex(int index)
 
 void CharacterCreationState::rollAttributes(Random &random)
 {
-	this->attributes.init(this->raceIndex, this->male, random);
+	const BinaryAssetLibrary &binaryAssetLibrary = BinaryAssetLibrary::getInstance();
+	const ExeData &exeData = binaryAssetLibrary.getExeData();
+	this->attributes.init(this->raceIndex, this->male, exeData);
 }
 
 void CharacterCreationState::setPortraitIndex(int index)

OpenTESArena/src/Game/CharacterCreationState.h

@@ -6,7 +6,7 @@
 #include <string_view>
 
 #include "../Math/Random.h"
-#include "../Stats/PrimaryAttributeSet.h"
+#include "../Stats/PrimaryAttribute.h"
 
 class CharacterCreationState
 {
@@ -20,14 +20,14 @@ class CharacterCreationState
 	int raceIndex;
 	int portraitIndex;
 	bool male;
-	PrimaryAttributeSet attributes;
+	PrimaryAttributes attributes;
 public:
 	CharacterCreationState();
 
 	const std::string_view getName() const;
 	int getClassDefID() const;
 	int getRaceIndex() const;
-	const PrimaryAttributeSet &getAttributes() const;
+	const PrimaryAttributes &getAttributes() const;
 	int getPortraitIndex() const;
 	bool isMale() const;
 

OpenTESArena/src/Interface/CharacterCreationUiController.cpp

@@ -558,15 +558,15 @@ void ChooseAttributesUiController::onSavedDoneButtonSelected(Game &game)
 		const int charClassDefID = charCreationState.getClassDefID();
 		const auto &charClassDef = charClassLibrary.getDefinition(charClassDefID);
 
-		PrimaryAttributeSet attributes = charCreationState.getAttributes();
+		const PrimaryAttributes &attributes = charCreationState.getAttributes();
 
 		const int portraitIndex = charCreationState.getPortraitIndex();
 
 		const int allowedWeaponCount = charClassDef.getAllowedWeaponCount();
 		const int weaponID = charClassDef.getAllowedWeapon(game.random.next(allowedWeaponCount));
 
 		Player &player = game.player;
-		player.init(std::string(name), male, raceIndex, charClassDefID, std::move(attributes), portraitIndex,
+		player.init(std::string(name), male, raceIndex, charClassDefID, attributes, portraitIndex,
 			dummyPosition, direction, velocity, PlayerConstants::DEFAULT_WALK_SPEED, weaponID, exeData, game.physicsSystem);
 	};
 

OpenTESArena/src/Interface/CharacterCreationUiModel.cpp

@@ -35,11 +35,11 @@ std::string CharacterCreationUiModel::getPlayerClassName(Game &game)
 	return charClassDef.getName();
 }
 
-std::vector<PrimaryAttribute> CharacterCreationUiModel::getPlayerAttributes(Game &game)
+const PrimaryAttributes &CharacterCreationUiModel::getPlayerAttributes(Game &game)
 {
 	const CharacterCreationState &charCreationState = game.getCharacterCreationState();
-	const PrimaryAttributeSet &attributeSet = charCreationState.getAttributes();
-	return attributeSet.getAll();
+	const PrimaryAttributes &attributes = charCreationState.getAttributes();
+	return attributes;
 }
 
 std::string ChooseClassCreationUiModel::getTitleText(Game &game)

OpenTESArena/src/Interface/CharacterCreationUiModel.h

@@ -17,7 +17,7 @@ namespace CharacterCreationUiModel
 	std::string getPlayerName(Game &game);
 	std::string getPlayerRaceName(Game &game);
 	std::string getPlayerClassName(Game &game);
-	std::vector<PrimaryAttribute> getPlayerAttributes(Game &game);
+	const PrimaryAttributes &getPlayerAttributes(Game &game);
 }
 
 namespace ChooseClassCreationUiModel

OpenTESArena/src/Interface/CharacterPanel.cpp

@@ -10,7 +10,6 @@
 #include "../Input/InputActionMapName.h"
 #include "../Input/InputActionName.h"
 #include "../Stats/PrimaryAttribute.h"
-#include "../Stats/PrimaryAttributeName.h"
 #include "../UI/CursorData.h"
 #include "../UI/FontLibrary.h"
 
@@ -58,20 +57,19 @@ bool CharacterPanel::init()
 		return false;
 	}
 
-	const std::vector<PrimaryAttribute> playerAttributes = CharacterSheetUiModel::getPlayerAttributes(game);
-	const std::map<PrimaryAttributeName, TextBox::InitInfo> playerAttributesTextBoxInitInfoMap =
-		CharacterSheetUiView::getPlayerAttributeTextBoxInitInfoMap(playerAttributes, fontLibrary);
-	for (const PrimaryAttribute &attribute : playerAttributes)
+	const PrimaryAttributes &playerAttributes = CharacterSheetUiModel::getPlayerAttributes(game);
+	const BufferView<const PrimaryAttribute> playerAttributesView = playerAttributes.getAttributes();
+	const std::vector<TextBox::InitInfo> playerAttributesTextBoxInitInfos = CharacterSheetUiView::getPlayerAttributeTextBoxInitInfos(playerAttributesView, fontLibrary);
+	for (int i = 0; i < playerAttributesView.getCount(); i++)
 	{
-		const int attributeValue = attribute.get();
+		const PrimaryAttribute &attribute = playerAttributesView.get(i);
+		const int attributeValue = attribute.maxValue;
 		const std::string attributeValueText = std::to_string(attributeValue);
-		const PrimaryAttributeName attributeName = attribute.getAttributeName();
-		const TextBox::InitInfo attributeTextBoxInitInfo = playerAttributesTextBoxInitInfoMap.at(attributeName);
-		this->playerAttributeTextBoxes.emplace_back(TextBox());
-		if (!this->playerAttributeTextBoxes.back().init(attributeTextBoxInitInfo, attributeValueText, renderer))
+		DebugAssertIndex(playerAttributesTextBoxInitInfos, i);
+		const TextBox::InitInfo &attributeTextBoxInitInfo = playerAttributesTextBoxInitInfos[i];
+		if (!this->playerAttributeTextBoxes[i].init(attributeTextBoxInitInfo, attributeValueText, renderer))
 		{
-			const std::string attributeNameText = attribute.toString();
-			DebugLogError("Couldn't init player " + attributeNameText + " text box.");
+			DebugLogError("Couldn't init player attribute " + std::string(attribute.name) + " text box.");
 			return false;
 		}
 	}
@@ -173,11 +171,11 @@ bool CharacterPanel::init()
 		Int2(playerClassTextBoxRect.getWidth(), playerClassTextBoxRect.getHeight()),
 		PivotType::TopLeft);
 
-	for (int i = 0; i < this->playerAttributeTextBoxes.size(); i++)
+	for (TextBox &playerAttributeTextBox : this->playerAttributeTextBoxes)
 	{
-		const Rect &playerAttributeTextBoxRect = this->playerAttributeTextBoxes[i].getRect();
+		const Rect &playerAttributeTextBoxRect = playerAttributeTextBox.getRect();
 		this->addDrawCall(
-			this->playerAttributeTextBoxes[i].getTextureID(),
+			playerAttributeTextBox.getTextureID(),
 			playerAttributeTextBoxRect.getTopLeft(),
 			Int2(playerAttributeTextBoxRect.getWidth(), playerAttributeTextBoxRect.getHeight()),
 			PivotType::TopLeft);

OpenTESArena/src/Interface/CharacterPanel.h

@@ -1,22 +1,20 @@
 #ifndef CHARACTER_PANEL_H
 #define CHARACTER_PANEL_H
 
-#include <vector>
-
 #include "Panel.h"
+#include "../Stats/PrimaryAttribute.h"
 #include "../UI/Button.h"
 #include "../UI/TextBox.h"
 
 class Renderer;
-class TextBox;
 
 // The character portrait panel that shows the player's attributes and derived stats.
 // @todo Maybe rename this to "CharacterStatsPanel"?
 class CharacterPanel : public Panel
 {
 private:
 	TextBox playerNameTextBox, playerRaceTextBox, playerClassTextBox;
-	std::vector<TextBox> playerAttributeTextBoxes;
+	TextBox playerAttributeTextBoxes[PrimaryAttributes::COUNT];
 	Button<Game&> doneButton, nextPageButton;
 	ScopedUiTextureRef bodyTextureRef, headTextureRef, shirtTextureRef, pantsTextureRef,
 		statsBgTextureRef, nextPageTextureRef, cursorTextureRef;

OpenTESArena/src/Interface/CharacterSheetUiModel.cpp

@@ -33,8 +33,7 @@ std::string CharacterSheetUiModel::getPlayerClassName(Game &game)
 	return charClassDef.getName();
 }
 
-std::vector<PrimaryAttribute> CharacterSheetUiModel::getPlayerAttributes(Game &game)
+const PrimaryAttributes &CharacterSheetUiModel::getPlayerAttributes(Game &game)
 {
-	const Player &player = game.player;
-	return player.attributes.getAll();
+	return game.player.primaryAttributes;
 }

OpenTESArena/src/Interface/CharacterSheetUiModel.h

@@ -13,7 +13,7 @@ namespace CharacterSheetUiModel
 	std::string getPlayerName(Game &game);
 	std::string getPlayerRaceName(Game &game);
 	std::string getPlayerClassName(Game &game);
-	std::vector<PrimaryAttribute> getPlayerAttributes(Game &game);
+	const PrimaryAttributes &getPlayerAttributes(Game &game);
 }
 
 #endif

OpenTESArena/src/Interface/CharacterSheetUiView.cpp

@@ -9,7 +9,6 @@
 #include "../Entities/CharacterClassLibrary.h"
 #include "../Game/Game.h"
 #include "../Stats/PrimaryAttribute.h"
-#include "../Stats/PrimaryAttributeName.h"
 
 TextBox::InitInfo CharacterSheetUiView::getPlayerNameTextBoxInitInfo(const std::string_view text,
 	const FontLibrary &fontLibrary)
@@ -50,16 +49,14 @@ TextBox::InitInfo CharacterSheetUiView::getPlayerClassTextBoxInitInfo(const std:
 		fontLibrary);
 }
 
-std::map<PrimaryAttributeName, TextBox::InitInfo> CharacterSheetUiView::getPlayerAttributeTextBoxInitInfoMap(
-	BufferView<const PrimaryAttribute> attributes, const FontLibrary &fontLibrary)
+std::vector<TextBox::InitInfo> CharacterSheetUiView::getPlayerAttributeTextBoxInitInfos(BufferView<const PrimaryAttribute> attributes, const FontLibrary &fontLibrary)
 {
-	std::map<PrimaryAttributeName, TextBox::InitInfo> textBoxInitInfoMap;
+	std::vector<TextBox::InitInfo> textBoxInitInfos;
 
 	for (int i = 0; i < attributes.getCount(); i++)
 	{
 		const PrimaryAttribute &attribute = attributes[i];
-		const PrimaryAttributeName attributeName = attribute.getAttributeName();
-		const int attributeValue = attribute.get();
+		const int attributeValue = attribute.maxValue;
 		const std::string attributeValueStr = std::to_string(attributeValue);
 		TextBox::InitInfo initInfo = TextBox::InitInfo::makeWithXY(
 			attributeValueStr,
@@ -70,10 +67,10 @@ std::map<PrimaryAttributeName, TextBox::InitInfo> CharacterSheetUiView::getPlaye
 			CharacterSheetUiView::PlayerAttributeTextBoxAlignment,
 			fontLibrary);
 
-		textBoxInitInfoMap.emplace(attributeName, std::move(initInfo));
+		textBoxInitInfos.emplace_back(std::move(initInfo));
 	}
 
-	return textBoxInitInfoMap;
+	return textBoxInitInfos;
 }
 
 Int2 CharacterSheetUiView::getBodyOffset(Game &game)

OpenTESArena/src/Interface/CharacterSheetUiView.h

@@ -10,7 +10,6 @@
 #include "../Rendering/ArenaRenderUtils.h"
 #include "../Rendering/RenderTextureUtils.h"
 #include "../Stats/PrimaryAttribute.h"
-#include "../Stats/PrimaryAttributeName.h"
 #include "../UI/ArenaFontName.h"
 #include "../UI/TextAlignment.h"
 #include "../UI/TextBox.h"
@@ -50,8 +49,7 @@ namespace CharacterSheetUiView
 	TextBox::InitInfo getPlayerNameTextBoxInitInfo(const std::string_view text, const FontLibrary &fontLibrary);
 	TextBox::InitInfo getPlayerRaceTextBoxInitInfo(const std::string_view text, const FontLibrary &fontLibrary);
 	TextBox::InitInfo getPlayerClassTextBoxInitInfo(const std::string_view text, const FontLibrary &fontLibrary);
-	std::map<PrimaryAttributeName, TextBox::InitInfo> getPlayerAttributeTextBoxInitInfoMap(
-		BufferView<const PrimaryAttribute> attributes, const FontLibrary &fontLibrary);
+	std::vector<TextBox::InitInfo> getPlayerAttributeTextBoxInitInfos(BufferView<const PrimaryAttribute> attributes, const FontLibrary &fontLibrary);
 
 	const Int2 DoneButtonCenterPoint(25, ArenaRenderUtils::SCREEN_HEIGHT - 15);
 	constexpr int DoneButtonWidth = 21;