diff options
| -rw-r--r-- | sql/updates/world/3.3.5/2016_05_30_09_world.sql | 5 | ||||
| -rw-r--r-- | sql/updates/world/3.3.5/2016_05_30_10_world.sql | 26 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 |
5 files changed, 34 insertions, 3 deletions
diff --git a/sql/updates/world/3.3.5/2016_05_30_09_world.sql b/sql/updates/world/3.3.5/2016_05_30_09_world.sql new file mode 100644 index 00000000000..3ec588d0982 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_05_30_09_world.sql @@ -0,0 +1,5 @@ +UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=1144; +UPDATE `creature_template` SET `flags_extra`=64 WHERE `entry` IN(28111,28112,28078,28079,23667, 23668, 32669,28844,28843,24199,24198,23564); +UPDATE `reference_loot_template` SET `GroupId`=2 WHERE `Entry`=34203 AND `Item`=43959; +UPDATE `smart_scripts` SET `target_type`=12, `target_param1`=1 WHERE `entryorguid`=2735500 AND `source_type`=9 AND `id`=5 AND `link`=0; +UPDATE `gameobject` SET `position_x`=5445.057129, `position_y`=4908.831543, `position_z`=-189.508224 WHERE `guid`=99748; diff --git a/sql/updates/world/3.3.5/2016_05_30_10_world.sql b/sql/updates/world/3.3.5/2016_05_30_10_world.sql new file mode 100644 index 00000000000..b8dbe0b94a6 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_05_30_10_world.sql @@ -0,0 +1,26 @@ +DELETE FROM `gameobject_loot_template` WHERE `Entry`=26782; +INSERT INTO `gameobject_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(26782, 44724, 0, 100, 0, 1, 1, 1, 1, NULL), -- Everfrost Chip +(26782, 44725, 0, 19, 0, 1, 2, 1, 1, NULL), -- Everfrost Chip (Quest Starter) +(26782, 44729, 0, 81, 0, 1, 2, 1, 1, NULL); -- Everfrost Powder + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=4 AND `SourceGroup`=26782; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(4, 26782, 44724, 0, 1, 8, 0, 13420, 0, 0, 0, 0, 0, '', NULL), -- Everfrost Chip only drops if player is rewarded for ever frost, +(4, 26782, 44729, 0, 0, 9, 0, 13420, 0, 0, 1, 0, 0, '', NULL), -- Everfrost powder only drops if player has not taken or completed Everfrost, +(4, 26782, 44729, 0, 0, 8, 0, 13420, 0, 0, 1, 0, 0, '', NULL), -- Everfrost powder only drops if player has not taken or completed Everfrost, +(4, 26782, 44725, 0, 0, 9, 0, 13420, 0, 0, 1, 0, 0, '', NULL), -- Everfrost Chip (Quest Starter) only drops if player has not taken or completed Everfrost, +(4, 26782, 44725, 0, 0, 8, 0, 13420, 0, 0, 1, 0, 0, '', NULL), -- Everfrost Chip (Quest Starter) only drops if player has not taken or completed Everfrost, +(4, 26782, 44725, 0, 0, 5, 0, 1119, 8, 0, 0, 0, 0, '', NULL); -- Everfrost Chip (Quest Starter) only drops if player is friendly with Sons of Hodir, + +UPDATE `quest_template_addon` SET `SpecialFlags`=1 WHERE `ID`=13421; + +DELETE FROM `creature_questender` WHERE `quest`=13421; +INSERT INTO `creature_questender` (`id`, `quest`) VALUES +(32594, 13421); + +DELETE FROM `creature_queststarter` WHERE `quest`=13421; +INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES +(32594, 13421); + +UPDATE `quest_template_addon` SET `PrevQuestID`=13420 WHERE `ID`=13421; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 56042e05257..70eb7ad76bf 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3750,6 +3750,8 @@ void SpellMgr::LoadSpellInfoCorrections() case 45257: // Using Steam Tonk Controller case 45440: // Steam Tonk Controller case 60256: // Collect Sample + case 45634: // Neural Needle + case 54897: // Flaming Arrow // Crashes client on pressing ESC spellInfo->AttributesEx4 &= ~SPELL_ATTR4_CAN_CAST_WHILE_CASTING; break; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index d84fe11383f..37457f36145 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -659,9 +659,8 @@ void World::LoadConfigSettings(bool reload) m_float_configs[CONFIG_GROUP_XP_DISTANCE] = sConfigMgr->GetFloatDefault("MaxGroupXPDistance", 74.0f); m_float_configs[CONFIG_MAX_RECRUIT_A_FRIEND_DISTANCE] = sConfigMgr->GetFloatDefault("MaxRecruitAFriendBonusDistance", 100.0f); - /// @todo Add MonsterSight and GuarderSight (with meaning) in worldserver.conf or put them as define + /// @todo Add MonsterSight (with meaning) in worldserver.conf or put them as define m_float_configs[CONFIG_SIGHT_MONSTER] = sConfigMgr->GetFloatDefault("MonsterSight", 50.0f); - m_float_configs[CONFIG_SIGHT_GUARDER] = sConfigMgr->GetFloatDefault("GuarderSight", 50.0f); if (reload) { diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 330e78cf510..4456b7a553e 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -183,7 +183,6 @@ enum WorldFloatConfigs CONFIG_GROUP_XP_DISTANCE = 0, CONFIG_MAX_RECRUIT_A_FRIEND_DISTANCE, CONFIG_SIGHT_MONSTER, - CONFIG_SIGHT_GUARDER, CONFIG_LISTEN_RANGE_SAY, CONFIG_LISTEN_RANGE_TEXTEMOTE, CONFIG_LISTEN_RANGE_YELL, |