teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.

Browse source
This commit is contained in:
scrawl 2013-11-21 04:27:53 +01:00
parent bab657fe2b
commit b6c22ad5d9
10 changed files with 48 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/creature.cpp
View file

@ -98,6 +98,8 @@ namespace MWClass
data->mContainerStore.fill(ref->mBase->mInventory, getId(ptr),
MWBase::Environment::get().getWorld()->getStore());
data->mContainerStore.add("gold_001", ref->mBase->mData.mGold, ptr);
// store
ptr.getRefData().setCustomData (data.release());
}

7
apps/openmw/mwclass/npc.cpp
View file

@ -184,8 +184,11 @@ namespace MWClass
}
// creature stats
int gold=0;
if(ref->mBase->mNpdt52.mGold != -10)
{
gold = ref->mBase->mNpdt52.mGold;
for (int i=0; i<27; ++i)
data->mNpcStats.getSkill (i).setBase (ref->mBase->mNpdt52.mSkills[i]);
@ -207,6 +210,8 @@ namespace MWClass
}
else
{
gold = ref->mBase->mNpdt12.mGold;
for (int i=0; i<3; ++i)
data->mNpcStats.setDynamic (i, 10);
@ -236,6 +241,8 @@ namespace MWClass
// store
ptr.getRefData().setCustomData (data.release());
getContainerStore(ptr).add("gold_001", gold, ptr);
getInventoryStore(ptr).autoEquip(ptr);
}
}

9
apps/openmw/mwgui/dialogue.cpp
View file

@ -12,6 +12,8 @@
#include "../mwmechanics/npcstats.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwdialogue/dialoguemanagerimp.hpp"
@ -67,23 +69,24 @@ namespace MWGui
void PersuasionDialog::onPersuade(MyGUI::Widget *sender)
{
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
MWBase::MechanicsManager::PersuasionType type;
if (sender == mAdmireButton) type = MWBase::MechanicsManager::PT_Admire;
else if (sender == mIntimidateButton) type = MWBase::MechanicsManager::PT_Intimidate;
else if (sender == mTauntButton) type = MWBase::MechanicsManager::PT_Taunt;
else if (sender == mBribe10Button)
{
MWBase::Environment::get().getWindowManager()->getTradeWindow()->addOrRemoveGold(-10);
player.getClass().getContainerStore(player).remove("gold_001", 10, player);
type = MWBase::MechanicsManager::PT_Bribe10;
}
else if (sender == mBribe100Button)
{
MWBase::Environment::get().getWindowManager()->getTradeWindow()->addOrRemoveGold(-100);
player.getClass().getContainerStore(player).remove("gold_001", 100, player);
type = MWBase::MechanicsManager::PT_Bribe100;
}
else /*if (sender == mBribe1000Button)*/
{
MWBase::Environment::get().getWindowManager()->getTradeWindow()->addOrRemoveGold(-1000);
player.getClass().getContainerStore(player).remove("gold_001", 1000, player);
type = MWBase::MechanicsManager::PT_Bribe1000;
}

5
apps/openmw/mwgui/merchantrepair.cpp
View file

@ -13,7 +13,6 @@
#include "../mwworld/containerstore.hpp"
#include "inventorywindow.hpp"
#include "tradewindow.hpp"
namespace MWGui
{
@ -119,7 +118,9 @@ void MerchantRepair::onRepairButtonClick(MyGUI::Widget *sender)
MWBase::Environment::get().getSoundManager()->playSound("Repair",1,1);
int price = boost::lexical_cast<int>(sender->getUserString("Price"));
MWBase::Environment::get().getWindowManager()->getTradeWindow()->addOrRemoveGold(-price);
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
player.getClass().getContainerStore(player).remove("gold_001", price, player);
startRepair(mActor);
}

4
apps/openmw/mwgui/spellbuyingwindow.cpp
View file

@ -10,11 +10,11 @@
#include "../mwworld/player.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwmechanics/creaturestats.hpp"
#include "inventorywindow.hpp"
#include "tradewindow.hpp"
namespace MWGui
{
@ -123,7 +123,7 @@ namespace MWGui
MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
MWMechanics::Spells& spells = stats.getSpells();
spells.add (mSpellsWidgetMap.find(_sender)->second);
MWBase::Environment::get().getWindowManager()->getTradeWindow()->addOrRemoveGold(-price);
player.getClass().getContainerStore(player).remove("gold_001", price, player);
startSpellBuying(mPtr);
MWBase::Environment::get().getSoundManager()->playSound ("Item Gold Up", 1.0, 1.0);

7
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -8,13 +8,13 @@
#include "../mwbase/mechanicsmanager.hpp"
#include "../mwworld/player.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwmechanics/spellcasting.hpp"
#include "tooltips.hpp"
#include "class.hpp"
#include "inventorywindow.hpp"
#include "tradewindow.hpp"
namespace
{
@ -342,13 +342,14 @@ namespace MWGui
mSpell.mName = mNameEdit->getCaption();
MWBase::Environment::get().getWindowManager()->getTradeWindow()->addOrRemoveGold(-boost::lexical_cast<int>(mPriceLabel->getCaption()));
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
player.getClass().getContainerStore(player).remove("gold_001", boost::lexical_cast<int>(mPriceLabel->getCaption()), player);
MWBase::Environment::get().getSoundManager()->playSound ("Item Gold Up", 1.0, 1.0);
const ESM::Spell* spell = MWBase::Environment::get().getWorld()->createRecord(mSpell);
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
MWMechanics::Spells& spells = stats.getSpells();
spells.add (spell->mId);

38
apps/openmw/mwgui/tradewindow.cpp
View file

@ -203,18 +203,17 @@ namespace MWGui
sellToNpc(item.mBase, count, true);
}
void TradeWindow::addOrRemoveGold(int amount)
void TradeWindow::addOrRemoveGold(int amount, const MWWorld::Ptr& actor)
{
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
MWWorld::ContainerStore& playerStore = MWWorld::Class::get(player).getContainerStore(player);
MWWorld::ContainerStore& store = MWWorld::Class::get(actor).getContainerStore(actor);
if (amount > 0)
{
playerStore.add("gold_001", amount, player);
store.add("gold_001", amount, actor);
}
else
{
playerStore.remove("gold_001", - amount, player);
store.remove("gold_001", - amount, actor);
}
}
@ -269,6 +268,8 @@ namespace MWGui
return;
}
MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
if(mCurrentBalance > mCurrentMerchantOffer)
{
//if npc is a creature: reject (no haggle)
@ -291,7 +292,6 @@ namespace MWGui
+ MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange()),100));
const MWMechanics::NpcStats &sellerStats = MWWorld::Class::get(mPtr).getNpcStats(mPtr);
MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
const MWMechanics::NpcStats &playerStats = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
float a1 = std::min(playerStats.getSkill(ESM::Skill::Mercantile).getModified(), 100.f);
@ -331,9 +331,12 @@ namespace MWGui
mTradeModel->transferItems();
playerItemModel->transferItems();
// add or remove gold from the player.
// transfer the gold
if (mCurrentBalance != 0)
addOrRemoveGold(mCurrentBalance);
{
addOrRemoveGold(mCurrentBalance, playerPtr);
addOrRemoveGold(-mCurrentBalance, mPtr);
}
std::string sound = "Item Gold Up";
MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
@ -434,22 +437,13 @@ namespace MWGui
int TradeWindow::getMerchantGold()
{
int merchantGold;
if (mPtr.getTypeName() == typeid(ESM::NPC).name())
int merchantGold = 0;
MWWorld::ContainerStore store = mPtr.getClass().getContainerStore(mPtr);
for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
{
MWWorld::LiveCellRef<ESM::NPC>* ref = mPtr.get<ESM::NPC>();
if (ref->mBase->mNpdt52.mGold == -10)
merchantGold = ref->mBase->mNpdt12.mGold;
else
merchantGold = ref->mBase->mNpdt52.mGold;
if (Misc::StringUtils::ciEqual(it->getCellRef().mRefID, "gold_001"))
merchantGold += it->getRefData().getCount();
}
else // ESM::Creature
{
MWWorld::LiveCellRef<ESM::Creature>* ref = mPtr.get<ESM::Creature>();
merchantGold = ref->mBase->mData.mGold;
}
return merchantGold;
}
}

