Skip to content

Fix Compile Issue and Update Trainers/SQL #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SoulSeekkor wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Fix Compile Issue and Update Trainers/SQL #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
01b12a6
Updated First Aid trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
27114ab
Added SQL for updating existing instances of the First Aid trainer.
SoulSeekkor Apr 21, 2022
193b111
Updated Enchanting trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
1a81dec
Updated Inscription trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
524f462
Updated Jewelcrafting trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
6d7abaa
Updated Herbalism trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
ac7a886
Updated Blacksmithing trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
2083f38
Updated Mining trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
59f193f
Updated Alchemy trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
ba810b3
Updated Skinning trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
c3b6087
Updated Leatherworking trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
deb3ddc
Updated Tailoring trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
a575ae4
Updated Engineering trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
bd47a3e
Updated Fishing trainer to the Dalaran version.
SoulSeekkor Apr 21, 2022
cad0cdb
Added necessary semicolons for multiple updates.
SoulSeekkor Apr 21, 2022
de80df8
Added note about update statements usage.
SoulSeekkor Apr 21, 2022
ca93bca
Updated Cooking trainer to the Argent Crusade version.
SoulSeekkor Apr 23, 2022
2d0ac98
Added Stove object for purchase.
SoulSeekkor Apr 23, 2022
cf5c3b5
Fixed formatting.
SoulSeekkor Apr 24, 2022
026bd59
Updated Stove entry.
SoulSeekkor Apr 24, 2022
8293653
Updated Cooking trainer position.
SoulSeekkor Apr 24, 2022
9a65350
Revamped guild house spawns table query to remove unneeded id column.
SoulSeekkor Apr 24, 2022
51bd77f
Updated Forge and Anvil locations.
SoulSeekkor Apr 24, 2022
465507a
Updated Blacksmithing trainer position.
SoulSeekkor Apr 24, 2022
941e6f2
Updated Mining trainer position.
SoulSeekkor Apr 24, 2022
3249798
Moved the Tailoring trainer to where the Mining trainer used to be.
SoulSeekkor Apr 24, 2022
ce8df14
Updated auctioneer positioning and changed it so that both faction au…
SoulSeekkor Apr 24, 2022
d1c565d
Fixed to update both old and current Cooking trainers' position.
SoulSeekkor Apr 24, 2022
e1681bd
Fixed update SQL for Forge/Anvil positioning.
SoulSeekkor Apr 24, 2022
4f43e08
Moved the Alchemy trainer to where the Blacksmithing trainer used to be.
SoulSeekkor Apr 24, 2022
fbda23f
Updated Stable Master position.
SoulSeekkor Apr 24, 2022
03c3a26
Updated to spawn both starter portals when purchasing a guild house t…
SoulSeekkor May 1, 2022
d687f96
Updated to spawn multiple trainers for the 3 that require it.
SoulSeekkor May 1, 2022
9c4c39a
Updated to note that the existing trainers are Grand Master level.
SoulSeekkor May 1, 2022
91ceb37
Updated existing Enchanting trainer position.
SoulSeekkor May 1, 2022
586d7bd
Added Master level Enchanting trainer.
SoulSeekkor May 1, 2022
b2f755d
Updated existing Leatherworking trainer position.
SoulSeekkor May 1, 2022
7df04c2
Added Master level Leatherworking trainer.
SoulSeekkor May 1, 2022
07d3881
Updated existing Alchemy trainer position and added new Master level …
SoulSeekkor May 1, 2022
3492ceb
Fixed typo.
SoulSeekkor May 1, 2022
06ccb9a
Updated SQL query to include newly updated trainer positions.
SoulSeekkor May 1, 2022
5d4233b
Added player parameter back to SpawnStarterPortal().
SoulSeekkor May 1, 2022
815d565
Updated to cut the cost in half when spawning 2 NPC trainers.
SoulSeekkor May 1, 2022
c0c73ed
Removed the innkeeper as the NPC served no purpose.
SoulSeekkor May 1, 2022
5cb022d
Updated to make the cost for profession trainers free initially, this…
SoulSeekkor May 1, 2022
71ba676
Added the ability to add the starter portal for their faction for fre…
SoulSeekkor May 1, 2022
485fc49
Updated SQL to remove innkeeper from the creature template table.
SoulSeekkor May 1, 2022
91bfbde
Updated to fix compile error due to GetGOData being renamed to GetGam…
SoulSeekkor Feb 6, 2023
775bae1
Update src/mod_guildhouse.cpp
SoulSeekkor Nov 20, 2023
bcbfd96
Update src/mod_guildhouse_butler.cpp
SoulSeekkor Nov 20, 2023
16e7e33
Update src/mod_guildhouse_butler.cpp
SoulSeekkor Nov 20, 2023
eb3ed81
Update src/mod_guildhouse_butler.cpp
SoulSeekkor Nov 20, 2023
a496563
Update src/mod_guildhouse.cpp
SoulSeekkor Nov 20, 2023
a18fe12
Update src/mod_guildhouse_butler.cpp
SoulSeekkor Nov 20, 2023
59e1713
Update src/mod_guildhouse.cpp
SoulSeekkor Nov 20, 2023
783baae
Update src/mod_guildhouse.cpp
SoulSeekkor Nov 20, 2023
967607b
Update src/mod_guildhouse.cpp
SoulSeekkor Nov 20, 2023
b7ddf03
Update src/mod_guildhouse.cpp
SoulSeekkor Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions conf/mod_guildhouse.conf.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ CostGuildHouse = 10000000
#
GuildHouseMailbox = 500000

