mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quests and combopoints should work once again.

Browse source
This commit is contained in:
tomrus88 2010-03-31 16:23:52 +04:00
parent 50bed7c7da
commit a4a56adf3d
4 changed files with 23 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/game/Player.cpp
View file

@ -12801,11 +12801,11 @@ void Player::PrepareQuestMenu( uint64 guid )
uint32 quest_id = i->second; uint32 quest_id = i->second;
QuestStatus status = GetQuestStatus( quest_id ); QuestStatus status = GetQuestStatus( quest_id );
if ( status == QUEST_STATUS_COMPLETE && !GetQuestRewardStatus( quest_id ) ) if ( status == QUEST_STATUS_COMPLETE && !GetQuestRewardStatus( quest_id ) )
qm.AddMenuItem(quest_id, DIALOG_STATUS_REWARD); qm.AddMenuItem(quest_id, 4);
else if ( status == QUEST_STATUS_INCOMPLETE ) else if ( status == QUEST_STATUS_INCOMPLETE )
qm.AddMenuItem(quest_id, DIALOG_STATUS_INCOMPLETE); qm.AddMenuItem(quest_id, 4);
else if (status == QUEST_STATUS_AVAILABLE ) else if (status == QUEST_STATUS_AVAILABLE )
qm.AddMenuItem(quest_id, DIALOG_STATUS_AVAILABLE); qm.AddMenuItem(quest_id, 2);
} }
for(QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i) for(QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i)
@ -12817,9 +12817,9 @@ void Player::PrepareQuestMenu( uint64 guid )
QuestStatus status = GetQuestStatus( quest_id ); QuestStatus status = GetQuestStatus( quest_id );
if (pQuest->IsAutoComplete() && CanTakeQuest(pQuest, false)) if (pQuest->IsAutoComplete() && CanTakeQuest(pQuest, false))
qm.AddMenuItem(quest_id, DIALOG_STATUS_AVAILABLE_REP); qm.AddMenuItem(quest_id, 4);
else if ( status == QUEST_STATUS_NONE && CanTakeQuest( pQuest, false ) ) else if ( status == QUEST_STATUS_NONE && CanTakeQuest( pQuest, false ) )
qm.AddMenuItem(quest_id, DIALOG_STATUS_AVAILABLE); qm.AddMenuItem(quest_id, 2);
} }
} }
@ -12832,7 +12832,7 @@ void Player::SendPreparedQuest(uint64 guid)
QuestMenuItem const& qmi0 = questMenu.GetItem(0); QuestMenuItem const& qmi0 = questMenu.GetItem(0);
uint32 status = qmi0.m_qIcon; uint32 icon = qmi0.m_qIcon;
// single element case // single element case
if (questMenu.MenuItemCount() == 1) if (questMenu.MenuItemCount() == 1)
@ -12843,9 +12843,9 @@ void Player::SendPreparedQuest(uint64 guid)
if (pQuest) if (pQuest)
{ {
if (status == DIALOG_STATUS_REWARD && !GetQuestRewardStatus(quest_id)) if (icon == 4 && !GetQuestRewardStatus(quest_id))
PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, CanRewardQuest(pQuest, false), true); PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, CanRewardQuest(pQuest, false), true);
else if (status == DIALOG_STATUS_INCOMPLETE) else if (icon == 4)
PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, CanRewardQuest(pQuest, false), true); PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, CanRewardQuest(pQuest, false), true);
// Send completable on repeatable and autoCompletable quest if player don't have quest // Send completable on repeatable and autoCompletable quest if player don't have quest
// TODO: verify if check for !pQuest->IsDaily() is really correct (possibly not) // TODO: verify if check for !pQuest->IsDaily() is really correct (possibly not)

20
src/game/Spell.cpp
View file

