Skip to content

Commit

Permalink
Merge 3.3.5 to npcbots_3.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Github Actions committed Apr 5, 2024
2 parents fc16894 + 2bf896b commit d99a35f
Show file tree
Hide file tree
Showing 38 changed files with 1,443 additions and 21 deletions.
20 changes: 2 additions & 18 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,8 @@ init:
- ps: ''
environment:
BOOST_ROOT: C:\Libraries\boost_1_83_0
MYSQL_ROOT_DIR: C:\mysql-8.1.0-winx64
OPENSSL_ROOT_DIR: C:\OpenSSL-v30-Win64
install:
- ps: >-
Write-Host "Installing MySQL Server 8.1" -ForegroundColor Cyan
Write-Host "Downloading MySQL..."
$zipPath = "$($env:temp)\mysql-8.1.0-winx64.zip"
(New-Object Net.WebClient).DownloadFile('https://cdn.mysql.com//Downloads/MySQL-8.1/mysql-8.1.0-winx64.zip', $zipPath)
Write-Host "Unpacking..."
7z x $zipPath -o"C:\" | Out-Null
Write-Host "MySQL Server 8.1 installed" -ForegroundColor Cyan
MYSQL_ROOT_DIR: C:\Program Files\MySQL\MySQL Server 8.0
OPENSSL_ROOT_DIR: C:\OpenSSL-v32-Win64
build_script:
- cmd: >-
git config user.email "[email protected]" && git config user.name "AppVeyor"
Expand Down
197 changes: 197 additions & 0 deletions sql/updates/world/3.3.5/2024_03_30_00_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
-- Cleansing the Scar (9489)
DELETE FROM `quest_details` WHERE `ID`=9489;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(9489,1,1,0,0,0,0,0,0,0);
UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=9489;

-- Rogues of the Shattered Hand (10794)
DELETE FROM `quest_details` WHERE `ID`=10794;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(10794,1,1,1,0,0,0,0,0,0);

-- A Discreet Inquiry (10372)
DELETE FROM `quest_details` WHERE `ID`=10372;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(10372,1,1,1,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=10372;

-- Find Keltus Darkleaf (9532)
DELETE FROM `quest_details` WHERE `ID`=9532;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(9532,1,1,0,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=9532;

-- Powering our Defenses (8490)
UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8490;

-- Old Whitebark's Pendant (8474)
UPDATE `quest_offer_reward` SET `Emote1`=18 WHERE `ID`=8474;

-- Abandoned Investigations (8891)
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1,`Emote3`=1 WHERE `ID`=8891;

-- Word from the Spire (8890)
DELETE FROM `quest_details` WHERE `ID`=8890;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8890,1,1,0,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=5,`Emote2`=18 WHERE `ID`=8890;

-- Cleaning up the Grounds (8894)
DELETE FROM `quest_details` WHERE `ID`=8894;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8894,5,1,0,0,0,0,0,0,0);
UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=8894;
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=8894;

-- Where's Wyllithen? (9394)
DELETE FROM `quest_details` WHERE `ID`=9394;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(9394,1,6,0,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=6,`Emote2`=5 WHERE `ID`=9394;

-- Deactivating the Spire (8889)
DELETE FROM `quest_details` WHERE `ID`=8889;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8889,1,1,6,0,0,0,0,0,0);
UPDATE `quest_request_items` SET `EmoteOnComplete`=6,`EmoteOnIncomplete`=6 WHERE `ID`=8889;
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=8889;

-- The Magister's Apprentice (8888)
DELETE FROM `quest_details` WHERE `ID`=8888;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8888,1,1,1,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=6,`Emote2`=1 WHERE `ID`=8888;

-- The Spearcrafter's Hammer (8477)
DELETE FROM `quest_details` WHERE `ID`=8477;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8477,1,0,0,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8477;

-- The Party Never Ends (9067)
DELETE FROM `quest_details` WHERE `ID`=9067;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(9067,1,0,0,0,0,0,0,0,0);
UPDATE `quest_request_items` SET `EmoteOnComplete`=6,`EmoteOnIncomplete`=6 WHERE `ID`=9067;
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=9067;

-- Saltheril's Haven (9395)
DELETE FROM `quest_details` WHERE `ID`=9395;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(9395,5,1,1,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1,`Emote3`=6 WHERE `ID`=9395;

-- Unexpected Results (8488)
UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8488;

-- Corrupted Soil (8487)
DELETE FROM `quest_details` WHERE `ID`=8487;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8487,1,5,0,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8487;

-- Captain Kelisendra's Lost Rutters (8887)
UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=8887;
UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8887;

-- Lost Armaments (8480)
UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=8480;

-- Grimscale Pirates! (8886)
DELETE FROM `quest_details` WHERE `ID`=8886;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8886,5,1,6,0,0,0,0,0,0);
UPDATE `quest_request_items` SET `EmoteOnComplete`=6,`EmoteOnIncomplete`=6 WHERE `ID`=8886;
UPDATE `quest_offer_reward` SET `Emote1`=4,`Emote2`=1,`Emote3`=1 WHERE `ID`=8886;

-- The Dwarven Spy (8483)
UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=8483;

-- Incriminating Documents (8482)
UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=8482;

-- The Ring of Mmmrrrggglll (8885)
DELETE FROM `quest_details` WHERE `ID`=8885;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8885,1,1,1,0,0,0,0,0,0);
UPDATE `quest_request_items` SET `EmoteOnComplete`=6,`EmoteOnIncomplete`=6 WHERE `ID`=8885;