# GuildHouseInnKeeper
#
# The amount of money to buy a Innkeeper for your guild house
# default = 1000000 (100g)
#
GuildHouseInnKeeper = 1000000

# GuildHouseBank
#
# The amount of money to buy a bank for your guild house
Expand Down
6 changes: 2 additions & 4 deletions sql/world/creatures_objects.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ SET @C_TEMPLATE = 500030;

DELETE FROM `creature_template` WHERE `entry` IN (
@C_TEMPLATE + 0,
@C_TEMPLATE + 1,
@C_TEMPLATE + 2
@C_TEMPLATE + 1
);

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
(@C_TEMPLATE + 0, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Talamortis', 'Guild House Seller', '', 0, 35, 35, 0, 35, 0, 1, 1.14286, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 33536, 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, 'GuildHouseSeller', 12340),
(@C_TEMPLATE + 1, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Xrispins', 'Guild House Butler', '', 0, 35, 35, 0, 35, 0, 1, 1.14286, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 33536, 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, 'GuildHouseSpawner', 12340),
(@C_TEMPLATE + 2, 0, 0, 0, 0, 0, 18234, 0, 0, 0, 'Innkeeper Monica', NULL, NULL, 0, 1, 2, 0, 35, 65536, 0.8, 0.28571, 1, 1, 20, 1, 0, 0, 4.6, 2000, 1900, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 1, 1, 1, 1, 1, 1, 0, 70, 1, 0, 0, 2, 'npc_innkeeper', 12340);
(@C_TEMPLATE + 1, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Xrispins', 'Guild House Butler', '', 0, 35, 35, 0, 35, 0, 1, 1.14286, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 33536, 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, 'GuildHouseSpawner', 12340);

-- !!! NOTE: set these before running the queries in order to avoid conflicts !!!
SET @GO_TEMPLATE = 500000;
Expand Down
192 changes: 132 additions & 60 deletions sql/world/guildhouse_spawns.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,140 @@
DROP TABLE IF EXISTS `guild_house_spawns`;

CREATE TABLE IF NOT EXISTS `guild_house_spawns` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`entry` int(11) NOT NULL DEFAULT '0',
`posX` float NOT NULL DEFAULT '0',
`posY` float NOT NULL DEFAULT '0',
`posZ` float NOT NULL DEFAULT '0',
`orientation` float NOT NULL DEFAULT '0',
`comment` varchar(500) DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `entry` (`entry`)
) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8;

REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orientation`, `comment`) VALUES
(1, 26327, 16216.5, 16279.4, 20.9306, 0.552869, 'Paladin Trainer'),
(2, 26324, 16221.3, 16275.7, 20.9285, 1.37363, 'Druid Trainer'),
(3, 26325, 16218.6, 16277, 20.9872, 0.967188, 'Hunter Trainer'),
(4, 26326, 16224.9, 16274.9, 20.9319, 1.58765, 'Mage Trainer'),
(5, 26328, 16227.9, 16275.9, 20.9254, 1.9941, 'Priest Trainer'),
(6, 26329, 16231.4, 16278.1, 20.9222, 2.20026, 'Rogue Trainer'),
(7, 26330, 16235.5, 16280.8, 20.9257, 2.18652, 'Shaman Trainer'),
(8, 26331, 16240.8, 16283.3, 20.9299, 1.86843, 'Warlock Trainer'),
(9, 26332, 16246.6, 16284.5, 20.9301, 1.68975, 'Warrior Trainer'),
(10, 500032, 16218.9, 16284.5, 13.1761, 6.18533, 'Innkeeper'),
(11, 30605, 16228.0, 16280.5, 13.1761, 2.98877, 'Banker'),
(12, 29195, 16252.3, 16284.9, 20.9324, 1.79537, 'Death Knight Trainer'),
(13, 2836, 16220.5, 16302.3, 13.176, 6.14647, 'Blacksmithing Trainer'),
(14, 8128, 16220.2, 16299.6, 13.178, 6.22894, 'Mining Trainer'),
(15, 8736, 16219.8, 16296.9, 13.1746, 6.24465, 'Engineering Trainer'),
(16, 18774, 16222.4, 16293, 13.1813, 1.51263, 'Jewelcrafting Trainer (Alliance)'),
(17, 18751, 16222.4, 16293, 13.1813, 1.51263, 'Jewelcrafting Trainer (Horde)'),
(18, 18773, 16227.5, 16292.3, 13.1839, 1.49691, 'Enchanting Trainer (Alliance)'),
(19, 18753, 16227.5, 16292.3, 13.1839, 1.49691, 'Enchanting Trainer (Horde)'),
(20, 30721, 16231.6, 16301, 13.1757, 3.07372, 'Inscription Trainer (Alliance)'),
(21, 30722, 16231.6, 16301, 13.1757, 3.07372, 'Inscription Trainer (Horde)'),
(22, 19187, 16231.2, 16295, 13.1761, 3.06574, 'Leatherworking Trainer'),
(23, 19180, 16228.9, 16304.7, 13.1819, 4.64831, 'Skinning Trainer'),
(24, 19052, 16218.1, 16281.8, 13.1756, 6.1975, 'Alchemy Trainer'),
(25, 908, 16218.3, 16284.3, 13.1756, 6.1975, 'Herbalism Trainer'),
(26, 2627, 16220.4, 16278.7, 13.1756, 1.46157, 'Tailoring Trainer'),
(27, 19184, 16225, 16310.9, 29.262, 6.22119, 'First Aid Trainer'),
(28, 2834, 16225.3, 16313.9, 29.262, 6.28231, 'Fishing Trainer'),
(29, 19185, 16227, 16278, 13.1762, 1.4872, 'Cooking Trainer'),
(30, 8719, 16242, 16291.6, 22.9311, 1.52061, 'Alliance Auctioneer'),
(31, 9856, 16242, 16291.6, 22.9311, 1.52061, 'Horde Auctioneer'),
(32, 184137, 16220.3, 16272, 12.9736, 4.45592, 'Mailbox (Object)'),
(33, 1685, 16253.8, 16294.3, 13.1758, 6.11938, 'Forge (Object)'),
(34, 4087, 16254.4, 16298.7, 13.1758, 3.36027, 'Anvil (Object)'),
(35, 500000, 16232.9, 16264.1, 13.55570, 3.028813, 'Portal: Stormwind (Object)'),
(36, 500001, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Darnassus (Object)'),
(37, 500002, 16231.3, 16254.2, 13.65647, 3.028813, 'Portal: Exodar (Object)'),
(38, 500003, 16233.4, 16260.6, 13.84770, 3.028813, 'Portal: Ironforge (Object)'),
(39, 500004, 16232.9, 16264.1, 13.55570, 3.028813, 'Portal: Orgrimmar (Object)'),
(40, 500005, 16231.3, 16254.2, 13.65647, 3.028813, 'Portal: Silvermoon (Object)'),
(41, 500006, 16233.4, 16260.6, 13.84770, 3.028813, 'Portal: Thunder Bluff (Object)'),
(42, 500007, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Undercity (Object)'),
(43, 500008, 16211.1, 16266.9, 13.7458, 5.6724, 'Portal: Shattrath (Object)'),
(44, 500009, 16213.9, 16270.5, 13.1378, 5.4996, 'Portal: Dalaran (Object)'),
(45, 187293, 16230.5, 16283.5, 13.9061, 3, 'Guild Vault (Object)'),
(46, 28692, 16236.2, 16315.7, 20.8454, 4.64365, 'Trade Supplies'),
(47, 28776, 16223.7, 16297.9, 20.8454, 6.17044, 'Tabard Vendor'),
(48, 4255, 16230.2, 16316.1, 20.8455, 4.64365, 'Food & Drink Vendor'),
(49, 6491, 16319.937, 16242.404, 24.4747, 2.206830, 'Spirit Healer'),
(50, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'),
(51, 29636, 16233.2, 16315.9, 20.8454, 4.64365, 'Reagent Vendor'),
(52, 29493, 16229.1, 16286.4, 13.176, 3.03831, 'Ammo & Repair Vendor'),
(53, 28690, 16226.97, 16267.9, 13.15, 4.6533, 'Stable Master'),
(54, 9858, 16238.2, 16291.8, 22.9306, 1.55386, 'Neutral Auctioneer'),
(55, 2622, 16242.8, 16302.1, 13.176, 4.55570, 'Poisons Vendor');
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

INSERT INTO `guild_house_spawns` (`entry`, `posX`, `posY`, `posZ`, `orientation`, `comment`) VALUES
(26327, 16216.5, 16279.4, 20.9306, 0.552869, 'Paladin Trainer'),
(26324, 16221.3, 16275.7, 20.9285, 1.37363, 'Druid Trainer'),
(26325, 16218.6, 16277, 20.9872, 0.967188, 'Hunter Trainer'),
(26326, 16224.9, 16274.9, 20.9319, 1.58765, 'Mage Trainer'),
(26328, 16227.9, 16275.9, 20.9254, 1.9941, 'Priest Trainer'),
(26329, 16231.4, 16278.1, 20.9222, 2.20026, 'Rogue Trainer'),
(26330, 16235.5, 16280.8, 20.9257, 2.18652, 'Shaman Trainer'),
(26331, 16240.8, 16283.3, 20.9299, 1.86843, 'Warlock Trainer'),
(26332, 16246.6, 16284.5, 20.9301, 1.68975, 'Warrior Trainer'),
(29195, 16252.3, 16284.9, 20.9324, 1.79537, 'Death Knight Trainer'),
(28694, 16252.3, 16300.4, 13.175, 4.60370, 'Blacksmithing Trainer (Grand Master)'),
(28698, 16256.8, 16296.5, 13.176, 3.06334, 'Mining Trainer (Grand Master)'),
(28697, 16219.8, 16296.9, 13.1746, 6.24465, 'Engineering Trainer (Grand Master)'),
(28701, 16222.4, 16293, 13.1813, 1.51263, 'Jewelcrafting Trainer (Grand Master)'),
(28693, 16228.5, 16292.3, 13.1780, 1.82008, 'Enchanting Trainer (Grand Master)'),
(19540, 16227.1, 16292.4, 13.1770, 1.45487, 'Enchanting Trainer (Master)'),
(28702, 16231.6, 16301, 13.1757, 3.07372, 'Inscription Trainer (Grand Master)'),
(28700, 16231.0, 16294.3, 13.1759, 3.02255, 'Leatherworking Trainer (Grand Master)'),
(19187, 16231.1, 16295.6, 13.1759, 3.02647, 'Leatherworking Trainer (Master)'),
(28696, 16228.9, 16304.7, 13.1819, 4.64831, 'Skinning Trainer (Grand Master)'),
(28703, 16222.9, 16304.7, 13.1821, 4.56585, 'Alchemy Trainer (Grand Master)'),
(19052, 16220.5, 16302.3, 13.176, 6.14647, 'Alchemy Trainer (Master)'),
(28704, 16218.3, 16284.3, 13.1756, 6.1975, 'Herbalism Trainer (Grand Master)'),
(28699, 16220.2, 16299.6, 13.178, 6.22894, 'Tailoring Trainer (Grand Master)'),
(28706, 16225, 16310.9, 29.262, 6.22119, 'First Aid Trainer (Grand Master)'),
(28742, 16225.3, 16313.9, 29.262, 6.28231, 'Fishing Trainer (Grand Master)'),
(33587, 16256.3, 16291.7, 13.174, 2.22426, 'Cooking Trainer (Grand Master)'),
(6491, 16319.937, 16242.404, 24.4747, 2.206830, 'Spirit Healer'),
Copy link

@dedmen dedmen Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(6491, 16319.937, 16242.404, 24.4747, 2.206830, 'Spirit Healer'),
(6491, 16319.937, 16242.404, 24.4747, 2.206830, 'Spirit Healer'),

(30605, 16228.0, 16280.5, 13.1761, 2.98877, 'Banker'),
(8719, 16238.1, 16291.9, 22.9303, 1.46240, 'Alliance Auctioneer'),
(9856, 16242.7, 16291.3, 22.9318, 1.45454, 'Horde Auctioneer'),
(9858, 16240.5, 16291.5, 22.9318, 1.47417, 'Neutral Auctioneer'),
(184137, 16220.3, 16272, 12.9736, 4.45592, 'Mailbox (Object)'),
(187293, 16230.5, 16283.5, 13.9061, 3, 'Guild Vault (Object)'),
(191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'),
Copy link

@dedmen dedmen Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'),
(191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'),

(1685, 16257.3, 16298.8, 13.1758, 3.14050, 'Forge (Object)'),
(4087, 16254.5, 16299.8, 13.1758, 6.19537, 'Anvil (Object)'),
(59853, 16257.6, 16293.0, 13.17508, 2.989519, 'Stove (Object)'),
(500000, 16232.9, 16264.1, 13.55570, 3.028813, 'Portal: Stormwind (Object)'),
(500001, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Darnassus (Object)'),
(500002, 16231.3, 16254.2, 13.65647, 3.028813, 'Portal: Exodar (Object)'),
(500003, 16233.4, 16260.6, 13.84770, 3.028813, 'Portal: Ironforge (Object)'),
(500004, 16232.9, 16264.1, 13.55570, 3.028813, 'Portal: Orgrimmar (Object)'),
(500005, 16231.3, 16254.2, 13.65647, 3.028813, 'Portal: Silvermoon (Object)'),
(500006, 16233.4, 16260.6, 13.84770, 3.028813, 'Portal: Thunder Bluff (Object)'),
(500007, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Undercity (Object)'),
(500008, 16211.1, 16266.9, 13.7458, 5.6724, 'Portal: Shattrath (Object)'),
Copy link

@dedmen dedmen Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(500008, 16211.1, 16266.9, 13.7458, 5.6724, 'Portal: Shattrath (Object)'),
(500008, 16211.1, 16266.9, 13.7458, 5.6724, 'Portal: Shattrath (Object)'),

(500009, 16213.9, 16270.5, 13.1378, 5.4996, 'Portal: Dalaran (Object)'),
(28690, 16226.8, 16269.4, 13.0858, 3.88255, 'Stable Master'),
Copy link

@dedmen dedmen Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(28690, 16226.8, 16269.4, 13.0858, 3.88255, 'Stable Master'),
(28690, 16226.8, 16269.4, 13.0858, 3.88255, 'Stable Master'),

(28692, 16236.2, 16315.7, 20.8454, 4.64365, 'Trade Supplies'),
(28776, 16223.7, 16297.9, 20.8454, 6.17044, 'Tabard Vendor'),
(4255, 16230.2, 16316.1, 20.8455, 4.64365, 'Food & Drink Vendor'),
(29636, 16233.2, 16315.9, 20.8454, 4.64365, 'Reagent Vendor'),
(29493, 16229.1, 16286.4, 13.176, 3.03831, 'Ammo & Repair Vendor'),
Comment on lines +66 to +67
Copy link

@dedmen dedmen Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(29636, 16233.2, 16315.9, 20.8454, 4.64365, 'Reagent Vendor'),
(29493, 16229.1, 16286.4, 13.176, 3.03831, 'Ammo & Repair Vendor'),
(29636, 16233.2, 16315.9, 20.8454, 4.64365, 'Reagent Vendor'),
(29493, 16229.1, 16286.4, 13.176, 3.03831, 'Ammo & Repair Vendor'),

(2622, 16242.8, 16302.1, 13.176, 4.55570, 'Poisons Vendor');

/*
-- Updates existing creatures to the new creatures.
-- Replace <world> and <characters> with your database names!

-- The following only needs to be ran if you used this module before 5-1-2022.
Copy link

@dedmen dedmen Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why this was added? Seems like we shouldn't refer back to almost two years ago?


-- First Aid trainer
UPDATE <world>.creature SET id1 = 28706 WHERE id1 = 19184 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Fishing trainer
UPDATE <world>.creature SET id1 = 28742 WHERE id1 = 2834 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Enchanting trainers
UPDATE <world>.creature SET id1 = 28693, position_x = 16228.5, position_y = 16292.3, position_z = 13.1780, orientation = 1.82008 WHERE id1 IN (18773,18753,28693) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Jewelcrafting trainers
UPDATE <world>.creature SET id1 = 28701 WHERE id1 IN (18774,18751) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Inscription trainers
UPDATE <world>.creature SET id1 = 28702 WHERE id1 IN (30721,30722) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Herbalism trainer
UPDATE <world>.creature SET id1 = 28704 WHERE id1 = 908 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Blacksmithing trainer
UPDATE <world>.creature SET id1 = 28694, position_x = 16252.3, position_y = 16300.4, position_z = 13.175, orientation = 4.60370 WHERE id1 IN (2836,28694) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Mining trainer
UPDATE <world>.creature SET id1 = 28698, position_x = 16256.8, position_y = 16296.5, position_z = 13.176, orientation = 3.06334 WHERE id1 IN (8128,28698) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Alchemy trainer
UPDATE <world>.creature SET id1 = 28703, position_x = 16222.9, position_y = 16304.7, position_z = 13.1821, orientation = 4.56585 WHERE id1 IN (19052,28703) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Skinning trainer
UPDATE <world>.creature SET id1 = 28696 WHERE id1 = 19180 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Leatherworking trainer
UPDATE <world>.creature SET id1 = 28700, position_x = 16231.0, position_y = 16294.3, position_z = 13.1759, orientation = 3.02255 WHERE id1 IN (19187,28700) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Tailoring trainer
UPDATE <world>.creature SET id1 = 28699, position_x = 16220.2, position_y = 16299.6, position_z = 13.178, orientation = 6.22894 WHERE id1 IN (2627,28699) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Engineering trainer
UPDATE <world>.creature SET id1 = 28697 WHERE id1 = 8736 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Cooking trainer
UPDATE <world>.creature SET id1 = 33587, position_x = 16256.3, position_y = 16291.7, position_z = 13.174, orientation = 2.22426 WHERE id1 IN (19185,33587) AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Forge object
UPDATE <world>.gameobject SET position_x = 16257.3, position_y = 16298.8, position_z = 13.1758, orientation = 3.14050 WHERE id = 1685 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.gameobject.phaseMask);

-- Anvil object
UPDATE <world>.gameobject SET position_x = 16254.5, position_y = 16299.8, position_z = 13.1758, orientation = 6.19537 WHERE id = 4087 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.gameobject.phaseMask);

-- Neutral auctioneer
UPDATE <world>.creature SET position_x = 16240.5, position_y = 16291.5, position_z = 22.9318, orientation = 1.47417 WHERE id1 = 9858 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Horde auctioneer
UPDATE <world>.creature SET position_x = 16242.7, position_y = 16291.3, position_z = 22.9318, orientation = 1.45454 WHERE id1 = 9856 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Alliance auctioneer
UPDATE <world>.creature SET position_x = 16238.1, position_y = 16291.9, position_z = 22.9303, orientation = 1.46240 WHERE id1 = 8719 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Stable master
UPDATE <world>.creature SET position_x = 16226.8, position_y = 16269.4, position_z = 13.0858, orientation = 3.88255 WHERE id1 = 28690 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);

-- Remove innkeeper
DELETE FROM <world>.creature WHERE id1 = 500032 AND EXISTS (SELECT * FROM <characters>.guild_house where <characters>.guild_house.phase = <world>.creature.phaseMask);
DELETE FROM <world>.creature_template WHERE entry = 500032

*/
Loading