diff options
| author | Spp <spp@jorge.gr> | 2013-02-05 09:57:14 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-02-05 09:57:14 +0100 |
| commit | f7c7f0f0f6cc21549e52fd7eb0c6f1053ff374b5 (patch) | |
| tree | 0f3548bd95df68203f80bb72d78150a7a43d277f /sql/updates/world | |
| parent | c4d3b831912b46e836de22e6cd773396b661fa29 (diff) | |
| parent | fedc26a115dc80457528af39ee699e00793eda12 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/scripts/Kalimdor/zone_durotar.cpp
Diffstat (limited to 'sql/updates/world')
| -rw-r--r-- | sql/updates/world/2013_02_04_07_world_achievement_criteria_data.sql | 20 | ||||
| -rw-r--r-- | sql/updates/world/2013_02_04_08_world_creature_template.sql | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/sql/updates/world/2013_02_04_07_world_achievement_criteria_data.sql b/sql/updates/world/2013_02_04_07_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..dc873a02dfd --- /dev/null +++ b/sql/updates/world/2013_02_04_07_world_achievement_criteria_data.sql @@ -0,0 +1,20 @@ +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3931,12859,4227,3929); +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES +-- aliance +-- Kissed Sraaz +(3931,1,9099,0,''), +(3931,11,0,0,'achievement_flirt_with_disaster_perf_check'), +(3931,15,3,0,''), +-- Handful of Rose Petals on Sraaz +(12859,1,9099,0,''), +(12859,11,0,0,'achievement_flirt_with_disaster_perf_check'), +(12859,15,3,0,''), +-- horde +-- Kissed Jeremiah Payson +(3929,1,8403,0,''), +(3929,11,0,0,'achievement_flirt_with_disaster_perf_check'), +(3929,15,3,0,''), +-- Handful of Rose Petals on Jeremiah Payson +(4227,1,8403,0,''), +(4227,11,0,0,'achievement_flirt_with_disaster_perf_check'), +(4227,15,3,0,''); diff --git a/sql/updates/world/2013_02_04_08_world_creature_template.sql b/sql/updates/world/2013_02_04_08_world_creature_template.sql new file mode 100644 index 00000000000..3dd365366b6 --- /dev/null +++ b/sql/updates/world/2013_02_04_08_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `faction_A`=15, `faction_H`=15, `speed_walk`=1.111112, `baseattacktime`=2000, `rangeattacktime`=2000, `dynamicflags`=0 WHERE `entry`=3094; -- Unseen |