mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-13 20:39:40 +00:00
Code Issues Releases Wiki Activity

checkin leveled items lists

Browse source
This commit is contained in:
Marek Kochanowicz 2013-12-26 18:28:24 +01:00
parent c2993909cf
commit 1da56e1790
4 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
apps/opencs/model/tools/referenceablecheck.cpp
View file

@ -20,7 +20,8 @@ CSMTools::ReferenceableCheckStage::ReferenceableCheckStage(const CSMWorld::RefId
mCreaturesSize(0), mCreaturesSize(0),
mDoorsSize(0), mDoorsSize(0),
mIngredientsSize(0), mIngredientsSize(0),
mCreaturesLevListsSize(0) mCreaturesLevListsSize(0),
mItemLevelledListsSize(0)
{ {
setSizeVariables(); setSizeVariables();
} }
@ -38,6 +39,7 @@ void CSMTools::ReferenceableCheckStage::setSizeVariables()
mDoorsSize = mReferencables.getDoors().getSize(); mDoorsSize = mReferencables.getDoors().getSize();
mIngredientsSize = mReferencables.getIngredients().getSize(); mIngredientsSize = mReferencables.getIngredients().getSize();
mCreaturesLevListsSize = mReferencables.getCreatureLevelledLists().getSize(); mCreaturesLevListsSize = mReferencables.getCreatureLevelledLists().getSize();
mItemLevelledListsSize = mReferencables.getItemLevelledList().getSize();
} }
void CSMTools::ReferenceableCheckStage::perform(int stage, std::vector< std::string >& messages) void CSMTools::ReferenceableCheckStage::perform(int stage, std::vector< std::string >& messages)
@ -122,6 +124,14 @@ void CSMTools::ReferenceableCheckStage::perform(int stage, std::vector< std::str
} }
stage -= mCreaturesLevListsSize; stage -= mCreaturesLevListsSize;
if (stage < mItemLevelledListsSize)
{
mItemLevelledListCheck(stage, mReferencables.getItemLevelledList(), messages);
return;
}
stage -= mItemLevelledListsSize;
} }
int CSMTools::ReferenceableCheckStage::setup() int CSMTools::ReferenceableCheckStage::setup()
@ -625,6 +635,35 @@ void CSMTools::ReferenceableCheckStage::creaturesLevListCheck(int stage, const C
{ {
messages.push_back(id.toString() + "|" + CreatureLevList.mId + " chance to be empty is not beetween 0 and 100"); messages.push_back(id.toString() + "|" + CreatureLevList.mId + " chance to be empty is not beetween 0 and 100");
} }
}
//TODO(!)
void CSMTools::ReferenceableCheckStage::mItemLevelledListCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::ItemLevList >& records, std::vector< std::string >& messages)
{
const CSMWorld::RecordBase& baserecord = records.getRecord(stage);
if (baserecord.isDeleted())
{
return;
}
const ESM::ItemLevList& ItemLevList = (static_cast<const CSMWorld::Record<ESM::ItemLevList>& >(baserecord)).get();
CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_ItemLevelledList, CreatureLevList.mId);
for (int i = 0; i < ItemLevList.mList.size(); ++i)
{
if (ItemLevList.mList[i].mId.empty())
{
messages.push_back(id.toString() + "|" + ItemLevList.mId + " contains item with empty Id");
}
if (ItemLevList.mList[i].mLevel < 1)
{
messages.push_back(id.toString() + "|" + ItemLevList.mId + " contains item with non-positive level");
}
}
if (ItemLevList.mChanceNone < 0 or ItemLevList.mChanceNone > 100)
{
messages.push_back(id.toString() + "|" + ItemLevList.mId + " chance to be empty is not beetween 0 and 100");
}
} }

2
apps/opencs/model/tools/referenceablecheck.hpp
View file

@ -28,6 +28,7 @@ namespace CSMTools
void doorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Door>& records, std::vector<std::string>& messages); void doorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Door>& records, std::vector<std::string>& messages);
void ingredientCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Ingredient>& records, std::vector<std::string>& messages); void ingredientCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Ingredient>& records, std::vector<std::string>& messages);
void creaturesLevListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& records, std::vector<std::string>& messages); void creaturesLevListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& records, std::vector<std::string>& messages);
void mItemLevelledListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::ItemLevList>& records, std::vector<std::string>& messages);
void setSizeVariables(); void setSizeVariables();
@ -45,6 +46,7 @@ namespace CSMTools
int mDoorsSize; int mDoorsSize;
int mIngredientsSize; int mIngredientsSize;
int mCreaturesLevListsSize; int mCreaturesLevListsSize;
int mItemLevelledListsSize;
}; };
} }
#endif // REFERENCEABLECHECKSTAGE_H #endif // REFERENCEABLECHECKSTAGE_H

5
apps/opencs/model/world/refiddata.cpp
View file

@ -286,3 +286,8 @@ const CSMWorld::RefIdDataContainer< ESM::CreatureLevList >& CSMWorld::RefIdData:
{ {
return mCreatureLevelledLists; return mCreatureLevelledLists;
} }
const CSMWorld::RefIdDataContainer< ESM::ItemLevList >& CSMWorld::RefIdData::getItemLevelledList() const
{
return mItemLevelledLists;
}

1
apps/opencs/model/world/refiddata.hpp
View file

@ -232,6 +232,7 @@ namespace CSMWorld
const RefIdDataContainer<ESM::Door>& getDoors() const; const RefIdDataContainer<ESM::Door>& getDoors() const;
const RefIdDataContainer<ESM::Ingredient>& getIngredients() const; const RefIdDataContainer<ESM::Ingredient>& getIngredients() const;
const RefIdDataContainer<ESM::CreatureLevList>& getCreatureLevelledLists() const; const RefIdDataContainer<ESM::CreatureLevList>& getCreatureLevelledLists() const;
const RefIdDataContainer<ESM::ItemLevList>& getItemLevelledList() const;
}; };
} }