Browse Source

Only play the dialogs for the initating player (#6173)

* Only play the The Chamber of Bone lore for the reader

* Only play dialog for the player who is having the conversation

* Allow rock quest when skipping to level 5
pull/6174/head
Anders Jenbo 3 years ago committed by GitHub
parent
commit
13e3217578
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      Source/monster.cpp
  2. 5
      Source/objects.cpp
  3. 2
      Source/towners.cpp

3
Source/monster.cpp

@ -4480,7 +4480,8 @@ Monster *PreSpawnSkeleton()
void TalktoMonster(Player &player, Monster &monster)
{
monster.mode = MonsterMode::Talk;
if (&player == MyPlayer)
monster.mode = MonsterMode::Talk;
if (monster.uniqueType == UniqueMonsterType::SnotSpill
&& Quests[Q_LTBANNER].IsAvailable() && Quests[Q_LTBANNER]._qvar1 == 2) {

5
Source/objects.cpp

@ -2099,8 +2099,8 @@ void OperateChamberOfBoneBook(Object &questBook, bool sendmsg)
Quests[Q_SCHAMB]._qmsg = textdef;
NetSendCmdQuest(true, Quests[Q_SCHAMB]);
NetSendCmdLoc(MyPlayerId, false, CMD_OPERATEOBJ, questBook.position);
InitQTextMsg(textdef);
}
InitQTextMsg(textdef);
}
void OperateChest(const Player &player, Object &chest, bool sendLootMsg)
@ -3213,7 +3213,8 @@ void OperateBookcase(Object &bookcase, bool sendmsg, bool sendLootMsg)
zhar.talkMsg = TEXT_ZHAR2;
M_StartStand(zhar, zhar.direction); // BUGFIX: first parameter in call to M_StartStand should be MAX_PLRS, not 0. (fixed)
zhar.goal = MonsterGoal::Attack;
zhar.mode = MonsterMode::Talk;
if (sendmsg)
zhar.mode = MonsterMode::Talk;
}
}
if (sendmsg)

2
Source/towners.cpp

@ -377,7 +377,7 @@ void TalkToDeadguy(Player &player, Towner & /*deadguy*/)
void TalkToBlackSmith(Player &player, Towner &blackSmith)
{
if (Quests[Q_ROCK]._qactive != QUEST_NOTAVAIL) {
if (player._pLvlVisited[4] && Quests[Q_ROCK]._qactive != QUEST_DONE) {
if ((player._pLvlVisited[4] || player._pLvlVisited[5]) && Quests[Q_ROCK]._qactive != QUEST_DONE) {
if (Quests[Q_ROCK]._qvar2 == 0) {
Quests[Q_ROCK]._qvar2 = 1;
Quests[Q_ROCK]._qlog = true;

Loading…
Cancel
Save