Skip to content

Commit 291015f

Browse files
rsarsa
committed
[mr1549] implement static GUID's usage policy. close mangosR2#664 
1 parent 87ee489 commit 291015f

6 files changed

+61
-11
lines changed

‎sql_mr/mr01515_mangos_Isle_of_Conquest.sql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
-- Isle of Conquest
22

33
-- creature and gameobject initial guid
4-
SET @CREATURE := 300000;
5-
SET @GAMEOBJECT := 300000;
4+
SET @CREATURE := 520000;
5+
SET @GAMEOBJECT := 520000;
6+
DELETE FROM `creature` WHERE `guid` BETWEEN @CREATURE AND @CREATURE+9999;
7+
DELETE FROM `gameobject` WHERE `guid` BETWEEN @GAMEOBJECT AND @GAMEOBJECT+9999;
68

79
-- use these 2 queries only if you want to enable IoC by direct queueing it
810
-- DELETE FROM battleground_template WHERE id = 30;

‎sql_mr/mr01515_mangos_dalaran_arena.sql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
-- Dalaran Arena
22

33
-- gameobject initial guid
4-
SET @GAMEOBJECT := 222020;
4+
SET @GAMEOBJECT := 540000;
55

66
UPDATE gameobject_template SET faction=114, flags=32, size=1.5 WHERE entry IN (192642, 192643);
77

8-
DELETE FROM gameobject WHERE map=617;
8+
DELETE FROM `gameobject` WHERE map=617;
9+
DELETE FROM `gameobject` WHERE `guid` BETWEEN @GAMEOBJECT AND @GAMEOBJECT+999;
10+
911
INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES
1012
-- buffs
1113
(@GAMEOBJECT,184663,617,1,1,1291.7,813.424,7.11472,4.64562,0,0,0.730314,-0.683111,-120,100,1),

‎sql_mr/mr01515_mangos_the_ring_of_valor.sql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
-- The Ring of Valor
22

33
-- gameobject initial guid
4-
SET @GAMEOBJECT := 222001;
4+
SET @GAMEOBJECT := 541000;
55

66
UPDATE gameobject_template SET faction='114', flags='32' WHERE entry IN (192704, 192705, 192388, 192387, 192393, 192394, 192389, 192390);
77

8-
DELETE FROM gameobject WHERE map='618';
8+
DELETE FROM `gameobject` WHERE map='618';
9+
DELETE FROM `gameobject` WHERE `guid` BETWEEN @GAMEOBJECT AND @GAMEOBJECT+999;
910
INSERT INTO gameobject
1011
(guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state)
1112
VALUES

‎sql_mr/mr01516_mangos_Strand_of_the_Ancients.sql

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
-- Strand of the Ancients
22

33
-- creature and gameobject initial guid
4-
SET @CREATURE := 0;
5-
SET @GAMEOBJECT := 0;
6-
SELECT MAX(`guid`)+1 FROM `creature` INTO @CREATURE;
7-
SELECT MAX(`guid`)+1 FROM `gameobject` INTO @GAMEOBJECT;
4+
SET @CREATURE := 510000;
5+
SET @GAMEOBJECT := 510000;
6+
7+
DELETE FROM `creature` WHERE `guid` BETWEEN @CREATURE AND @CREATURE+9999;
8+
DELETE FROM `gameobject` WHERE `guid` BETWEEN @GAMEOBJECT AND @GAMEOBJECT+9999;
89

910
DELETE FROM battleground_template WHERE id = 9;
1011
INSERT INTO battleground_template (id, MinPlayersPerTeam, MaxPlayersPerTeam, AllianceStartLoc, AllianceStartO, HordeStartLoc, HordeStartO) VALUES (9, 5, 15, 1367, 0, 1368, 0);

‎sql_mr/static_guids_policy.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Static GUID distribution policy for mangosR2 branch
2+
Attention! If your use new GUID's scope for some creatures/objects - first define his in this table.
3+
------------------------------------------------------------------------------------------------------------
4+
Area | map num | | Creature start | Creature end | Object start | Object end | Comment |
5+
------------------------------------------------------------------------------------------------------------
6+
World oPvP | -all- | | 500000 | 509999 | 500000 | 509999 | |
7+
------------------------------------------------------------------------------------------------------------
8+
Strand of the | 607 | | 510000 | 519999 | 510000 | 519999 | |
9+
Ancients (SOTA)| | | | | | | |
10+
------------------------------------------------------------------------------------------------------------
11+
Isle of | 628 | | 520000 | 529999 | 520000 | 529999 | |
12+
Conquest (IOC)| | | | | | | |
13+
------------------------------------------------------------------------------------------------------------
14+
Wintergrasp | 571 | | 530000 | 539999 | 530000 | 539999 | |
15+
| | | | | | | |
16+
------------------------------------------------------------------------------------------------------------
17+
Arenas: | | | 540000 | 549999 | 540000 | 549999 | |
18+
Dalaran arena | | 617 | 540000 | 540999 | 540000 | 540999 | |
19+
Ring of Valor | | 618 | 541000 | 541999 | 541000 | 541999 | |
20+
| | | 542000 | 542999 | 542000 | 542999 | |
21+
| | | 543000 | 543999 | 543000 | 543999 | |
22+
| | | 544000 | 544999 | 544000 | 544999 | |
23+
| | | 545000 | 545999 | 545000 | 545999 | |
24+
| | | 546000 | 546999 | 546000 | 546999 | |
25+
| | | 547000 | 547999 | 547000 | 547999 | |
26+
| | | 548000 | 548999 | 548000 | 548999 | |
27+
| | | 549000 | 549999 | 549000 | 549999 | |
28+
| | | | | | | |
29+
------------------------------------------------------------------------------------------------------------
30+
| | | 550000 | 559999 | 550000 | 559999 | |
31+
| | | | | | | |
32+
------------------------------------------------------------------------------------------------------------
33+
| | | 560000 | 569999 | 560000 | 569999 | |
34+
| | | | | | | |
35+
------------------------------------------------------------------------------------------------------------
36+
| | | 570000 | 579999 | 570000 | 579999 | |
37+
| | | | | | | |
38+
------------------------------------------------------------------------------------------------------------
39+
| | | 580000 | 589999 | 580000 | 589999 | |
40+
| | | | | | | |
41+
------------------------------------------------------------------------------------------------------------
42+
| | | 590000 | 599999 | 590000 | 599999 | |
43+
| | | | | | | |
44+
------------------------------------------------------------------------------------------------------------

‎src/shared/revision_R2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef __REVISION_R2_H__
22
#define __REVISION_R2_H__
3-
#define REVISION_R2 "1548"
3+
#define REVISION_R2 "1549"
44
#endif // __REVISION_R2_H__

0 commit comments

Comments
 (0)