From afbd2de51154d1ced815b2fed299b7ce683af33a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 2 Oct 2014 13:54:56 +0200
Subject: [PATCH] Fix broken alchemy magnitude/duration

---
 apps/openmw/mwmechanics/alchemy.cpp | 20 ++++++++++++--------
 apps/openmw/mwmechanics/alchemy.hpp |  3 +--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 24e7b5aa11..90c1808173 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -133,7 +133,7 @@ void MWMechanics::Alchemy::updateEffects()
     std::set<EffectKey> effects (listEffects());
 
     // general alchemy factor
-    float x = getChance();
+    float x = getAlchemyFactor();
 
     x *= mTools[ESM::Apparatus::MortarPestle].get<ESM::Apparatus>()->mBase->mData.mQuality;
     x *= MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find ("fPotionStrengthMult")->getFloat();
@@ -306,18 +306,15 @@ void MWMechanics::Alchemy::increaseSkill()
     mAlchemist.getClass().skillUsageSucceeded (mAlchemist, ESM::Skill::Alchemy, 0);
 }
 
-float MWMechanics::Alchemy::getChance() const
+float MWMechanics::Alchemy::getAlchemyFactor() const
 {
     const CreatureStats& creatureStats = mAlchemist.getClass().getCreatureStats (mAlchemist);
     const NpcStats& npcStats = mAlchemist.getClass().getNpcStats (mAlchemist);
 
-    if (beginEffects() == endEffects())
-        return 0.f;
-
     return
         (npcStats.getSkill (ESM::Skill::Alchemy).getModified() +
-        0.1 * creatureStats.getAttribute (1).getModified()
-        + 0.1 * creatureStats.getAttribute (7).getModified());
+        0.1 * creatureStats.getAttribute (ESM::Attribute::Intelligence).getModified()
+        + 0.1 * creatureStats.getAttribute (ESM::Attribute::Luck).getModified());
 }
 
 int MWMechanics::Alchemy::countIngredients() const
@@ -461,7 +458,14 @@ MWMechanics::Alchemy::Result MWMechanics::Alchemy::create (const std::string& na
     if (listEffects().empty())
         return Result_NoEffects;
 
-    if (getChance()<std::rand()/static_cast<double> (RAND_MAX)*100)
+    if (beginEffects() == endEffects())
+    {
+        // all effects were nullified due to insufficient skill
+        removeIngredients();
+        return Result_RandomFailure;
+    }
+
+    if (getAlchemyFactor()<std::rand()/static_cast<double> (RAND_MAX)*100)
     {
         removeIngredients();
         return Result_RandomFailure;
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
index a2429ca8ef..e6b8c66509 100644
--- a/apps/openmw/mwmechanics/alchemy.hpp
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -69,8 +69,7 @@ namespace MWMechanics
             void increaseSkill();
             ///< Increase alchemist's skill.
 
-            float getChance() const;
-            ///< Return chance of success.
+            float getAlchemyFactor() const;
 
             int countIngredients() const;