Fixed issue where Archery actor value did not convert to "Marksman" string

Fixed issue where Speech actor value did not convert to "Speechcraft" string

Author: fireundubh

src/Papyrus/ActorValueHelper.cpp

@@ -2,347 +2,6 @@
 
 namespace ActorValueHelper
 {
-	auto StringToActorValue(const RE::BSFixedString& a_string) -> RE::ActorValue
-	{
-		std::string S(a_string);
-
-		std::transform(S.begin(), S.end(), S.begin(),
-					   [](unsigned char c) { return std::tolower(c); });
-
-		if (S == "none")
-			return RE::ActorValue::kNone;
-		if (S == "aggression")
-			return RE::ActorValue::kAggresion;
-		if (S == "confidence")
-			return RE::ActorValue::kConfidence;
-		if (S == "energy")
-			return RE::ActorValue::kEnergy;
-		if (S == "morality")
-			return RE::ActorValue::kMorality;
-		if (S == "mood")
-			return RE::ActorValue::kMood;
-		if (S == "assistance")
-			return RE::ActorValue::kAssistance;
-		if (S == "onehanded")
-			return RE::ActorValue::kOneHanded;
-		if (S == "twohanded")
-			return RE::ActorValue::kTwoHanded;
-		if (S == "archery")
-			return RE::ActorValue::kArchery;
-		if (S == "block")
-			return RE::ActorValue::kBlock;
-		if (S == "smithing")
-			return RE::ActorValue::kSmithing;
-		if (S == "heavyarmor")
-			return RE::ActorValue::kHeavyArmor;
-		if (S == "lightarmor")
-			return RE::ActorValue::kLightArmor;
-		if (S == "pickpocket")
-			return RE::ActorValue::kPickpocket;
-		if (S == "lockpicking")
-			return RE::ActorValue::kLockpicking;
-		if (S == "sneak")
-			return RE::ActorValue::kSneak;
-		if (S == "alchemy")
-			return RE::ActorValue::kAlchemy;
-		if (S == "speech")
-			return RE::ActorValue::kSpeech;
-		if (S == "alteration")
-			return RE::ActorValue::kAlteration;
-		if (S == "conjuration")
-			return RE::ActorValue::kConjuration;
-		if (S == "destruction")
-			return RE::ActorValue::kDestruction;
-		if (S == "illusion")
-			return RE::ActorValue::kIllusion;
-		if (S == "restoration")
-			return RE::ActorValue::kRestoration;
-		if (S == "enchanting")
-			return RE::ActorValue::kEnchanting;
-		if (S == "health")
-			return RE::ActorValue::kHealth;
-		if (S == "magicka")
-			return RE::ActorValue::kMagicka;
-		if (S == "stamina")
-			return RE::ActorValue::kStamina;
-		if (S == "healrate")
-			return RE::ActorValue::kHealRate;
-		if (S == "magickarate")
-			return RE::ActorValue::kMagickaRate;
-		if (S == "staminarate")
-			return RE::ActorValue::KStaminaRate;
-		if (S == "speedmult")
-			return RE::ActorValue::kSpeedMult;
-		if (S == "inventoryweight")
-			return RE::ActorValue::kInventoryWeight;
-		if (S == "carryweight")
-			return RE::ActorValue::kCarryWeight;
-		if (S == "criticalchance")
-			return RE::ActorValue::kCriticalChance;
-		if (S == "meleedamage")
-			return RE::ActorValue::kMeleeDamage;
-		if (S == "unarmeddamage")
-			return RE::ActorValue::kUnarmedDamage;
-		if (S == "mass")
-			return RE::ActorValue::kMass;
-		if (S == "voicepoints")
-			return RE::ActorValue::kVoicePoints;
-		if (S == "voicerate")
-			return RE::ActorValue::kVoiceRate;
-		if (S == "damageresist")
-			return RE::ActorValue::kDamageResist;
-		if (S == "poisonresist")
-			return RE::ActorValue::kPoisonResist;
-		if (S == "resistfire")
-			return RE::ActorValue::kResistFire;
-		if (S == "resistshock")
-			return RE::ActorValue::kResistShock;
-		if (S == "resistfrost")
-			return RE::ActorValue::kResistFrost;
-		if (S == "resistmagic")
-			return RE::ActorValue::kResistMagic;
-		if (S == "resistdisease")
-			return RE::ActorValue::kResistDisease;
-		if (S == "perceptioncondition")
-			return RE::ActorValue::kUnknown46;
-		if (S == "endurancecondition")
-			return RE::ActorValue::kUnknown47;
-		if (S == "leftattackcondition")
-			return RE::ActorValue::kUnknown48;
-		if (S == "rightattackcondition")
-			return RE::ActorValue::kUnknown49;
-		if (S == "leftmobilitycondition")
-			return RE::ActorValue::kUnknown50;
-		if (S == "rightmobilitycondition")
-			return RE::ActorValue::kUnknown51;
-		if (S == "braincondition")
-			return RE::ActorValue::kUnknown52;
-		if (S == "paralysis")
-			return RE::ActorValue::kParalysis;
-		if (S == "invisibility")
-			return RE::ActorValue::kInvisibility;
-		if (S == "nighteye")
-			return RE::ActorValue::kNightEye;
-		if (S == "detectliferange")
-			return RE::ActorValue::kDetectLifeRange;
-		if (S == "waterbreathing")
-			return RE::ActorValue::kWaterBreathing;
-		if (S == "waterwalking")
-			return RE::ActorValue::kWaterWalking;
-		if (S == "unknown59")
-			return RE::ActorValue::kUnknown59;
-		if (S == "fame")
-			return RE::ActorValue::kFame;
-		if (S == "infamy")
-			return RE::ActorValue::kInfamy;
-		if (S == "jumpingbonus")
-			return RE::ActorValue::kJumpingBonus;
-		if (S == "wardpower")
-			return RE::ActorValue::kWardPower;
-		if (S == "rightitemcharge")
-			return RE::ActorValue::kRightItemCharge;
-		if (S == "armorperks")
-			return RE::ActorValue::kArmorPerks;
-		if (S == "shieldperks")
-			return RE::ActorValue::kShieldPerks;
-		if (S == "warddeflection")
-			return RE::ActorValue::kWardDeflection;
-		if (S == "variable01")
-			return RE::ActorValue::kVariable01;
-		if (S == "variable02")
-			return RE::ActorValue::kVariable02;
-		if (S == "variable03")
-			return RE::ActorValue::kVariable03;
-		if (S == "variable04")
-			return RE::ActorValue::kVariable04;
-		if (S == "variable05")
-			return RE::ActorValue::kVariable05;
-		if (S == "variable06")
-			return RE::ActorValue::kVariable06;
-		if (S == "variable07")
-			return RE::ActorValue::kVariable07;
-		if (S == "variable08")
-			return RE::ActorValue::kVariable08;
-		if (S == "variable09")
-			return RE::ActorValue::kVariable09;
-		if (S == "variable10")
-			return RE::ActorValue::kVariable10;
-		if (S == "bowspeedbonus")
-			return RE::ActorValue::kBowSpeedBonus;
-		if (S == "favoractive")
-			return RE::ActorValue::kFavorActive;
-		if (S == "favorsperday")
-			return RE::ActorValue::kFavorsPerDay;
-		if (S == "favorsperdaytimer")
-			return RE::ActorValue::kFavorsPerDayTimer;
-		if (S == "leftitemcharge")
-			return RE::ActorValue::kLeftItemCharge;
-		if (S == "absorbchance")
-			return RE::ActorValue::kAbsorbChance;
-		if (S == "blindness")
-			return RE::ActorValue::kBlindness;
-		if (S == "weaponspeedmult")
-			return RE::ActorValue::kWeaponSpeedMult;
-		if (S == "shoutrecoverymult")
-			return RE::ActorValue::kShoutRecoveryMult;
-		if (S == "bowstaggerbonus")
-			return RE::ActorValue::kBowStaggerBonus;
-		if (S == "telekinesis")
-			return RE::ActorValue::kTelekinesis;
-		if (S == "favorpointsbonus")
-			return RE::ActorValue::kFavorPointsBonus;
-		if (S == "lastbribedintimidated")
-			return RE::ActorValue::kLastBribedIntimidated;
-		if (S == "lastflattered")
-			return RE::ActorValue::kLastFlattered;
-		if (S == "movementnoisemult")
-			return RE::ActorValue::kMovementNoiseMult;
-		if (S == "bypassvendorstolencheck")
-			return RE::ActorValue::kBypassVendorStolenCheck;
-		if (S == "bypassvendorkeywordcheck")
-			return RE::ActorValue::kBypassVendorKeywordCheck;
-		if (S == "waitingforplayer")
-			return RE::ActorValue::kWaitingForPlayer;
-		if (S == "onehandedmodifier")
-			return RE::ActorValue::kOneHandedModifier;
-		if (S == "twohandedmodifier")
-			return RE::ActorValue::kTwoHandedModifier;
-		if (S == "marksmanmodifier")
-			return RE::ActorValue::kMarksmanModifier;
-		if (S == "blockmodifier")
-			return RE::ActorValue::kBlockModifier;
-		if (S == "smithingmodifier")
-			return RE::ActorValue::kSmithingModifier;
-		if (S == "heavyarmormodifier")
-			return RE::ActorValue::kHeavyArmorModifier;
-		if (S == "lightarmormodifier")
-			return RE::ActorValue::kLightArmorModifier;
-		if (S == "pickpocketmodifier")
-			return RE::ActorValue::kPickpocketModifier;
-		if (S == "lockpickingmodifier")
-			return RE::ActorValue::kLockpickingModifier;
-		if (S == "sneakingmodifier")
-			return RE::ActorValue::kSneakingModifier;
-		if (S == "alchemymodifier")
-			return RE::ActorValue::kAlchemyModifier;
-		if (S == "speechcraftmodifier")
-			return RE::ActorValue::kSpeechcraftModifier;
-		if (S == "alterationmodifier")
-			return RE::ActorValue::kAlterationModifier;
-		if (S == "conjurationmodifier")
-			return RE::ActorValue::kConjurationModifier;
-		if (S == "destructionmodifier")
-			return RE::ActorValue::kDestructionModifier;
-		if (S == "illusionmodifier")
-			return RE::ActorValue::kIllusionModifier;
-		if (S == "restorationmodifier")
-			return RE::ActorValue::kRestorationModifier;
-		if (S == "enchantingmodifier")
-			return RE::ActorValue::kEnchantingModifier;
-		if (S == "onehandedskilladvance")
-			return RE::ActorValue::kOneHandedSkillAdvance;
-		if (S == "twohandedskilladvance")
-			return RE::ActorValue::kTwoHandedSkillAdvance;
-		if (S == "marksmanskilladvance")
-			return RE::ActorValue::kMarksmanSkillAdvance;
-		if (S == "blockskilladvance")
-			return RE::ActorValue::kBlockSkillAdvance;
-		if (S == "smithingskilladvance")
-			return RE::ActorValue::kSmithingSkillAdvance;
-		if (S == "heavyarmorskilladvance")
-			return RE::ActorValue::kHeavyArmorSkillAdvance;
-		if (S == "lightarmorskilladvance")
-			return RE::ActorValue::kLightArmorSkillAdvance;
-		if (S == "pickpocketskilladvance")
-			return RE::ActorValue::kPickpocketSkillAdvance;
-		if (S == "lockpickingskilladvance")
-			return RE::ActorValue::kLockpickingSkillAdvance;
-		if (S == "sneakingskilladvance")
-			return RE::ActorValue::kSneakingSkillAdvance;
-		if (S == "alchemyskilladvance")
-			return RE::ActorValue::kAlchemySkillAdvance;
-		if (S == "speechcraftskilladvance")
-			return RE::ActorValue::kSpeechcraftSkillAdvance;
-		if (S == "alterationskilladvance")
-			return RE::ActorValue::kAlterationSkillAdvance;
-		if (S == "conjurationskilladvance")
-			return RE::ActorValue::kConjurationSkillAdvance;
-		if (S == "destructionskilladvance")
-			return RE::ActorValue::kDestructionSkillAdvance;
-		if (S == "illusionskilladvance")
-			return RE::ActorValue::kIllusionSkillAdvance;
-		if (S == "restorationskilladvance")
-			return RE::ActorValue::kRestorationSkillAdvance;
-		if (S == "enchantingskilladvance")
-			return RE::ActorValue::kEnchantingSkillAdvance;
-		if (S == "leftweaponspeedmultiply")
-			return RE::ActorValue::kLeftWeaponSpeedMultiply;
-		if (S == "dragonsouls")
-			return RE::ActorValue::kDragonSouls;
-		if (S == "combathealthregenmultiply")
-			return RE::ActorValue::kCombatHealthRegenMultiply;
-		if (S == "onehandedpowermodifier")
-			return RE::ActorValue::kOneHandedPowerModifier;
-		if (S == "twohandedpowermodifier")
-			return RE::ActorValue::kTwoHandedPowerModifier;
-		if (S == "marksmanpowermodifier")
-			return RE::ActorValue::kMarksmanPowerModifier;
-		if (S == "blockpowermodifier")
-			return RE::ActorValue::kBlockPowerModifier;
-		if (S == "smithingpowermodifier")
-			return RE::ActorValue::kSmithingPowerModifier;
-		if (S == "heavyarmorpowermodifier")
-			return RE::ActorValue::kHeavyArmorPowerModifier;
-		if (S == "lightarmorpowermodifier")
-			return RE::ActorValue::kLightArmorPowerModifier;
-		if (S == "pickpocketpowermodifier")
-			return RE::ActorValue::kPickpocketPowerModifier;
-		if (S == "lockpickingpowermodifier")
-			return RE::ActorValue::kLockpickingPowerModifier;
-		if (S == "sneakingpowermodifier")
-			return RE::ActorValue::kSneakingPowerModifier;
-		if (S == "alchemypowermodifier")
-			return RE::ActorValue::kAlchemyPowerModifier;
-		if (S == "speechcraftpowermodifier")
-			return RE::ActorValue::kSpeechcraftPowerModifier;
-		if (S == "alterationpowermodifier")
-			return RE::ActorValue::kAlterationPowerModifier;
-		if (S == "conjurationpowermodifier")
-			return RE::ActorValue::kConjurationPowerModifier;
-		if (S == "destructionpowermodifier")
-			return RE::ActorValue::kDestructionPowerModifier;
-		if (S == "illusionpowermodifier")
-			return RE::ActorValue::kIllusionPowerModifier;
-		if (S == "restorationpowermodifier")
-			return RE::ActorValue::kRestorationPowerModifier;
-		if (S == "enchantingpowermodifier")
-			return RE::ActorValue::kEnchantingPowerModifier;
-		if (S == "dragonrend")
-			return RE::ActorValue::kDragonRend;
-		if (S == "attackdamagemult")
-			return RE::ActorValue::kAttackDamageMult;
-		if (S == "healratemult")
-			return RE::ActorValue::kHealRateMult;
-		if (S == "magickaratemult")
-			return RE::ActorValue::kMagickaRateMult;
-		if (S == "staminaratemult")
-			return RE::ActorValue::kStaminaRateMult;
-		if (S == "werewolfperks")
-			return RE::ActorValue::kWerewolfPerks;
-		if (S == "vampireperks")
-			return RE::ActorValue::kVampirePerks;
-		if (S == "grabactoroffset")
-			return RE::ActorValue::kGrabActorOffset;
-		if (S == "grabbed")
-			return RE::ActorValue::kGrabbed;
-		if (S == "deprecated05")
-			return RE::ActorValue::kUnknown162;
-		if (S == "reflectdamage")
-			return RE::ActorValue::kReflectDamage;
-
-		return RE::ActorValue::kNone;
-	}
-
 	auto ActorValueToString(const RE::ActorValue a_actorValue) -> RE::BSFixedString
 	{
 		switch (a_actorValue) {
@@ -365,7 +24,7 @@ namespace ActorValueHelper
 			case RE::ActorValue::kTwoHanded:
 				return "TwoHanded";
 			case RE::ActorValue::kArchery:
-				return "Archery";
+				return "Marksman";
 			case RE::ActorValue::kBlock:
 				return "Block";
 			case RE::ActorValue::kSmithing:
@@ -383,7 +42,7 @@ namespace ActorValueHelper
 			case RE::ActorValue::kAlchemy:
 				return "Alchemy";
 			case RE::ActorValue::kSpeech:
-				return "Speech";
+				return "Speechcraft";
 			case RE::ActorValue::kAlteration:
 				return "Alteration";
 			case RE::ActorValue::kConjuration:

src/Papyrus/PapyrusObjectREFR.cpp

@@ -188,7 +188,8 @@ namespace PapyrusObjectREFR
 		}
 
 		if (const auto actor = a_ref->As<RE::Actor>(); actor) {
-			auto actorValue = ActorValueHelper::StringToActorValue(a_actorValue);
+			const auto actorValueId = RE::GetActorValueIdFromName(a_actorValue.c_str());
+			const auto actorValue = static_cast<RE::ActorValue>(actorValueId);
 			return actor->GetPermanentActorValue(actorValue);
 		}
 

src/Papyrus/PapyrusRace.cpp

@@ -13,7 +13,8 @@ namespace PapyrusRace
 			return -1;
 		}
 
-		const auto actorValue = ActorValueHelper::StringToActorValue(a_actorValue);
+		const auto actorValueId = RE::GetActorValueIdFromName(a_actorValue.c_str());
+		const auto actorValue = static_cast<RE::ActorValue>(actorValueId);
 
 		for (const auto& [skill, bonus] : a_race->data.skillBoosts) {
 			const auto skillValue = static_cast<RE::ActorValue>(skill.get());