Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 13:22:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/TicketHandler.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
This commit is contained in:
Subv
2012-10-16 21:55:01 -05:00
parent b49891e348 27f091806a
commit 705873091b
12 changed files with 142 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/base/characters_database.sql
View File

@@ -1514,9 +1514,11 @@ CREATE TABLE `gm_tickets` (
`closedBy` int(10) NOT NULL DEFAULT '0',
`assignedTo` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
`comment` text NOT NULL,
`response` text NOT NULL,
`completed` tinyint(3) unsigned NOT NULL DEFAULT '0',
`escalated` tinyint(3) unsigned NOT NULL DEFAULT '0',
`viewed` tinyint(3) unsigned NOT NULL DEFAULT '0',
`haveTicket` tinyint(3) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ticketId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
/*!40101 SET character_set_client = @saved_cs_client */;

3
sql/updates/characters/2012_10_17_00_character_gm_tickets.sql Normal file
View File

@@ -0,0 +1,3 @@
ALTER TABLE `gm_tickets`
ADD COLUMN `response` text NOT NULL AFTER `comment`,
ADD COLUMN `haveTicket` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `viewed`;

4
sql/updates/world/2012_10_16_00_world_spell_area.sql Normal file
View File

@@ -0,0 +1,4 @@
ALTER TABLE `spell_area` ADD COLUMN `quest_start_status` INT(11) NOT NULL DEFAULT 64; -- default is QUEST_STATUS_REWARDED
ALTER TABLE `spell_area` ADD COLUMN `quest_end_status` INT(11) NOT NULL DEFAULT 11; -- default is QUEST_STATUS_COMPLETE | QUEST_STATUS_NONE | QUEST_STATUS_INCOMPLETE
UPDATE spell_area SET `quest_start_status` = (1 << 6) | (1 << 3) | (1 << 1) WHERE `quest_start_active` = 1;
ALTER TABLE spell_area DROP COLUMN `quest_start_active`;