-- Fish Heads, Fish Heads... (8884)
DELETE FROM `quest_details` WHERE `ID`=8884;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8884,1,1,5,0,0,0,0,0,0);
UPDATE `quest_request_items` SET `EmoteOnComplete`=6,`EmoteOnIncomplete`=6 WHERE `ID`=8884;
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=8884;

-- Arcane Instability (8486)
UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8486;

-- Completing the Delivery (8350)
DELETE FROM `quest_details` WHERE `ID`=8350;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8350,1,1,0,0,0,0,0,0,0);

-- Aiding the Outrunners (8347)
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=8347;

-- Tainted Arcane Sliver (8338)
UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=8338;
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=8338;

-- Aiding the Outrunners (8347)
DELETE FROM `quest_details` WHERE `ID`=8347;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8347,2,1,0,0,0,0,0,0,0);

-- Felendren the Banished (8335)
DELETE FROM `quest_details` WHERE `ID`=8335;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8335,1,5,0,0,0,0,0,0,0);

-- Aggression (8334)
UPDATE `quest_details` SET `Emote3`=1 WHERE `ID`=8334;
UPDATE `quest_offer_reward` SET `Emote2`=1 WHERE `ID`=8334;

-- Report to Lanthan Perilon (8327)
DELETE FROM `quest_details` WHERE `ID`=8327;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8327,1,2,0,0,0,0,0,0,0);

-- A Fistful of Slivers (8336)
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=8336;

-- Solanian's Belongings (8330)
UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=8330;
UPDATE `quest_offer_reward` SET `Emote2`=1,`Emote2`=1 WHERE `ID`=8330;

-- Thirst Unending (8346)
DELETE FROM `quest_details` WHERE `ID`=8346;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8346,1,1,1,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=8346;

-- The Shrine of Dath'Remar (8345)
UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=8345;
UPDATE `quest_offer_reward` SET `Emote3`=1 WHERE `ID`=8345;

-- Solanian's Belongings (8330)
DELETE FROM `quest_details` WHERE `ID`=8330;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8330,1,1,1,0,0,0,0,0,0);

-- Well Watcher Solanian (10071)
DELETE FROM `quest_details` WHERE `ID`=10071;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(10071,1,1,0,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=10071;

-- Unfortunate Measures (8326)
DELETE FROM `quest_details` WHERE `ID`=8326;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(8326,1,1,0,0,0,0,0,0,0);

-- Rogue Training (9392)
DELETE FROM `quest_details` WHERE `ID`=9392;
INSERT INTO `quest_details` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`VerifiedBuild`) VALUES
(9392,1,1,0,0,0,0,0,0,0);
UPDATE `quest_offer_reward` SET `Emote1`=1,`Emote2`=1 WHERE `ID`=9392;
4 changes: 4 additions & 0 deletions sql/updates/world/3.3.5/2024_03_30_01_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- Breadcrumb quest Fix
DELETE FROM `quest_template_addon` WHERE `ID`=9035;
INSERT INTO `quest_template_addon` (`ID`, `BreadcrumbForQuestId`) VALUES
(9035,9062);
9 changes: 9 additions & 0 deletions sql/updates/world/3.3.5/2024_03_30_02_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
-- Cleaning up the Grounds (8894)
UPDATE `quest_offer_reward` SET `RewardText`="Well, I suppose that will have to do, now won't it? Thanks for the help, $c. I can only hope to get this mess completely cleaned up before the Magister returns to Duskwither Spire.$B$BTake this pocket change; it's not much but it's all that I have at the moment. Feel free to dispatch a few more of the beasties on your way out, if you'd be so kind." WHERE `ID`=8894;

-- Wretched Ringleader (9076)
UPDATE `quest_offer_reward` SET `RewardText`="You defeated him after all! Undoubtedly my men softened him up for you.$B$BI jest, $c. You've done well. You'll make a name for yourself if you keep your nose clean." WHERE `ID`=9076;

-- Captain Kelisendra's Lost Rutters (8887)
UPDATE `quest_request_items` SET `CompletionText`="Hello, $c, you're a sight for sore eyes. I know, it's crazy for me to be here, what with the anchorage overrun by the Wretched. Velendris and his rangers have sworn to protect me on the condition that I get out of here as soon as I've recovered my cargo.$B$BWhat's that you have there... it looks vaguely familiar?" WHERE `ID`=8887;
UPDATE `quest_offer_reward` SET `RewardText`="Oh you sweet, sweet $c! I had no idea that those disgusting Grimscale murlocs had also pirated away with my navigation rudders! Without them, I would have no chance of navigating the seas again once we retake the anchorage and repair the ship.$B$BThank you very much! Here, take this coin as a sign of my appreciation." WHERE `ID`=8887;
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2024_03_30_03_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Quest "Runewarden Deryan" should not be available until "Defending Fairbreeze Village" is rewarded
UPDATE `quest_template_addon` SET `PrevQuestID`=9252 WHERE `ID`=9253;
10 changes: 10 additions & 0 deletions sql/updates/world/3.3.5/2024_03_30_04_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-- Magister Duskwither gossip menu text changes after turning in quest "The Magister's Apprentice"
-- Gossip menu
DELETE FROM `gossip_menu` WHERE `MenuID`=6942 AND `TextID`=8233;
INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
(6942,8233,0);

-- Condition
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=6942;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(14,6942,8233,0,0,8,0,8888,0,0,0,0,0,"","Gossip text 8233 requires quest The Magister's Apprentice rewarded");
Loading

0 comments on commit d99a35f

Please sign in to comment.