- Add new commands .group set assistant, .group set maintank and .group set mainassist to toggle raid member flags.

- Fix 2017_05_29_00_auth.sql to be reapply safe.

3 files changed, 32 insertions, 1 deletions

diff --git a/sql/updates/auth/3.3.5/2017_05_29_00_auth.sql b/sql/updates/auth/3.3.5/2017_05_29_00_auth.sql
index 7ddeabe630c..557c7c52470 100644
--- a/sql/updates/auth/3.3.5/2017_05_29_00_auth.sql
+++ b/sql/updates/auth/3.3.5/2017_05_29_00_auth.sql
@@ -2,6 +2,6 @@ DELETE FROM `rbac_permissions` WHERE `id` = 855;
 INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
 (855, 'Command: debug play music');
 
-DELETE FROM `rbac_linked_permissions` WHERE `id` = 855;
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 855;
 INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
 (198, 855);
diff --git a/sql/updates/auth/3.3.5/2017_06_12_00_auth.sql b/sql/updates/auth/3.3.5/2017_06_12_00_auth.sql
new file mode 100644
index 00000000000..a843472e3ff
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2017_06_12_00_auth.sql
@@ -0,0 +1,10 @@
+DELETE FROM `rbac_permissions` WHERE `id` IN (861,862,863,864);
+INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
+(861, 'Command: group set'),
+(862, 'Command: group set assistant'),
+(863, 'Command: group set maintank'),
+(864, 'Command: group set mainassist');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` IN (473,861,862,863,864);
+INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
+(197,473),(197,861),(197,862),(197,863),(197,864);
diff --git a/sql/updates/world/3.3.5/2017_06_12_01_world.sql b/sql/updates/world/3.3.5/2017_06_12_01_world.sql
new file mode 100644
index 00000000000..9f585fb4dd5
--- /dev/null
+++ b/sql/updates/world/3.3.5/2017_06_12_01_world.sql
@@ -0,0 +1,21 @@
+--
+DELETE FROM `trinity_string` WHERE `entry` IN (1185,1186);
+INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
+  (1185, '%s is not in a raid group!'),
+  (1186, '%s %s has raid role \'%s\'.'),
+  (1187, 'The raid leader cannot be set as an assistant!');
+  
+DELETE FROM `command` WHERE `name` LIKE 'group set%';
+INSERT INTO `command` (`name`,`permission`,`help`) VALUES
+('group set leader', 473, "Syntax: .group set leader [$characterName]
+
+Sets the given character (or selected) as his group's leader. Alias for '.group leader'."),
+('group set assistant', 862, "Syntax: .group set assistant [$characterName]
+
+Toggles the given character's assistant state in his raid group."),
+('group set maintank', 863, "Syntax: .group set maintank [$characterName]
+
+Toggles the given character's main tank flag in his raid group."),
+('group set mainassist', 864, "Syntax: .group set mainassist [$characterName]
+
+Toggles the given character's main assist flag in his raid group.");
\ No newline at end of file