aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/base/world_database.sql35
-rw-r--r--sql/scripts/world_scripts_full.sql37
-rw-r--r--sql/updates/9026_world_script_texts.sql8
-rw-r--r--sql/updates/9123_world_spell_proc_event.sql2
4 files changed, 43 insertions, 39 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 15166e61d77..713b7d98fb9 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -181,7 +181,6 @@ DROP TABLE IF EXISTS `areatrigger_teleport`;
CREATE TABLE `areatrigger_teleport` (
`id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
`name` text,
- `access_id` bigint(20) unsigned NOT NULL DEFAULT '0',
`target_map` smallint(5) unsigned NOT NULL DEFAULT '0',
`target_position_x` float NOT NULL DEFAULT '0',
`target_position_y` float NOT NULL DEFAULT '0',
@@ -14677,6 +14676,40 @@ CREATE TABLE `spell_script_names` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
+-- Dumping data for table `spell_script_names`
+--
+
+LOCK TABLES `spell_script_names` WRITE;
+/*!40000 ALTER TABLE `spell_script_names` DISABLE KEYS */;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+-- warrior
+-- paladin
+( 20425, 'spell_pal_judgement_of_command'),
+(-20473, 'spell_pal_holy_shock'),
+( 37877, 'spell_pal_blessing_of_faith'),
+-- hunter
+( 23989, 'spell_hun_readiness'),
+( 53271, 'spell_hun_masters_call'),
+( 53478, 'spell_hun_last_stand_pet'),
+-- rogue
+( 5938, 'spell_rog_shiv'),
+( 14185, 'spell_rog_preparation'),
+( 31231, 'spell_rog_cheat_death'),
+( 51662, 'spell_rog_hunger_for_blood'),
+-- priest
+(-47540, 'spell_pri_penance'),
+-- death knight
+-- shaman
+-- mage
+( 11958, 'spell_mage_cold_snap'),
+( 31687, 'spell_mage_summon_water_elemental'),
+( 32826, 'spell_mage_polymorph_visual');
+-- warlock
+-- druid
+/*!40000 ALTER TABLE `spell_script_names` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `transports`
--
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index bcadf247174..2e3b3d39791 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1193,6 +1193,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_thorim' WHERE `entry`=29445;
UPDATE `creature_template` SET `ScriptName`='npc_goblin_prisoner' WHERE `entry`=29466;
UPDATE `gameobject_template` SET ScriptName='go_rusty_cage' WHERE `entry`=191544;
UPDATE `creature_template` SET `ScriptName`='npc_injured_goblin' WHERE `entry`=29434;
+UPDATE `creature_template` SET `ScriptName`= 'npc_roxi_ramrocket' WHERE `entry` = 31247;
/* STORMWIND CITY */
UPDATE `creature_template` SET `ScriptName`='npc_archmage_malin' WHERE `entry`=2708;
@@ -1643,36 +1644,6 @@ INSERT INTO areatrigger_scripts VALUES
(3066,'at_ravenholdt');
-- moved from world_spell_full.sql to here
-update creature_template set AIName='TurretAI',scriptname='' where entry=33139;
-update creature_template set ScriptName='boss_kologarn' where entry=32930;
-update creature_template set scriptname="boss_flame_leviathan_safety_container" where entry=33218;
-
-DELETE FROM `spell_script_names` WHERE `spell_id`=11958 AND `ScriptName`='spell_mage_cold_snap';
-DELETE FROM `spell_script_names` WHERE `spell_id`=32826 AND `ScriptName`='spell_mage_polymorph_visual';
-DELETE FROM `spell_script_names` WHERE `spell_id`=31687 AND `ScriptName`='spell_mage_summon_water_elemental';
-DELETE FROM `spell_script_names` WHERE `spell_id`=-47540 AND `ScriptName`='spell_pri_penance';
-DELETE FROM `spell_script_names` WHERE `spell_id`=31231 AND `ScriptName`='spell_rog_cheat_death';
-DELETE FROM `spell_script_names` WHERE `spell_id`=51662 AND `ScriptName`='spell_rog_hunger_for_blood';
-DELETE FROM `spell_script_names` WHERE `spell_id`=14185 AND `ScriptName`='spell_rog_preparation';
-DELETE FROM `spell_script_names` WHERE `spell_id`=5938 AND `ScriptName`='spell_rog_shiv';
-DELETE FROM `spell_script_names` WHERE `spell_id`=53271 AND `ScriptName`='spell_hun_masters_call';
-DELETE FROM `spell_script_names` WHERE `spell_id`=53478 AND `ScriptName`='spell_hun_last_stand_pet';
-DELETE FROM `spell_script_names` WHERE `spell_id`=23989 AND `ScriptName`='spell_hun_readiness';
-DELETE FROM `spell_script_names` WHERE `spell_id`=37877 AND `ScriptName`='spell_pal_blessing_of_faith';
-DELETE FROM `spell_script_names` WHERE `spell_id`=-20473 AND `ScriptName`='spell_pal_holy_shock';
-DELETE FROM `spell_script_names` WHERE `spell_id`=20425 AND `ScriptName`='spell_pal_judgement_of_command';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(11958,'spell_mage_cold_snap'),
-(32826,'spell_mage_polymorph_visual'),
-(31687,'spell_mage_summon_water_elemental'),
-(-47540, 'spell_pri_penance'),
-(31231,'spell_rog_cheat_death'),
-(51662,'spell_rog_hunger_for_blood'),
-(14185,'spell_rog_preparation'),
-(5938,'spell_rog_shiv'),
-(53271,'spell_hun_masters_call'),
-(53478,'spell_hun_last_stand_pet'),
-(23989,'spell_hun_readiness'),
-(37877,'spell_pal_blessing_of_faith'),
-(-20473,'spell_pal_holy_shock'),
-(20425,'spell_pal_judgement_of_command');
+update creature_template set `AIName`='TurretAI',`ScriptName`='' WHERE `entry`=33139;
+update creature_template set `ScriptName`= 'boss_kologarn' WHERE `entry`=32930;
+update creature_template set `scriptname`= 'boss_flame_leviathan_safety_container' WHERE `entry`=33218;
diff --git a/sql/updates/9026_world_script_texts.sql b/sql/updates/9026_world_script_texts.sql
index a71cd6aaee8..16f6752041e 100644
--- a/sql/updates/9026_world_script_texts.sql
+++ b/sql/updates/9026_world_script_texts.sql
@@ -1,7 +1,7 @@
-- script texts
DELETE FROM `script_texts` WHERE `npc_entry` IN (7607,7604);
INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
-(7607,-1209000,'Oh no! Here they come!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'Weegli Blastfuse SAY_WEEGLI_OHNO'),
-(7607,-1209001,'OK. Here I go.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'Weegli Blastfuse SAY_WEEGLI_OK_I_GO'),
-(7604,-1209002,'Placeholder 1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'Sergeant Bly SAY_1'),
-(7604,-1209003,'Placeholder 2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'Sergeant Bly SAY_2');
+(7607,-1209000, 'Oh no! Here they come!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0, 'Weegli Blastfuse SAY_WEEGLI_OHNO'),
+(7607,-1209001, 'OK. Here I go.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0 ,'Weegli Blastfuse SAY_WEEGLI_OK_I_GO'),
+(7604,-1209002, 'Placeholder 1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0, 'Sergeant Bly SAY_1'),
+(7604,-1209003, 'Placeholder 2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0, 'Sergeant Bly SAY_2');
diff --git a/sql/updates/9123_world_spell_proc_event.sql b/sql/updates/9123_world_spell_proc_event.sql
index 11275653e67..e58139087d3 100644
--- a/sql/updates/9123_world_spell_proc_event.sql
+++ b/sql/updates/9123_world_spell_proc_event.sql
@@ -2,4 +2,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (56342,56343,56344);
INSERT INTO `spell_proc_event`(`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
( 56342, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22), -- Lock and Load
( 56343, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22), -- Lock and Load
-( 56344, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22); -- Lock and Load \ No newline at end of file
+( 56344, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22); -- Lock and Load