Fix Compile Issue and Update Trainers/SQL#39

Open

SoulSeekkor wants to merge 58 commits intoazerothcore:masterfrom

SoulSeekkor:master

SoulSeekkor commented Feb 7, 2023

This removes the useless innkeeper and includes various other tweaks to the trainers. See commits for full details. This fixes #38.

SoulSeekkor added 30 commits

April 21, 2022 12:28


          Updated First Aid trainer to the Dalaran version.

01b12a6


          Added SQL for updating existing instances of the First Aid trainer.

27114ab


          Updated Enchanting trainer to the Dalaran version.

193b111


          Updated Inscription trainer to the Dalaran version.

1a81dec


          Updated Jewelcrafting trainer to the Dalaran version.

524f462


          Updated Herbalism trainer to the Dalaran version.

6d7abaa


          Updated Blacksmithing trainer to the Dalaran version.

ac7a886


          Updated Mining trainer to the Dalaran version.

2083f38


          Updated Alchemy trainer to the Dalaran version.

59f193f


          Updated Skinning trainer to the Dalaran version.

ba810b3


          Updated Leatherworking trainer to the Dalaran version.

c3b6087


          Updated Tailoring trainer to the Dalaran version.

deb3ddc


          Updated Engineering trainer to the Dalaran version.

a575ae4


          Updated Fishing trainer to the Dalaran version.

bd47a3e


          Added necessary semicolons for multiple updates.

cad0cdb


          Added note about update statements usage.

de80df8


          Updated Cooking trainer to the Argent Crusade version.

ca93bca


          Added Stove object for purchase.

2d0ac98


          Fixed formatting.

cf5c3b5


          Updated Stove entry.

026bd59


          Updated Cooking trainer position.


          Revamped guild house spawns table query to remove unneeded id column.

9a65350


          Updated Forge and Anvil locations.

51bd77f


          Updated Blacksmithing trainer position.

465507a


          Updated Mining trainer position.

941e6f2


          Moved the Tailoring trainer to where the Mining trainer used to be.


          Updated auctioneer positioning and changed it so that both faction au…

ce8df14

…ctioneers may be purchased.


          Fixed to update both old and current Cooking trainers' position.

d1c565d


          Fixed update SQL for Forge/Anvil positioning.

e1681bd


          Moved the Alchemy trainer to where the Blacksmithing trainer used to be.

4f43e08

SoulSeekkor added 14 commits

May 1, 2022 14:48


          Updated existing Enchanting trainer position.

91ceb37


          Added Master level Enchanting trainer.

586d7bd


          Updated existing Leatherworking trainer position.

b2f755d


          Added Master level Leatherworking trainer.

7df04c2


          Updated existing Alchemy trainer position and added new Master level …

07d3881

…Alchemy trainer.


          Fixed typo.

3492ceb


          Updated SQL query to include newly updated trainer positions.

06ccb9a


          Added player parameter back to SpawnStarterPortal().

5d4233b


          Updated to cut the cost in half when spawning 2 NPC trainers.

815d565


          Removed the innkeeper as the NPC served no purpose.

c0c73ed


          Updated to make the cost for profession trainers free initially, this…

5cb022d

… allows the extra trainers to be added for free if they are missing.


          Added the ability to add the starter portal for their faction for fre…

71ba676

…e in case it does not exist yet.


          Updated SQL to remove innkeeper from the creature template table.

485fc49


          Updated to fix compile error due to GetGOData being renamed to GetGam…

91bfbde

…eObjectData.

dedmen suggested changes

View reviewed changes

dedmen left a comment

Indentation issues

src/mod_guildhouse.cpp Outdated Show resolved Hide resolved

src/mod_guildhouse_butler.cpp Outdated Show resolved Hide resolved

src/mod_guildhouse_butler.cpp Show resolved Hide resolved

src/mod_guildhouse_butler.cpp Show resolved Hide resolved

src/mod_guildhouse_butler.cpp Outdated Show resolved Hide resolved

src/mod_guildhouse.cpp Outdated Show resolved Hide resolved

src/mod_guildhouse.cpp Outdated Show resolved Hide resolved

src/mod_guildhouse.cpp Outdated Show resolved Hide resolved

src/mod_guildhouse.cpp Outdated Show resolved Hide resolved

src/mod_guildhouse.cpp Outdated Show resolved Hide resolved

dedmen commented Oct 31, 2023 •

edited

Loading

Can you explain why the Innkeeper is useless? It will be used to set Hearthstone location right? that seems useful

Edit: Well okey you can teleport there with chat command anyway, so indeed useless.

SoulSeekkor and others added 10 commits

November 20, 2023 10:04


          Update src/mod_guildhouse.cpp

775bae1

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse_butler.cpp

bcbfd96

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse_butler.cpp

16e7e33

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse_butler.cpp

eb3ed81

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse.cpp

a496563

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse_butler.cpp

a18fe12

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse.cpp

59e1713

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse.cpp

783baae

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse.cpp

967607b

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>


          Update src/mod_guildhouse.cpp

b7ddf03

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>

Author

SoulSeekkor commented Nov 20, 2023

Seems Notepad++ must have done me dirty with the indentation... I've committed the suggestions (let me know if I didn't do it properly, I'm not well-versed with GitHub flows). Please review and merge if possible, once this module is up to date with my own version again I can maybe look at some of the other requests such as custom IDs, especially since I'll have some free time this week. Thanks!

dedmen commented Nov 27, 2023 •

edited

Loading

You could've merged them in one batch instead of several.

You only merged half of my suggestions. If you click "Expand" above between my outdated ones, there are more

CI errors

Script named 'GuildHouseSeller' is not assigned in the database.
Script named 'GuildHouseSpawner' is not assigned in the database.

I don't know what that means

Also

This fixes #38.

But, 38 has already been fixed by #40.
Actually I'm not sure how this PR can exists without merge conflict, when its changing GetGOData to GetGameObjectData, even though GetGameObjectData isn't even in the code anymore.

dedmen reviewed

View reviewed changes

sql/world/guildhouse_spawns.sql

+              	(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'),

dedmen Nov 27, 2023

Suggested change

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

sql/world/guildhouse_spawns.sql

+              	(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)'),

dedmen Nov 27, 2023

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)'),

sql/world/guildhouse_spawns.sql

+              	(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)'),

dedmen Nov 27, 2023

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)'),

sql/world/guildhouse_spawns.sql

+              	(500007, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Undercity (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'),

dedmen Nov 27, 2023

Suggested change

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

sql/world/guildhouse_spawns.sql

Comment on lines +66 to +67

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

dedmen Nov 27, 2023

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'),

sql/world/guildhouse_spawns.sql

+              -- 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.

dedmen Nov 27, 2023

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

src/mod_guildhouse_butler.cpp

+                          cost = 0;
+                          // Check if we need multiple trainers, a few require this otherwise
+                          // you can't learn it soley in the guild house (Master is needed)

dedmen Nov 27, 2023

Can we really not just spawn the Master one and be done with it? Instead of spawning non-master AND master?
Have never tried that in game, don't know if possible

pangolp mentioned this pull request

Make IDs easier to edit #45

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet