mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930.

Browse Source 
(cherry picked from commit 3bbcf6a9169dc24d47c4d10e24f3818681fc34c0)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
This commit is contained in:
cc9cii 2015-10-08 12:47:23 +11:00
parent 9cc046ce4e
commit b3daa7d956
4 changed files with 123 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/opencs/model/world/columns.cpp
View File

@ -249,7 +249,7 @@ namespace CSMWorld
{ ColumnId_AiWanderDist, "Wander Dist" }, { ColumnId_AiWanderDist, "Wander Dist" },
{ ColumnId_AiDuration, "Ai Duration" }, { ColumnId_AiDuration, "Ai Duration" },
{ ColumnId_AiWanderToD, "Wander ToD" }, { ColumnId_AiWanderToD, "Wander ToD" },
{ ColumnId_AiWanderIdle, "Wander Idle" }, //{ ColumnId_AiWanderIdle, "Wander Idle" },
{ ColumnId_AiWanderRepeat, "Wander Repeat" }, { ColumnId_AiWanderRepeat, "Wander Repeat" },
{ ColumnId_AiActivateName, "Activate" }, { ColumnId_AiActivateName, "Activate" },
{ ColumnId_AiTargetId, "Target ID" }, { ColumnId_AiTargetId, "Target ID" },
@ -317,6 +317,15 @@ namespace CSMWorld
{ ColumnId_MaxAttack, "Max Attack" }, { ColumnId_MaxAttack, "Max Attack" },
{ ColumnId_CreatureMisc, "Creature Misc" }, { ColumnId_CreatureMisc, "Creature Misc" },
{ ColumnId_Idle1, "Idle 1" },
{ ColumnId_Idle2, "Idle 2" },
{ ColumnId_Idle3, "Idle 3" },
{ ColumnId_Idle4, "Idle 4" },
{ ColumnId_Idle5, "Idle 5" },
{ ColumnId_Idle6, "Idle 6" },
{ ColumnId_Idle7, "Idle 7" },
{ ColumnId_Idle8, "Idle 8" },
{ ColumnId_SpellSrc, "From Race" }, { ColumnId_SpellSrc, "From Race" },
{ ColumnId_SpellCost, "Cast Cost" }, { ColumnId_SpellCost, "Cast Cost" },
{ ColumnId_SpellChance, "Cast Chance" }, { ColumnId_SpellChance, "Cast Chance" },

11
apps/opencs/model/world/columns.hpp
View File

@ -241,7 +241,7 @@ namespace CSMWorld
ColumnId_AiWanderDist = 221, ColumnId_AiWanderDist = 221,
ColumnId_AiDuration = 222, ColumnId_AiDuration = 222,
ColumnId_AiWanderToD = 223, ColumnId_AiWanderToD = 223,
ColumnId_AiWanderIdle = 224, // unused
ColumnId_AiWanderRepeat = 225, ColumnId_AiWanderRepeat = 225,
ColumnId_AiActivateName = 226, ColumnId_AiActivateName = 226,
// use ColumnId_PosX, etc for AI destinations // use ColumnId_PosX, etc for AI destinations
@ -316,6 +316,15 @@ namespace CSMWorld
ColumnId_MaxAttack = 284, ColumnId_MaxAttack = 284,
ColumnId_CreatureMisc = 285, ColumnId_CreatureMisc = 285,
ColumnId_Idle1 = 286,
ColumnId_Idle2 = 287,
ColumnId_Idle3 = 288,
ColumnId_Idle4 = 289,
ColumnId_Idle5 = 290,
ColumnId_Idle6 = 291,
ColumnId_Idle7 = 292,
ColumnId_Idle8 = 293,
ColumnId_SpellSrc = 90, ColumnId_SpellSrc = 90,
ColumnId_SpellCost = 177, ColumnId_SpellCost = 177,
ColumnId_SpellChance = 254, ColumnId_SpellChance = 254,

146
apps/opencs/model/world/refidadapterimp.hpp
View File

@ -1435,6 +1435,8 @@ namespace CSMWorld
virtual ~ActorAiRefIdAdapter() {} virtual ~ActorAiRefIdAdapter() {}
// FIXME: should check if the AI package type is already in the list and use a default
// that wasn't used already (in extreme case do not add anything at all?
virtual void addNestedRow (const RefIdColumn *column, virtual void addNestedRow (const RefIdColumn *column,
RefIdData& data, int index, int position) const RefIdData& data, int index, int position) const
{ {
@ -1518,6 +1520,7 @@ namespace CSMWorld
switch (subColIndex) switch (subColIndex)
{ {
case 0: case 0:
// FIXME: should more than one AI package type be allowed? Check vanilla
switch (content.mType) switch (content.mType)
{ {
case ESM::AI_Wander: return 0; case ESM::AI_Wander: return 0;
@ -1545,47 +1548,52 @@ namespace CSMWorld
else else
return QVariant(); return QVariant();
case 4: // wander idle case 4: // wander idle
case 5:
case 6:
case 7:
case 8:
case 9:
case 10:
case 11:
if (content.mType == ESM::AI_Wander) if (content.mType == ESM::AI_Wander)
{ return static_cast<int>(content.mWander.mIdle[subColIndex-4]);
return static_cast<int>(content.mWander.mIdle[0]); // FIXME:
}
else else
return QVariant(); return QVariant();
case 5: // wander repeat case 12: // wander repeat
if (content.mType == ESM::AI_Wander) if (content.mType == ESM::AI_Wander)
return content.mWander.mShouldRepeat != 0; return content.mWander.mShouldRepeat != 0;
else else
return QVariant(); return QVariant();
case 6: // activate name case 13: // activate name
if (content.mType == ESM::AI_Activate) if (content.mType == ESM::AI_Activate)
return QString(content.mActivate.mName.toString().c_str()); return QString(content.mActivate.mName.toString().c_str());
else else
return QVariant(); return QVariant();
case 7: // target id case 14: // target id
if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort) if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
return QString(content.mTarget.mId.toString().c_str()); return QString(content.mTarget.mId.toString().c_str());
else else
return QVariant(); return QVariant();
case 8: // target cell case 15: // target cell
if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort) if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
return QString::fromUtf8(content.mCellName.c_str()); return QString::fromUtf8(content.mCellName.c_str());
else else
return QVariant(); return QVariant();
case 9: case 16:
if (content.mType == ESM::AI_Travel) if (content.mType == ESM::AI_Travel)
return content.mTravel.mX; return content.mTravel.mX;
else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort) else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
return content.mTarget.mX; return content.mTarget.mX;
else else
return QVariant(); return QVariant();
case 10: case 17:
if (content.mType == ESM::AI_Travel) if (content.mType == ESM::AI_Travel)
return content.mTravel.mY; return content.mTravel.mY;
else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort) else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
return content.mTarget.mY; return content.mTarget.mY;
else else
return QVariant(); return QVariant();
case 11: case 18:
if (content.mType == ESM::AI_Travel) if (content.mType == ESM::AI_Travel)
return content.mTravel.mZ; return content.mTravel.mZ;
else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort) else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
@ -1615,11 +1623,12 @@ namespace CSMWorld
case 0: // ai package type case 0: // ai package type
switch (value.toInt()) switch (value.toInt())
{ {
case 0: content.mType = ESM::AI_Wander; case 0: content.mType = ESM::AI_Wander; break;
case 1: content.mType = ESM::AI_Travel; case 1: content.mType = ESM::AI_Travel; break;
case 2: content.mType = ESM::AI_Follow; case 2: content.mType = ESM::AI_Follow; break;
case 3: content.mType = ESM::AI_Escort; case 3: content.mType = ESM::AI_Escort; break;
case 4: content.mType = ESM::AI_Activate; case 4: content.mType = ESM::AI_Activate; break;
default: return; // return without saving
} }
break; // always save break; // always save
@ -1628,6 +1637,8 @@ namespace CSMWorld
content.mWander.mDistance = static_cast<short>(value.toInt()); content.mWander.mDistance = static_cast<short>(value.toInt());
else else
return; // return without saving return; // return without saving
break; // always save
case 2: case 2:
if (content.mType == ESM::AI_Wander || if (content.mType == ESM::AI_Wander ||
content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort) content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
@ -1639,62 +1650,77 @@ namespace CSMWorld
content.mWander.mTimeOfDay = static_cast<unsigned char>(value.toInt()); content.mWander.mTimeOfDay = static_cast<unsigned char>(value.toInt());
else else
return; // return without saving return; // return without saving
break; // always save
case 4: case 4:
if (content.mType == ESM::AI_Wander)
break; // FIXME: idle
else
return; // return without saving
case 5: case 5:
if (content.mType == ESM::AI_Wander) case 6:
{ case 7:
content.mWander.mShouldRepeat = static_cast<unsigned char>(value.toInt());
break;
}
case 6: // NAME32
if (content.mType == ESM::AI_Activate)
{
content.mActivate.mName.assign(value.toString().toUtf8().constData());
break;
}
else
return; // return without saving
case 7: // NAME32
if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
{
content.mTarget.mId.assign(value.toString().toUtf8().constData());
break;
}
else
return; // return without saving
case 8: case 8:
if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
{
content.mCellName = std::string(value.toString().toUtf8().constData());
break;
}
else
return; // return without saving
case 9: case 9:
if (content.mType == ESM::AI_Travel)
content.mTravel.mZ = value.toFloat();
else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
content.mTarget.mZ = value.toFloat();
else
return; // return without saving
case 10: case 10:
if (content.mType == ESM::AI_Travel)
content.mTravel.mZ = value.toFloat();
else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
content.mTarget.mZ = value.toFloat();
else
return; // return without saving
case 11: case 11:
if (content.mType == ESM::AI_Wander)
content.mWander.mIdle[subColIndex-4] = static_cast<unsigned char>(value.toInt());
else
return; // return without saving
break; // always save
case 12:
if (content.mType == ESM::AI_Wander)
content.mWander.mShouldRepeat = static_cast<unsigned char>(value.toInt());
else
return; // return without saving
break; // always save
case 13: // NAME32
if (content.mType == ESM::AI_Activate)
content.mActivate.mName.assign(value.toString().toUtf8().constData());
else
return; // return without saving
break; // always save
case 14: // NAME32
if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
content.mTarget.mId.assign(value.toString().toUtf8().constData());
else
return; // return without saving
break; // always save
case 15:
if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
content.mCellName = std::string(value.toString().toUtf8().constData());
else
return; // return without saving
break; // always save
case 16:
if (content.mType == ESM::AI_Travel) if (content.mType == ESM::AI_Travel)
content.mTravel.mZ = value.toFloat(); content.mTravel.mZ = value.toFloat();
else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort) else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
content.mTarget.mZ = value.toFloat(); content.mTarget.mZ = value.toFloat();
else else
return; // return without saving return; // return without saving
break; // always save
case 17:
if (content.mType == ESM::AI_Travel)
content.mTravel.mZ = value.toFloat();
else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
content.mTarget.mZ = value.toFloat();
else
return; // return without saving
break; // always save
case 18:
if (content.mType == ESM::AI_Travel)
content.mTravel.mZ = value.toFloat();
else if (content.mType == ESM::AI_Follow || content.mType == ESM::AI_Escort)
content.mTarget.mZ = value.toFloat();
else
return; // return without saving
break; // always save
default: default:
throw std::runtime_error("Trying to access non-existing column in the nested table!"); throw std::runtime_error("Trying to access non-existing column in the nested table!");
} }
@ -1704,7 +1730,7 @@ namespace CSMWorld
virtual int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const virtual int getNestedColumnsCount(const RefIdColumn *column, const RefIdData& data) const
{ {
return 12; return 19;
} }
virtual int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const virtual int getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const

18
apps/opencs/model/world/refidcollection.cpp
View File

@ -203,8 +203,24 @@ CSMWorld::RefIdCollection::RefIdCollection(const CSMWorld::Data& data)
new RefIdColumn (Columns::ColumnId_AiDuration, CSMWorld::ColumnBase::Display_Integer)); new RefIdColumn (Columns::ColumnId_AiDuration, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn( mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_AiWanderToD, CSMWorld::ColumnBase::Display_Integer)); new RefIdColumn (Columns::ColumnId_AiWanderToD, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn( mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_AiWanderIdle, CSMWorld::ColumnBase::Display_Integer)); new RefIdColumn (Columns::ColumnId_Idle1, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_Idle2, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_Idle3, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_Idle4, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_Idle5, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_Idle6, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_Idle7, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_Idle8, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn( mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean)); new RefIdColumn (Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
mColumns.back().addColumn( mColumns.back().addColumn(