2
apps/openmw/mwgui/tradewindow.hpp
View file

@ -28,7 +28,7 @@ namespace MWGui
void startTrade(const MWWorld::Ptr& actor);
void addOrRemoveGold(int gold);
void addOrRemoveGold(int gold, const MWWorld::Ptr& actor);
void onFrame(float frameDuration);

4
apps/openmw/mwgui/trainingwindow.cpp
View file

@ -11,11 +11,11 @@
#include "../mwworld/player.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwmechanics/npcstats.hpp"
#include "inventorywindow.hpp"
#include "tradewindow.hpp"
#include "tooltips.hpp"
namespace MWGui
@ -142,7 +142,7 @@ namespace MWGui
pcStats.increaseSkill (skillId, *class_, true);
// remove gold
MWBase::Environment::get().getWindowManager()->getTradeWindow()->addOrRemoveGold(-price);
player.getClass().getContainerStore(player).remove("gold_001", price, player);
// go back to game mode
MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Training);

8
apps/openmw/mwgui/travelwindow.cpp
View file

@ -11,9 +11,9 @@
#include "../mwworld/player.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "inventorywindow.hpp"
#include "tradewindow.hpp"
namespace MWGui
{
@ -121,13 +121,15 @@ namespace MWGui
int price;
iss >> price;
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
if (MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getPlayerGold()<price)
return;
MWBase::Environment::get().getWindowManager()->getTradeWindow ()->addOrRemoveGold (-price);
player.getClass().getContainerStore(player).remove("gold_001", price, player);
MWBase::Environment::get().getWorld ()->getFader ()->fadeOut(1);
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
ESM::Position pos = *_sender->getUserData<ESM::Position>();
std::string cellname = _sender->getUserString("Destination");
int x,y;