Skip to content

[6.x] Core/Battlefield: Tol Barad#17124

Merged
Aokromes merged 1 commit into
TrinityCore:6.xfrom
Mihc3:6.x-TolBarad
Jul 15, 2016
Merged

[6.x] Core/Battlefield: Tol Barad#17124
Aokromes merged 1 commit into
TrinityCore:6.xfrom
Mihc3:6.x-TolBarad

Conversation

@Mihc3

@Mihc3 Mihc3 commented May 13, 2016

Copy link
Copy Markdown
Contributor

This is it. 🏁

Towers/spires cannot be destroyed because vehicle spells aren't supported yet.
Complete to-do list can be found in BattlefieldTB.cpp, line no. 18.

@@ -0,0 +1,151 @@
-- Tol Barad misc

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

we only use one file per database/commit

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah I know, I will join them. Left it this way for others to make it more clear to see.

UPDATE `creature_template` SET `gossip_menu_id` = 45069, `ScriptName` = 'npc_tb_spirit_guide' WHERE `entry` = 45075;
UPDATE `creature_template` SET `gossip_menu_id` = 45073, `ScriptName` = 'npc_tb_spirit_guide' WHERE `entry` = 45076;
UPDATE `creature_template` SET `gossip_menu_id` = 45072, `ScriptName` = 'npc_tb_spirit_guide' WHERE `entry` = 45077;
UPDATE `creature_template` SET `gossip_menu_id` = 45070, `ScriptName` = 'npc_tb_spirit_guide' WHERE `entry` = 45078;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This list of updates can be made 50% shorter in terms of line numbers, like this:

-- GRAVEYARDS -- 
-- Spirit Guides (45066 - 45079)
UPDATE `creature_template` SET `gossip_menu_id`= 45068, `ScriptName`= 'npc_tb_spirit_guide' WHERE `entry` IN (45068,45074);
UPDATE `creature_template` SET `gossip_menu_id`= 45069, `ScriptName`= 'npc_tb_spirit_guide' WHERE `entry` IN (45069,45075);
UPDATE `creature_template` SET `gossip_menu_id`= 45070, `ScriptName`= 'npc_tb_spirit_guide' WHERE `entry` IN (45070,45078);
UPDATE `creature_template` SET `gossip_menu_id`= 45071, `ScriptName`= 'npc_tb_spirit_guide' WHERE `entry` IN (45071,45079);
UPDATE `creature_template` SET `gossip_menu_id`= 45072, `ScriptName`= 'npc_tb_spirit_guide' WHERE `entry` IN (45072,45077);
UPDATE `creature_template` SET `gossip_menu_id`= 45073, `ScriptName`= 'npc_tb_spirit_guide' WHERE `entry` IN (45073,45076);

(I haven't had time to check the rest of your SQL for redundancy yet)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'll shorten it 👍

@Aokromes

Copy link
Copy Markdown
Member

This is complete?

@Mihc3

Mihc3 commented Jun 13, 2016

Copy link
Copy Markdown
Contributor Author

It's playable, but guide spirits aren't ressurecting... Probably has to be fixed separately in battlefield.cpp?

@Aokromes

Copy link
Copy Markdown
Member

Well, try wintergrasp, if spirit guides don't resurrect there, then it's a different bug of a different PR :P


-- Spawns are located half way down
SET @CGUID := 376000; -- 214 creature entries (380000->)
SET @OGUID := 68000; -- 111 gameobject entries

@Aokromes Aokromes Jun 19, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Note to merger, remember to check for unused guids over 250000 for creatures and 200000 for gameobjects.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Based on TrinityCore rev. f663743 2016-06-18 16:23:55 +0200 (6.x branch), in TDB 6.04 plus updates up to and including 2016_06_17_01_world.sql, these values are available:

  • 214 consecutive free GUIDs above 250000 in the creature table: 250970 - 251183
  • 111 consecutive free GUIDs above 200000 in the gameobject table: 234355 - 234465

@Mihc3

Mihc3 commented Jun 19, 2016

Copy link
Copy Markdown
Contributor Author

Not working in WG either. Spirit guides should probably ressurect just like in battlegrounds (automatically every 30 sec), right?

@robens

robens commented Jun 20, 2016

Copy link
Copy Markdown

Seems like

AreaSpiritHealerTime() : ServerPacket(SMSG_AREA_SPIRIT_HEALER_TIME, 14 + 4) { }
has to be 16 (guid size) instead of 14 ?
Not sure if this is the source of your issue.

Commit 0fc728e

@DDuarte

DDuarte commented Jun 20, 2016

Copy link
Copy Markdown
Contributor

@GitVerge: That size is only a hint, actual size can be different (it works like std::vector's reserve()).

@robens

robens commented Jun 20, 2016

Copy link
Copy Markdown

@DDuarte k, got it. Thanks


-- Spawns are located half way down
SET @CGUID := 250970; -- 214 creature entries
SET @OGUID := 234355; -- 111 gameobject entries

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

new range is need again :P compared with 4.3.4 db and found one commit missing on 6.x

@ghost ghost Jun 20, 2016

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

TrinityCore rev. 5f2c623 2016-06-20 21:53:53 +0200 (6.x branch) (Win64, Release, Static), TDB 6.04 plus updates up to and including 2016_06_20_02_world.sql. These values are available:

  • 214 consecutive free GUIDs above 250000 in the creature table: 250970 - 251183
  • 111 consecutive free GUIDs above 200000 in the gameobject table: 233475 - 233585

No new creatures added since previous check, 880 gameobject GUIDs removed or relocated.

@Aokromes

Copy link
Copy Markdown
Member

@Shauren Since the remaining bug is part of a different commit this can be merged?

@Aokromes Aokromes merged commit b7c2d30 into TrinityCore:6.x Jul 15, 2016
@Mihc3 Mihc3 deleted the 6.x-TolBarad branch July 15, 2016 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants