diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-26 00:13:34 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-26 00:13:34 +0200 |
| commit | 3a63187b4725a5e07516c7cb94cd4e6b3853b5d7 (patch) | |
| tree | c1610521e6f4e4a3c70683721f4ab6a6ac67d610 /sql | |
| parent | 50cf908d787b8a0d84c95fcc681fc07189a3025e (diff) | |
| parent | 17fd20f50c09aaff6b6741353b8ab21bff8f12fd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
dep/PackageList.txt
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCfmt.h
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/auth/2014_06_23_00_auth_action_ip_logger.sql (renamed from sql/updates/auth/2014_06_23_00_action_ip_logger.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2014_06_22_00_world_locales_creature.sql (renamed from sql/updates/world/2014_06_22_00_locales_creature.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2014_06_22_01_world_gameobject.sql (renamed from sql/updates/world/2014_06_22_01_gameobject.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2014_06_25_08_world_conditions.sql | 8 |
4 files changed, 8 insertions, 0 deletions
diff --git a/sql/updates/auth/2014_06_23_00_action_ip_logger.sql b/sql/updates/auth/2014_06_23_00_auth_action_ip_logger.sql index 375b97d35fc..375b97d35fc 100644 --- a/sql/updates/auth/2014_06_23_00_action_ip_logger.sql +++ b/sql/updates/auth/2014_06_23_00_auth_action_ip_logger.sql diff --git a/sql/updates/world/2014_06_22_00_locales_creature.sql b/sql/updates/world/2014_06_22_00_world_locales_creature.sql index d24a4dd1f33..d24a4dd1f33 100644 --- a/sql/updates/world/2014_06_22_00_locales_creature.sql +++ b/sql/updates/world/2014_06_22_00_world_locales_creature.sql diff --git a/sql/updates/world/2014_06_22_01_gameobject.sql b/sql/updates/world/2014_06_22_01_world_gameobject.sql index 9a180b24c95..9a180b24c95 100644 --- a/sql/updates/world/2014_06_22_01_gameobject.sql +++ b/sql/updates/world/2014_06_22_01_world_gameobject.sql diff --git a/sql/updates/world/2014_06_25_08_world_conditions.sql b/sql/updates/world/2014_06_25_08_world_conditions.sql new file mode 100644 index 00000000000..e2e904ae063 --- /dev/null +++ b/sql/updates/world/2014_06_25_08_world_conditions.sql @@ -0,0 +1,8 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=8593 OR `SourceTypeOrReferenceId`=17 AND `SourceEntry`=8593; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 8593, 0, 0, 29, 0, 17542, 40, 0, 0, 0, 0, '', 'Symbol of Life can be casted within 40 yards of Young Furbolg Shaman'), +(17, 0, 8593, 0, 1, 29, 0, 6172, 40, 0, 0, 0, 0, '', 'Symbol of Life can be casted within 40 yards Henze Faulk'), +(17, 0, 8593, 0, 2, 29, 0, 6177, 40, 0, 0, 0, 0, '', 'Symbol of Life can be casted within 40 yards Henze Faulk'), +(13, 1, 8593, 0, 0, 31, 0, 3, 17542, 0, 0, 0, 0, '', 'Symbol of Life can be casted on Young Furbolg Shaman'), +(13, 1, 8593, 0, 1, 31, 0, 3, 6172, 0, 0, 0, 0, '', 'Symbol of Life can be casted on Henze Faulk'), +(13, 1, 8593, 0, 2, 31, 0, 3, 6177, 0, 0, 0, 0, '', 'Symbol of Life can be casted on Narm Faulk'); |