Merge branch 'master' into 330

mangos · Apr 7, 2010 · 18bc24d · 18bc24d
2 parents 95039d1 + d6b3da1
commit 18bc24d
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 19 deletions.
diff --git a/sql/mangos.sql b/sql/mangos.sql
@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
   `cache_id` int(10) default '0',
-  `required_9663_01_mangos_mangos_string` bit(1) default NULL
+  `required_9690_01_mangos_spell_proc_event` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -18672,6 +18672,7 @@ INSERT INTO `spell_proc_event` VALUES
 (64127, 0x00000000,  6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (67228, 0x00000004, 11, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (67353, 0x00000000,  7, 0x00008000, 0x00100500, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
+(67361, 0x00000040,  7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  6),
 (67667, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (67672, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 50),
 (67702, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),

diff --git a/sql/mangos_spell_check.sql b/sql/mangos_spell_check.sql
diff --git a/sql/updates/9690_01_mangos_spell_proc_event.sql b/sql/updates/9690_01_mangos_spell_proc_event.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_9663_01_mangos_mangos_string required_9690_01_mangos_spell_proc_event bit;
+
+DELETE FROM `spell_proc_event` WHERE `entry` = 67361;
+INSERT INTO `spell_proc_event` VALUES
+(67361, 0x00000040,  7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  6);
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
@@ -105,6 +105,7 @@ pkgdata_DATA = \
 	9680_01_characters_character_stats.sql \
 	9686_01_characters_character_queststatus_weekly.sql \
 	9687_01_characters_character_queststatus_daily.sql \
+	9690_01_mangos_spell_proc_event.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -190,4 +191,5 @@ EXTRA_DIST = \
 	9680_01_characters_character_stats.sql \
 	9686_01_characters_character_queststatus_weekly.sql \
 	9687_01_characters_character_queststatus_daily.sql \
+	9690_01_mangos_spell_proc_event.sql \
 	README
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
@@ -3425,7 +3425,7 @@ void ObjectMgr::LoadQuests()
         if (qinfo->QuestFlags & QUEST_FLAGS_DAILY && qinfo->QuestFlags & QUEST_FLAGS_WEEKLY)
         {
             sLog.outErrorDb("Weekly Quest %u is marked as daily quest in `QuestFlags`, removed daily flag.",qinfo->GetQuestId());
-            qinfo->QuestFlags &= QUEST_FLAGS_DAILY;
+            qinfo->QuestFlags &= ~QUEST_FLAGS_DAILY;
         }
 
         if (qinfo->QuestFlags & QUEST_FLAGS_DAILY)

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
@@ -4579,7 +4579,7 @@ void Spell::EffectEnchantItemTmp(SpellEffectIndex eff_idx)
     uint32 duration;
 
     // rogue family enchantments exception by duration
-    if(m_spellInfo->Id == 38615)
+    if(m_spellInfo->Id == 38615)                            // Poison
         duration = 1800;                                    // 30 mins
     // other rogue family enchantments always 1 hour (some have spell damage=0, but some have wrong data in EffBasePoints)
     else if(m_spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE)
@@ -4596,9 +4596,9 @@ void Spell::EffectEnchantItemTmp(SpellEffectIndex eff_idx)
     // shaman rockbiter enchantments
     else if(m_spellInfo->SpellVisual[0] == 0)
         duration = 1800;                                    // 30 mins
-    else if(m_spellInfo->Id == 29702)
+    else if(m_spellInfo->Id == 29702)                       // Greater Ward of Shielding
         duration = 300;                                     // 5 mins
-    else if(m_spellInfo->Id == 37360)
+    else if(m_spellInfo->Id == 37360)                       // Consecrated Weapon
         duration = 300;                                     // 5 mins
     // default case
     else

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9688"
+ #define REVISION_NR "9691"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_9687_01_characters_character_queststatus_daily"
- #define REVISION_DB_MANGOS "required_9663_01_mangos_mangos_string"
+ #define REVISION_DB_MANGOS "required_9690_01_mangos_spell_proc_event"
  #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
 #endif // __REVISION_SQL_H__