Skip to content

Commit 927a2b6

Browse files
heyitsbenchheyitsbench
committed
Adjust optional queries for structure changes.
1 parent 5bb4d81 commit 927a2b6

File tree

2 files changed

+32
-14
lines changed

2 files changed

+32
-14
lines changed

‎data/sql/world-optional/som-npc.sql

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ SET
55
@menu = 27525; -- Blizzlike (I think)
66

77
DELETE FROM `creature_template` WHERE `entry` = @entry;
8-
INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `modelid1`, `modelid2`, `modelid3`, `modelid4`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
9-
(@entry, 0, 0, 0, 0, 0, 127, 0, 0, 0, 'Cap\'n Placeholder', 'Beta Vendorrr and Teleporterrr', 'Speak', 27525, 60, 60, 0, 35, 4225, 2.5, 8, 4.72221994400024414, 7, 20, 2, 0, 0, 1, 2000, 2000, 1, 1, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 7, 134217728, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 45437); -- Somewhat blizzlike
8+
INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
9+
(@entry, 0, 0, 0, 0, 0, 'Cap\'n Placeholder', 'Beta Vendorrr and Teleporterrr', 'Speak', 27525, 60, 60, 0, 35, 4225, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 7, 134217728, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 45437); -- Somewhat blizzlike
10+
11+
DELETE FROM `creature_template_model` WHERE `CreatureID` = @entry;
12+
INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
13+
(@entry, 0, 127, 2, 1, 0);
1014

1115
DELETE FROM `creature` WHERE `id1` = @entry;
1216
INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES

‎data/sql/world-optional/wotlk-classic-npc.sql

+26-12
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,32 @@ SET
22
@guid = 4000002;
33

44
DELETE FROM `creature_template` WHERE `entry` IN (32753, 32754, 32755, 32756, 32757, 32758, 32759, 32760, 32761, 32762, 199387);
5-
INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `modelid1`, `modelid2`, `modelid3`, `modelid4`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
6-
(32753, 0, 0, 0, 0, 0, 25778, 0, 0, 0, 'Lok', 'Death Knight Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
7-
(32754, 0, 0, 0, 0, 0, 23662, 0, 0, 0, 'Austeen', 'Druid Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
8-
(32755, 0, 0, 0, 0, 0, 28184, 0, 0, 0, 'Holloway Fjordhammer', 'Hunter Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
9-
(32756, 0, 0, 0, 0, 0, 23665, 0, 0, 0, 'Linus Galespin', 'Mage Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
10-
(32757, 0, 0, 0, 0, 0, 23668, 0, 0, 0, 'Harold Dawson', 'Paladin Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
11-
(32758, 0, 0, 0, 0, 0, 23670, 0, 0, 0, 'Charlotte Made', 'Priest Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
12-
(32759, 0, 0, 0, 0, 0, 23672, 0, 0, 0, 'Libby Waterwheel', 'Rogue Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
13-
(32760, 0, 0, 0, 0, 0, 23778, 0, 0, 0, 'Juliet Stonehelm', 'Shaman Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
14-
(32761, 0, 0, 0, 0, 0, 23676, 0, 0, 0, 'Claire Littlesun', 'Warlock Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
15-
(32762, 0, 0, 0, 0, 0, 23779, 0, 0, 0, 'David Hume', 'Warrior Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
16-
(199387, 0, 0, 0, 0, 0, 29153, 0, 0, 0, 'D3-BA', 'Engineering Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 0.25, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 9, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368);
5+
INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
6+
(32753, 0, 0, 0, 0, 0, 'Lok', 'Death Knight Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
7+
(32754, 0, 0, 0, 0, 0, 'Austeen', 'Druid Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
8+
(32755, 0, 0, 0, 0, 0, 'Holloway Fjordhammer', 'Hunter Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
9+
(32756, 0, 0, 0, 0, 0, 'Linus Galespin', 'Mage Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
10+
(32757, 0, 0, 0, 0, 0, 'Harold Dawson', 'Paladin Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
11+
(32758, 0, 0, 0, 0, 0, 'Charlotte Made', 'Priest Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
12+
(32759, 0, 0, 0, 0, 0, 'Libby Waterwheel', 'Rogue Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
13+
(32760, 0, 0, 0, 0, 0, 'Juliet Stonehelm', 'Shaman Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
14+
(32761, 0, 0, 0, 0, 0, 'Claire Littlesun', 'Warlock Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
15+
(32762, 0, 0, 0, 0, 0, 'David Hume', 'Warrior Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368),
16+
(199387, 0, 0, 0, 0, 0, 'D3-BA', 'Engineering Supplies', '', 0, 80, 80, 2, 2007, 128, 2.5, 8, 4.72221994400024414, 7, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 9, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, '', 46368);
17+
18+
DELETE FROM `creature_template_model` WHERE `CreatureID` IN (32753, 32754, 32755, 32756, 32757, 32758, 32759, 32760, 32761, 32762, 199387);
19+
INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
20+
(32753, 0, 25778, 1, 1, 0),
21+
(32754, 0, 23662, 1, 1, 0),
22+
(32755, 0, 28184, 1, 1, 0),
23+
(32756, 0, 23665, 1, 1, 0),
24+
(32757, 0, 23668, 1, 1, 0),
25+
(32758, 0, 23670, 1, 1, 0),
26+
(32759, 0, 23672, 1, 1, 0),
27+
(32760, 0, 23778, 1, 1, 0),
28+
(32761, 0, 23676, 1, 1, 0),
29+
(32762, 0, 23779, 1, 1, 0),
30+
(199387, 0, 29153, 0.25, 1, 0);
1731

1832
DELETE FROM `creature` WHERE `id1` IN (32753, 32754, 32755, 32756, 32757, 32758, 32759, 32760, 32761, 32762, 199387);
1933
INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES

0 commit comments

Comments
 (0)