mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Fix enchantment points value

Browse Source
actorid
scrawl 12 years ago
parent 11a45b3034
commit 78596cad83
14 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
apps/openmw/mwclass/armor.cpp
Unescape Escape View File

@ -375,12 +375,12 @@ namespace MWClass
return MWWorld::Ptr(&cell.mArmors.insert(*ref), &cell);
}
short Armor::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
float Armor::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
{
MWWorld::LiveCellRef<ESM::Armor> *ref =
ptr.get<ESM::Armor>();
return ref->mBase->mData.mEnchant;
return ref->mBase->mData.mEnchant/10.f;
}
bool Armor::canSell (const MWWorld::Ptr& item, int npcServices) const

2
apps/openmw/mwclass/armor.hpp
Unescape Escape View File

@ -77,7 +77,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::Ptr &ptr) const;
virtual short getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual float getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual bool canSell (const MWWorld::Ptr& item, int npcServices) const;
};

4
apps/openmw/mwclass/book.cpp
Unescape Escape View File

@ -176,12 +176,12 @@ namespace MWClass
return MWWorld::Ptr(&cell.mBooks.insert(*ref), &cell);
}
short Book::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
float Book::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
{
MWWorld::LiveCellRef<ESM::Book> *ref =
ptr.get<ESM::Book>();
return ref->mBase->mData.mEnchant;
return ref->mBase->mData.mEnchant/10.f;
}
bool Book::canSell (const MWWorld::Ptr& item, int npcServices) const

2
apps/openmw/mwclass/book.hpp
Unescape Escape View File

@ -58,7 +58,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::Ptr &ptr) const;
virtual short getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual float getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual bool canSell (const MWWorld::Ptr& item, int npcServices) const;
};

4
apps/openmw/mwclass/clothing.cpp
Unescape Escape View File

@ -295,12 +295,12 @@ namespace MWClass
return MWWorld::Ptr(&cell.mClothes.insert(*ref), &cell);
}
short Clothing::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
float Clothing::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
{
MWWorld::LiveCellRef<ESM::Clothing> *ref =
ptr.get<ESM::Clothing>();
return ref->mBase->mData.mEnchant;
return ref->mBase->mData.mEnchant/10.f;
}
bool Clothing::canSell (const MWWorld::Ptr& item, int npcServices) const

2
apps/openmw/mwclass/clothing.hpp
Unescape Escape View File

@ -71,7 +71,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::Ptr &ptr) const;
virtual short getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual float getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual bool canSell (const MWWorld::Ptr& item, int npcServices) const;
};

4
apps/openmw/mwclass/weapon.cpp
Unescape Escape View File

@ -428,12 +428,12 @@ namespace MWClass
return MWWorld::Ptr(&cell.mWeapons.insert(*ref), &cell);
}
short Weapon::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
float Weapon::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
{
MWWorld::LiveCellRef<ESM::Weapon> *ref =
ptr.get<ESM::Weapon>();
return ref->mBase->mData.mEnchant;
return ref->mBase->mData.mEnchant/10.f;
}
bool Weapon::canSell (const MWWorld::Ptr& item, int npcServices) const

2
apps/openmw/mwclass/weapon.hpp
Unescape Escape View File

@ -79,7 +79,7 @@ namespace MWClass
virtual bool canSell (const MWWorld::Ptr& item, int npcServices) const;
virtual short getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual float getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
};
}

5
apps/openmw/mwgui/enchantingdialog.cpp
Unescape Escape View File

@ -57,8 +57,9 @@ namespace MWGui
void EnchantingDialog::updateLabels()
{
mEnchantmentPoints->setCaption(boost::lexical_cast<std::string>(mEnchanting.getEnchantCost())
+ " / " + boost::lexical_cast<std::string>(mEnchanting.getMaxEnchantValue()));
std::stringstream enchantCost;
enchantCost << std::setprecision(1) << std::fixed << mEnchanting.getEnchantCost();
mEnchantmentPoints->setCaption(enchantCost.str() + " / " + boost::lexical_cast<std::string>(mEnchanting.getMaxEnchantValue()));
mCharge->setCaption(boost::lexical_cast<std::string>(mEnchanting.getGemCharge()));

4
apps/openmw/mwmechanics/enchanting.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ namespace MWMechanics
}
}
int Enchanting::getEnchantCost() const
float Enchanting::getEnchantCost() const
{
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
float cost = 0;
@ -193,7 +193,7 @@ namespace MWMechanics
return soul->mData.mSoul;
}
int Enchanting::getMaxEnchantValue() const
float Enchanting::getMaxEnchantValue() const
{
if (itemEmpty())
return 0;

4
apps/openmw/mwmechanics/enchanting.hpp
Unescape Escape View File

@ -35,9 +35,9 @@ namespace MWMechanics
bool create(); //Return true if created, false if failed.
void nextEnchantType(); //Set enchant type to next possible type (for mOldItemPtr object)
int getEnchantType() const;
int getEnchantCost() const;
float getEnchantCost() const;
int getEnchantPrice() const;
int getMaxEnchantValue() const;
float getMaxEnchantValue() const;
int getGemCharge() const;
float getEnchantChance() const;
bool soulEmpty() const; //Return true if empty

2
apps/openmw/mwworld/class.cpp
Unescape Escape View File

@ -132,7 +132,7 @@ namespace MWWorld
return 0;
}
short Class::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
float Class::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
{
throw std::runtime_error ("class does not support enchanting");
}

2
apps/openmw/mwworld/class.hpp
Unescape Escape View File

@ -231,7 +231,7 @@ namespace MWWorld
///< @return the enchantment ID if the object is enchanted, otherwise an empty string
/// (default implementation: return empty string)
virtual short getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual float getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
///< @return the number of enchantment points available for possible enchanting
virtual void adjustScale(const MWWorld::Ptr& ptr,float& scale) const;

2
components/esm/loadweap.hpp
Unescape Escape View File

@ -48,7 +48,7 @@ struct Weapon
short mType;
short mHealth;
float mSpeed, mReach;
short mEnchant; // Enchantment points
short mEnchant; // Enchantment points. The real value is mEnchant/10.f
unsigned char mChop[2], mSlash[2], mThrust[2]; // Min and max
int mFlags;
}; // 32 bytes

Write Preview
Loading…
Cancel
Save