@ -353,7 +353,7 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, ObjectGuid o
UpdateOriginalCasterPointer(); UpdateOriginalCasterPointer();
for(int i = 0; i < MAX_EFFECT_INDEX; ++i) for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
m_currentBasePoints[i] = m_spellInfo->EffectBasePoints[i]; m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(i));
m_spellState = SPELL_STATE_NULL; m_spellState = SPELL_STATE_NULL;
@ -3889,29 +3889,19 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
damage = int32(CalculateDamage(i, unitTarget) * DamageMultiplier); damage = int32(CalculateDamage(i, unitTarget) * DamageMultiplier);
sLog.outDebug( "Spell %u Effect%d : %u", m_spellInfo->Id, i, eff); sLog.outDebug("Spell %u Effect%d : %u", m_spellInfo->Id, i, eff);
if(eff<TOTAL_SPELL_EFFECTS) if(eff < TOTAL_SPELL_EFFECTS)
{ {
//sLog.outDebug( "WORLD: Spell FX %d < TOTAL_SPELL_EFFECTS ", eff); //sLog.outDebug( "WORLD: Spell FX %d < TOTAL_SPELL_EFFECTS ", eff);
(*this.*SpellEffects[eff])(i); (*this.*SpellEffects[eff])(i);
} }
/*
else else
{ {
sLog.outDebug( "WORLD: Spell FX %d > TOTAL_SPELL_EFFECTS ", eff); sLog.outError("WORLD: Spell FX %d > TOTAL_SPELL_EFFECTS ", eff);
if (m_CastItem)
EffectEnchantItemTmp(i);
else
{
sLog.outError("SPELL: unknown effect %u spell id %u",
eff, m_spellInfo->Id);
}
} }
*/
} }
void Spell::AddTriggeredSpell( uint32 spellId ) void Spell::AddTriggeredSpell( uint32 spellId )
{ {
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId ); SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
@ -6265,7 +6255,7 @@ SpellCastResult Spell::CanOpenLock(SpellEffectIndex effIndex, uint32 lockId, Ski
{ {
// skill bonus provided by casting spell (mostly item spells) // skill bonus provided by casting spell (mostly item spells)
// add the damage modifier from the spell casted (cheat lock / skeleton key etc.) (use m_currentBasePoints, CalculateDamage returns wrong value) // add the damage modifier from the spell casted (cheat lock / skeleton key etc.) (use m_currentBasePoints, CalculateDamage returns wrong value)
uint32 spellSkillBonus = uint32(m_currentBasePoints[effIndex]+1); uint32 spellSkillBonus = uint32(m_currentBasePoints[effIndex]);
reqSkillValue = lockInfo->Skill[j]; reqSkillValue = lockInfo->Skill[j];
// castitem check: rogue using skeleton keys. the skill values should not be added in this case. // castitem check: rogue using skeleton keys. the skill values should not be added in this case.

4
src/game/SpellAuras.cpp
View file

@ -384,7 +384,7 @@ m_isRemovedOnShapeLost(true), m_in_use(0), m_deleted(false)
m_spellProto = spellproto; m_spellProto = spellproto;
m_currentBasePoints = currentBasePoints ? *currentBasePoints : m_spellProto->EffectBasePoints[eff]; m_currentBasePoints = currentBasePoints ? *currentBasePoints : m_spellProto->EffectBasePoints[eff] + 1;
m_isPassive = IsPassiveSpell(GetId()); m_isPassive = IsPassiveSpell(GetId());
m_positive = IsPositiveEffect(GetId(), m_effIndex); m_positive = IsPositiveEffect(GetId(), m_effIndex);
@ -397,7 +397,7 @@ m_isRemovedOnShapeLost(true), m_in_use(0), m_deleted(false)
if(!caster) if(!caster)
{ {
m_caster_guid = target->GetGUID(); m_caster_guid = target->GetGUID();
damage = m_currentBasePoints+1; // stored value-1 damage = m_currentBasePoints; // stored value-1
m_maxduration = target->CalculateSpellDuration(m_spellProto, m_effIndex, target); m_maxduration = target->CalculateSpellDuration(m_spellProto, m_effIndex, target);
} }
else else

16
src/game/SpellEffects.cpp
View file

@ -2107,7 +2107,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
if (!unitTarget) if (!unitTarget)
return; return;
uint32 spell_id = m_currentBasePoints[eff_idx]+1; uint32 spell_id = m_currentBasePoints[eff_idx];
SpellEntry const* spell_proto = sSpellStore.LookupEntry(spell_id); SpellEntry const* spell_proto = sSpellStore.LookupEntry(spell_id);
if (!spell_proto) if (!spell_proto)
return; return;
@ -3197,9 +3197,9 @@ void Spell::DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype)
int32 basePoints = m_currentBasePoints[eff_idx]; int32 basePoints = m_currentBasePoints[eff_idx];
int32 randomPoints = m_spellInfo->EffectDieSides[eff_idx]; int32 randomPoints = m_spellInfo->EffectDieSides[eff_idx];
if (randomPoints) if (randomPoints)
num_to_add = basePoints + irand(1, randomPoints); num_to_add = basePoints + irand(0, randomPoints);
else else
num_to_add = basePoints + 1; num_to_add = basePoints;
} }
else if (pProto->MaxCount == 1) else if (pProto->MaxCount == 1)
num_to_add = 1; num_to_add = 1;
@ -3207,7 +3207,7 @@ void Spell::DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype)
{ {
int32 basePoints = m_currentBasePoints[eff_idx]; int32 basePoints = m_currentBasePoints[eff_idx];
float pointPerLevel = m_spellInfo->EffectRealPointsPerLevel[eff_idx]; float pointPerLevel = m_spellInfo->EffectRealPointsPerLevel[eff_idx];
num_to_add = basePoints + 1 + uint32((player->getLevel() - m_spellInfo->spellLevel)*pointPerLevel); num_to_add = basePoints + uint32((player->getLevel() - m_spellInfo->spellLevel)*pointPerLevel);
} }
else else
num_to_add = 2; num_to_add = 2;
@ -6439,11 +6439,11 @@ void Spell::EffectEnchantHeldItem(SpellEffectIndex eff_idx)
if (m_spellInfo->EffectMiscValue[eff_idx]) if (m_spellInfo->EffectMiscValue[eff_idx])
{ {
uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx]; uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx];
int32 duration = GetSpellDuration(m_spellInfo); //Try duration index first .. int32 duration = GetSpellDuration(m_spellInfo); // Try duration index first...
if(!duration) if(!duration)
duration = m_currentBasePoints[eff_idx]+1; //Base points after .. duration = m_currentBasePoints[eff_idx]; // Base points after...
if(!duration) if(!duration)
duration = 10; //10 seconds for enchants which don't have listed duration duration = 10; // 10 seconds for enchants which don't have listed duration
SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id); SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
if(!pEnchant) if(!pEnchant)
@ -6704,7 +6704,7 @@ void Spell::EffectReputation(SpellEffectIndex eff_idx)
Player *_player = (Player*)unitTarget; Player *_player = (Player*)unitTarget;
int32 rep_change = m_currentBasePoints[eff_idx]+1; // field store reputation change -1 int32 rep_change = m_currentBasePoints[eff_idx]; // field store reputation change -1
uint32 faction_id = m_spellInfo->EffectMiscValue[eff_idx]; uint32 faction_id = m_spellInfo->EffectMiscValue[eff_idx];