diff options
| author | Malcrom <malcromdev@gmail.com> | 2012-02-10 19:48:52 -0330 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2012-02-10 19:48:52 -0330 |
| commit | d5192bafa0cc3c92dfac08959921f73a2dc82f6b (patch) | |
| tree | 8daa57d9708d4bcfd14ad6ced849864173ea738a /sql | |
| parent | be64238b45bc5550fc61071ae4752c941b45d331 (diff) | |
| parent | 9d455c1e6f5f841594e6de4dd128439059685c89 (diff) | |
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2012_02_10_02_world_conditions.sql | 9 | ||||
| -rw-r--r-- | sql/updates/world/2012_02_10_03_world_conditions.sql | 2 | ||||
| -rw-r--r-- | sql/updates/world/2012_02_10_04_world_conditions.sql | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/sql/updates/world/2012_02_10_02_world_conditions.sql b/sql/updates/world/2012_02_10_02_world_conditions.sql new file mode 100644 index 00000000000..66d72e1be3a --- /dev/null +++ b/sql/updates/world/2012_02_10_02_world_conditions.sql @@ -0,0 +1,9 @@ +-- CONDITION_NO_AURA -> CONDITION_AURA + NegativeCondition +DELETE FROM `conditions` WHERE `NegativeCondition`=1 AND `ConditionTypeOrReference`=1; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) SELECT `SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`, 1 ,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, 1 ,`ErrorTextId`,`ScriptName`,`Comment` FROM `conditions` WHERE `ConditionTypeOrReference`=11; +DELETE FROM `conditions` WHERE `ConditionTypeOrReference`=11; + +-- CONDITION_NOITEM -> CONDITION_ITEM + NegativeCondition +DELETE FROM `conditions` WHERE `NegativeCondition`=1 AND `ConditionTypeOrReference`=2; -- not a typo +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) SELECT `SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`, 2 ,`ConditionValue1`, 1 ,`ConditionValue2`, 1 ,`ErrorTextId`,`ScriptName`,`Comment` FROM `conditions` WHERE `ConditionTypeOrReference`=26; +DELETE FROM `conditions` WHERE `ConditionTypeOrReference`=26; diff --git a/sql/updates/world/2012_02_10_03_world_conditions.sql b/sql/updates/world/2012_02_10_03_world_conditions.sql new file mode 100644 index 00000000000..b46684df7d5 --- /dev/null +++ b/sql/updates/world/2012_02_10_03_world_conditions.sql @@ -0,0 +1,2 @@ +-- CONDITION_SPELL with ConditionValue2 = 1 -> CONDITION_SPELL + NegativeCondition +UPDATE `conditions` SET `NegativeCondition` = 1, `ConditionValue2` = 0 WHERE `ConditionTypeOrReference` = 25 AND `ConditionValue2` = 1; diff --git a/sql/updates/world/2012_02_10_04_world_conditions.sql b/sql/updates/world/2012_02_10_04_world_conditions.sql new file mode 100644 index 00000000000..4703ec29044 --- /dev/null +++ b/sql/updates/world/2012_02_10_04_world_conditions.sql @@ -0,0 +1 @@ +ALTER TABLE `conditions` ADD COLUMN `ConditionTarget` tinyint(3) UNSIGNED NOT NULL default '0' AFTER `ConditionTypeOrReference`; |