From 5d7892e46e5a18e8702da861ab726129d9fb4d13 Mon Sep 17 00:00:00 2001 From: Flavien Normand Date: Wed, 19 Oct 2022 16:26:26 +0200 Subject: [PATCH] 6.25 --- Garland.Data/GarlandDatabase.cs | 2 +- Garland.Server/api/weather.inc.php | 3 +- Garland.Web/bell/fish.js | 44 ++-- Supplemental/patches.json | 407 +++++++++++++++++++++++++++++ lib/SaintCoinach | 2 +- 5 files changed, 433 insertions(+), 25 deletions(-) diff --git a/Garland.Data/GarlandDatabase.cs b/Garland.Data/GarlandDatabase.cs index edd68c14..66afd3c7 100644 --- a/Garland.Data/GarlandDatabase.cs +++ b/Garland.Data/GarlandDatabase.cs @@ -13,7 +13,7 @@ namespace Garland.Data public class GarlandDatabase { // NOTE: This section must be updated with every patch! - public const decimal NextPatch = 6.2m; + public const decimal NextPatch = 6.25m; public static Patch[] MajorPatches = new[] { new Patch(1m, "Legacy", "Legacy"), diff --git a/Garland.Server/api/weather.inc.php b/Garland.Server/api/weather.inc.php index ccceda63..8eccc6b8 100644 --- a/Garland.Server/api/weather.inc.php +++ b/Garland.Server/api/weather.inc.php @@ -143,6 +143,7 @@ 'Restricted Archives' => array(array('Rate' => 10, 'Weather' => 1), array('Rate' => 50, 'Weather' => 2), array('Rate' => 70, 'Weather' => 3), array('Rate' => 85, 'Weather' => 4), array('Rate' => 100, 'Weather' => 15)), 'Meghaduta Guest Chambers' => array(array('Rate' => 10, 'Weather' => 4), array('Rate' => 25, 'Weather' => 7), array('Rate' => 40, 'Weather' => 1), array('Rate' => 80, 'Weather' => 2), array('Rate' => 100, 'Weather' => 3)), 'Empyreum' => array(array('Rate' => 5, 'Weather' => 15), array('Rate' => 25, 'Weather' => 2), array('Rate' => 65, 'Weather' => 1), array('Rate' => 80, 'Weather' => 3), array('Rate' => 90, 'Weather' => 4)), - 'Stygian Insenescence Cells' => array(array('Rate' => 100, 'Weather' => 157))); + 'Stygian Insenescence Cells' => array(array('Rate' => 100, 'Weather' => 157)), + 'Elysion' => array(array('Rate' => 15, 'Weather' => 149), array('Rate' => 85, 'Weather' => 2), array('Rate' => 100, 'Weather' => 49))); ?> diff --git a/Garland.Web/bell/fish.js b/Garland.Web/bell/fish.js index 20cee879..05b96866 100644 --- a/Garland.Web/bell/fish.js +++ b/Garland.Web/bell/fish.js @@ -52096,7 +52096,7 @@ gt.bell.fish = [ "title": "The Wellspring of Regret", "category": "Freshwater Fishing", "spot": 281, - "lvl": 90, + "lvl": 84, "coords": [ 14.97, 11.57 @@ -52130,15 +52130,15 @@ gt.bell.fish = [ "icon": 28530, "func": "fish", "rarity": 1, - "title": "Elegeia", + "title": "The Wellspring of Regret", "category": "Freshwater Fishing", - "spot": 282, - "lvl": 90, + "spot": 281, + "lvl": 84, "coords": [ - 22.6, - 8.79 + 14.97, + 11.57 ], - "radius": 750, + "radius": 600, "zone": "Ultima Thule" }, { @@ -52170,7 +52170,7 @@ gt.bell.fish = [ "title": "The Wellspring of Regret", "category": "Freshwater Fishing", "spot": 281, - "lvl": 90, + "lvl": 84, "coords": [ 14.97, 11.57 @@ -52204,15 +52204,15 @@ gt.bell.fish = [ "icon": 29254, "func": "fish", "rarity": 1, - "title": "Elegeia", + "title": "The Wellspring of Regret", "category": "Freshwater Fishing", - "spot": 282, - "lvl": 90, + "spot": 281, + "lvl": 84, "coords": [ - 22.6, - 8.79 + 14.97, + 11.57 ], - "radius": 750, + "radius": 600, "zone": "Ultima Thule" }, { @@ -52241,7 +52241,7 @@ gt.bell.fish = [ "title": "The Wellspring of Regret", "category": "Freshwater Fishing", "spot": 281, - "lvl": 90, + "lvl": 84, "coords": [ 14.97, 11.57 @@ -52275,7 +52275,7 @@ gt.bell.fish = [ "title": "The Wellspring of Regret", "category": "Freshwater Fishing", "spot": 281, - "lvl": 90, + "lvl": 84, "coords": [ 14.97, 11.57 @@ -52306,15 +52306,15 @@ gt.bell.fish = [ "icon": 28531, "func": "fish", "rarity": 1, - "title": "Elegeia", + "title": "The Wellspring of Regret", "category": "Freshwater Fishing", - "spot": 282, - "lvl": 90, + "spot": 281, + "lvl": 84, "coords": [ - 22.6, - 8.79 + 14.97, + 11.57 ], - "radius": 750, + "radius": 600, "zone": "Ultima Thule" }, { diff --git a/Supplemental/patches.json b/Supplemental/patches.json index 77c7a174..1da650c5 100644 --- a/Supplemental/patches.json +++ b/Supplemental/patches.json @@ -2302,9 +2302,43 @@ {"type":"achievement","id":"3120","patch":6.2}, {"type":"achievement","id":"3121","patch":6.2}, {"type":"achievement","id":"3122","patch":6.2}, +{"type":"achievement","id":"3123","patch":6.25}, +{"type":"achievement","id":"3124","patch":6.25}, +{"type":"achievement","id":"3125","patch":6.25}, +{"type":"achievement","id":"3126","patch":6.25}, +{"type":"achievement","id":"3127","patch":6.25}, +{"type":"achievement","id":"3128","patch":6.25}, +{"type":"achievement","id":"3129","patch":6.25}, {"type":"achievement","id":"313","patch":2.0}, +{"type":"achievement","id":"3130","patch":6.25}, +{"type":"achievement","id":"3131","patch":6.25}, +{"type":"achievement","id":"3132","patch":6.25}, +{"type":"achievement","id":"3133","patch":6.25}, +{"type":"achievement","id":"3134","patch":6.25}, +{"type":"achievement","id":"3135","patch":6.25}, +{"type":"achievement","id":"3136","patch":6.25}, +{"type":"achievement","id":"3137","patch":6.25}, +{"type":"achievement","id":"3138","patch":6.25}, +{"type":"achievement","id":"3139","patch":6.25}, {"type":"achievement","id":"314","patch":2.0}, +{"type":"achievement","id":"3140","patch":6.25}, +{"type":"achievement","id":"3141","patch":6.25}, +{"type":"achievement","id":"3142","patch":6.25}, +{"type":"achievement","id":"3143","patch":6.25}, +{"type":"achievement","id":"3144","patch":6.25}, +{"type":"achievement","id":"3145","patch":6.25}, +{"type":"achievement","id":"3146","patch":6.25}, +{"type":"achievement","id":"3147","patch":6.25}, +{"type":"achievement","id":"3148","patch":6.25}, +{"type":"achievement","id":"3149","patch":6.25}, {"type":"achievement","id":"315","patch":2.0}, +{"type":"achievement","id":"3150","patch":6.25}, +{"type":"achievement","id":"3151","patch":6.25}, +{"type":"achievement","id":"3152","patch":6.25}, +{"type":"achievement","id":"3153","patch":6.25}, +{"type":"achievement","id":"3154","patch":6.25}, +{"type":"achievement","id":"3155","patch":6.25}, +{"type":"achievement","id":"3156","patch":6.25}, {"type":"achievement","id":"316","patch":2.0}, {"type":"achievement","id":"317","patch":2.0}, {"type":"achievement","id":"318","patch":2.0}, @@ -36311,6 +36345,11 @@ {"type":"fishing","id":"10023","patch":5.41}, {"type":"fishing","id":"10024","patch":5.41}, {"type":"fishing","id":"10025","patch":5.41}, +{"type":"fishing","id":"10026","patch":6.25}, +{"type":"fishing","id":"10027","patch":6.25}, +{"type":"fishing","id":"10028","patch":6.25}, +{"type":"fishing","id":"10029","patch":6.25}, +{"type":"fishing","id":"10030","patch":6.25}, {"type":"fishing","id":"101","patch":0.0}, {"type":"fishing","id":"102","patch":0.0}, {"type":"fishing","id":"103","patch":0.0}, @@ -36896,7 +36935,10 @@ {"type":"instance","id":"35030","patch":5.15}, {"type":"instance","id":"35031","patch":5.41}, {"type":"instance","id":"36","patch":3.0}, +{"type":"instance","id":"36001","patch":6.25}, {"type":"instance","id":"37","patch":3.0}, +{"type":"instance","id":"37001","patch":6.25}, +{"type":"instance","id":"37002","patch":6.25}, {"type":"instance","id":"38","patch":3.0}, {"type":"instance","id":"39","patch":3.0}, {"type":"instance","id":"4","patch":2.0}, @@ -65939,6 +65981,7 @@ {"type":"item","id":"37851","patch":6.2}, {"type":"item","id":"37852","patch":6.2}, {"type":"item","id":"37853","patch":6.2}, +{"type":"item","id":"37854","patch":6.25}, {"type":"item","id":"37856","patch":6.2}, {"type":"item","id":"37857","patch":6.2}, {"type":"item","id":"37858","patch":6.2}, @@ -66343,6 +66386,11 @@ {"type":"item","id":"38220","patch":6.2}, {"type":"item","id":"38221","patch":6.2}, {"type":"item","id":"38222","patch":6.2}, +{"type":"item","id":"38223","patch":6.25}, +{"type":"item","id":"38224","patch":6.25}, +{"type":"item","id":"38225","patch":6.25}, +{"type":"item","id":"38226","patch":6.25}, +{"type":"item","id":"38227","patch":6.25}, {"type":"item","id":"38228","patch":6.2}, {"type":"item","id":"38229","patch":6.2}, {"type":"item","id":"3823","patch":1.0}, @@ -66391,13 +66439,85 @@ {"type":"item","id":"38273","patch":6.2}, {"type":"item","id":"38274","patch":6.2}, {"type":"item","id":"38275","patch":6.2}, +{"type":"item","id":"38276","patch":6.25}, +{"type":"item","id":"38277","patch":6.25}, +{"type":"item","id":"38278","patch":6.25}, +{"type":"item","id":"38279","patch":6.25}, {"type":"item","id":"3828","patch":1.0}, +{"type":"item","id":"38280","patch":6.25}, +{"type":"item","id":"38281","patch":6.25}, +{"type":"item","id":"38282","patch":6.25}, +{"type":"item","id":"38283","patch":6.25}, +{"type":"item","id":"38284","patch":6.25}, +{"type":"item","id":"38285","patch":6.25}, +{"type":"item","id":"38286","patch":6.25}, +{"type":"item","id":"38287","patch":6.25}, +{"type":"item","id":"38288","patch":6.25}, +{"type":"item","id":"38289","patch":6.25}, {"type":"item","id":"3829","patch":1.0}, +{"type":"item","id":"38290","patch":6.25}, +{"type":"item","id":"38291","patch":6.25}, +{"type":"item","id":"38292","patch":6.25}, +{"type":"item","id":"38293","patch":6.25}, +{"type":"item","id":"38294","patch":6.25}, +{"type":"item","id":"38295","patch":6.25}, +{"type":"item","id":"38296","patch":6.25}, +{"type":"item","id":"38297","patch":6.25}, +{"type":"item","id":"38298","patch":6.25}, +{"type":"item","id":"38299","patch":6.25}, {"type":"item","id":"3830","patch":1.0}, +{"type":"item","id":"38300","patch":6.25}, +{"type":"item","id":"38301","patch":6.25}, +{"type":"item","id":"38302","patch":6.25}, +{"type":"item","id":"38303","patch":6.25}, +{"type":"item","id":"38304","patch":6.25}, +{"type":"item","id":"38305","patch":6.25}, +{"type":"item","id":"38306","patch":6.25}, +{"type":"item","id":"38307","patch":6.25}, +{"type":"item","id":"38308","patch":6.25}, +{"type":"item","id":"38309","patch":6.25}, {"type":"item","id":"3831","patch":1.0}, +{"type":"item","id":"38310","patch":6.25}, +{"type":"item","id":"38311","patch":6.25}, +{"type":"item","id":"38312","patch":6.25}, +{"type":"item","id":"38313","patch":6.25}, +{"type":"item","id":"38314","patch":6.25}, +{"type":"item","id":"38315","patch":6.25}, +{"type":"item","id":"38316","patch":6.25}, +{"type":"item","id":"38317","patch":6.25}, +{"type":"item","id":"38318","patch":6.25}, +{"type":"item","id":"38319","patch":6.25}, {"type":"item","id":"3832","patch":1.0}, +{"type":"item","id":"38320","patch":6.25}, +{"type":"item","id":"38321","patch":6.25}, +{"type":"item","id":"38322","patch":6.25}, +{"type":"item","id":"38323","patch":6.25}, +{"type":"item","id":"38324","patch":6.25}, +{"type":"item","id":"38325","patch":6.25}, +{"type":"item","id":"38326","patch":6.25}, +{"type":"item","id":"38327","patch":6.25}, +{"type":"item","id":"38328","patch":6.25}, +{"type":"item","id":"38329","patch":6.25}, {"type":"item","id":"3833","patch":1.0}, +{"type":"item","id":"38330","patch":6.25}, +{"type":"item","id":"38331","patch":6.25}, +{"type":"item","id":"38332","patch":6.25}, +{"type":"item","id":"38333","patch":6.25}, +{"type":"item","id":"38334","patch":6.25}, +{"type":"item","id":"38335","patch":6.25}, +{"type":"item","id":"38336","patch":6.25}, +{"type":"item","id":"38337","patch":6.25}, +{"type":"item","id":"38338","patch":6.25}, +{"type":"item","id":"38339","patch":6.25}, {"type":"item","id":"3834","patch":1.0}, +{"type":"item","id":"38340","patch":6.25}, +{"type":"item","id":"38341","patch":6.25}, +{"type":"item","id":"38342","patch":6.25}, +{"type":"item","id":"38343","patch":6.25}, +{"type":"item","id":"38344","patch":6.25}, +{"type":"item","id":"38345","patch":6.25}, +{"type":"item","id":"38346","patch":6.25}, +{"type":"item","id":"38347","patch":6.25}, {"type":"item","id":"38348","patch":6.2}, {"type":"item","id":"38349","patch":6.2}, {"type":"item","id":"3835","patch":1.0}, @@ -66456,8 +66576,29 @@ {"type":"item","id":"38398","patch":6.2}, {"type":"item","id":"38399","patch":6.2}, {"type":"item","id":"3840","patch":1.0}, +{"type":"item","id":"38400","patch":6.25}, +{"type":"item","id":"38401","patch":6.25}, +{"type":"item","id":"38402","patch":6.25}, +{"type":"item","id":"38403","patch":6.25}, +{"type":"item","id":"38404","patch":6.25}, +{"type":"item","id":"38405","patch":6.25}, +{"type":"item","id":"38406","patch":6.25}, +{"type":"item","id":"38407","patch":6.25}, +{"type":"item","id":"38408","patch":6.25}, +{"type":"item","id":"38409","patch":6.25}, {"type":"item","id":"3841","patch":1.0}, +{"type":"item","id":"38410","patch":6.25}, +{"type":"item","id":"38411","patch":6.25}, +{"type":"item","id":"38412","patch":6.25}, +{"type":"item","id":"38413","patch":6.25}, +{"type":"item","id":"38414","patch":6.25}, +{"type":"item","id":"38415","patch":6.25}, +{"type":"item","id":"38416","patch":6.25}, +{"type":"item","id":"38417","patch":6.25}, +{"type":"item","id":"38418","patch":6.25}, +{"type":"item","id":"38419","patch":6.25}, {"type":"item","id":"3842","patch":1.0}, +{"type":"item","id":"38420","patch":6.25}, {"type":"item","id":"38421","patch":6.2}, {"type":"item","id":"38422","patch":6.2}, {"type":"item","id":"38423","patch":6.2}, @@ -66466,9 +66607,14 @@ {"type":"item","id":"38426","patch":6.2}, {"type":"item","id":"38427","patch":6.2}, {"type":"item","id":"38428","patch":6.2}, +{"type":"item","id":"38429","patch":6.25}, {"type":"item","id":"3843","patch":1.0}, +{"type":"item","id":"38430","patch":6.25}, +{"type":"item","id":"38431","patch":6.25}, +{"type":"item","id":"38432","patch":6.25}, {"type":"item","id":"38433","patch":6.2}, {"type":"item","id":"38434","patch":6.2}, +{"type":"item","id":"38435","patch":6.25}, {"type":"item","id":"38436","patch":6.2}, {"type":"item","id":"38437","patch":6.2}, {"type":"item","id":"38438","patch":6.2}, @@ -66479,18 +66625,26 @@ {"type":"item","id":"38442","patch":6.2}, {"type":"item","id":"38443","patch":6.2}, {"type":"item","id":"38444","patch":6.2}, +{"type":"item","id":"38445","patch":6.25}, {"type":"item","id":"38446","patch":6.2}, {"type":"item","id":"38447","patch":6.2}, {"type":"item","id":"38448","patch":6.2}, {"type":"item","id":"3845","patch":1.0}, {"type":"item","id":"38450","patch":6.2}, +{"type":"item","id":"38451","patch":6.25}, +{"type":"item","id":"38452","patch":6.25}, {"type":"item","id":"38454","patch":6.2}, {"type":"item","id":"38455","patch":6.2}, +{"type":"item","id":"38456","patch":6.25}, {"type":"item","id":"38457","patch":6.2}, {"type":"item","id":"3846","patch":1.0}, {"type":"item","id":"38460","patch":6.2}, +{"type":"item","id":"38461","patch":6.25}, +{"type":"item","id":"38462","patch":6.25}, {"type":"item","id":"38463","patch":6.2}, {"type":"item","id":"38464","patch":6.2}, +{"type":"item","id":"38465","patch":6.25}, +{"type":"item","id":"38466","patch":6.25}, {"type":"item","id":"38467","patch":6.2}, {"type":"item","id":"38469","patch":6.2}, {"type":"item","id":"3847","patch":1.0}, @@ -66562,8 +66716,13 @@ {"type":"item","id":"38530","patch":6.2}, {"type":"item","id":"38531","patch":6.2}, {"type":"item","id":"38532","patch":6.2}, +{"type":"item","id":"38533","patch":6.25}, +{"type":"item","id":"38534","patch":6.25}, +{"type":"item","id":"38535","patch":6.25}, {"type":"item","id":"38536","patch":6.2}, +{"type":"item","id":"38537","patch":6.25}, {"type":"item","id":"38538","patch":6.2}, +{"type":"item","id":"38539","patch":6.25}, {"type":"item","id":"3854","patch":1.0}, {"type":"item","id":"38540","patch":6.2}, {"type":"item","id":"38541","patch":6.2}, @@ -66585,6 +66744,7 @@ {"type":"item","id":"38556","patch":6.2}, {"type":"item","id":"38557","patch":6.2}, {"type":"item","id":"38558","patch":6.2}, +{"type":"item","id":"38559","patch":6.25}, {"type":"item","id":"3856","patch":1.0}, {"type":"item","id":"38560","patch":6.2}, {"type":"item","id":"38561","patch":6.2}, @@ -66597,6 +66757,7 @@ {"type":"item","id":"38568","patch":6.2}, {"type":"item","id":"38569","patch":6.2}, {"type":"item","id":"3857","patch":1.0}, +{"type":"item","id":"38570","patch":6.25}, {"type":"item","id":"38571","patch":6.2}, {"type":"item","id":"38572","patch":6.2}, {"type":"item","id":"38573","patch":6.2}, @@ -66613,14 +66774,25 @@ {"type":"item","id":"38583","patch":6.2}, {"type":"item","id":"38584","patch":6.2}, {"type":"item","id":"38585","patch":6.2}, +{"type":"item","id":"38586","patch":6.25}, {"type":"item","id":"38587","patch":6.2}, +{"type":"item","id":"38588","patch":6.25}, {"type":"item","id":"38589","patch":6.2}, {"type":"item","id":"3859","patch":1.0}, {"type":"item","id":"38591","patch":6.2}, +{"type":"item","id":"38592","patch":6.25}, {"type":"item","id":"38593","patch":6.2}, {"type":"item","id":"38594","patch":6.2}, +{"type":"item","id":"38595","patch":6.25}, +{"type":"item","id":"38596","patch":6.25}, +{"type":"item","id":"38597","patch":6.25}, +{"type":"item","id":"38598","patch":6.25}, {"type":"item","id":"38599","patch":6.2}, {"type":"item","id":"3860","patch":1.0}, +{"type":"item","id":"38600","patch":6.25}, +{"type":"item","id":"38601","patch":6.25}, +{"type":"item","id":"38602","patch":6.25}, +{"type":"item","id":"38603","patch":6.25}, {"type":"item","id":"38604","patch":6.2}, {"type":"item","id":"38605","patch":6.2}, {"type":"item","id":"38606","patch":6.2}, @@ -66640,6 +66812,7 @@ {"type":"item","id":"38619","patch":6.2}, {"type":"item","id":"3862","patch":1.0}, {"type":"item","id":"38620","patch":6.2}, +{"type":"item","id":"38621","patch":6.25}, {"type":"item","id":"38622","patch":6.2}, {"type":"item","id":"38623","patch":6.2}, {"type":"item","id":"38624","patch":6.2}, @@ -66651,12 +66824,14 @@ {"type":"item","id":"3863","patch":1.0}, {"type":"item","id":"38630","patch":6.2}, {"type":"item","id":"38631","patch":6.2}, +{"type":"item","id":"38632","patch":6.25}, {"type":"item","id":"38633","patch":6.2}, {"type":"item","id":"38634","patch":6.2}, {"type":"item","id":"38635","patch":6.2}, {"type":"item","id":"38636","patch":6.2}, {"type":"item","id":"38637","patch":6.2}, {"type":"item","id":"38638","patch":6.2}, +{"type":"item","id":"38639","patch":6.25}, {"type":"item","id":"3864","patch":1.0}, {"type":"item","id":"38640","patch":6.2}, {"type":"item","id":"38641","patch":6.2}, @@ -66714,6 +66889,7 @@ {"type":"item","id":"38689","patch":6.2}, {"type":"item","id":"3869","patch":1.0}, {"type":"item","id":"38690","patch":6.2}, +{"type":"item","id":"38691","patch":6.25}, {"type":"item","id":"38697","patch":6.2}, {"type":"item","id":"38698","patch":6.2}, {"type":"item","id":"38699","patch":6.2}, @@ -74731,6 +74907,8 @@ {"type":"node","id":"395","patch":3.2}, {"type":"node","id":"396","patch":0.0}, {"type":"node","id":"397","patch":3.2}, +{"type":"node","id":"398","patch":6.25}, +{"type":"node","id":"399","patch":6.25}, {"type":"node","id":"40","patch":0.0}, {"type":"node","id":"400","patch":6.2}, {"type":"node","id":"401","patch":3.55}, @@ -75275,7 +75453,17 @@ {"type":"node","id":"902","patch":6.0}, {"type":"node","id":"903","patch":6.15}, {"type":"node","id":"904","patch":6.15}, +{"type":"node","id":"905","patch":6.25}, +{"type":"node","id":"906","patch":6.25}, +{"type":"node","id":"907","patch":6.25}, +{"type":"node","id":"908","patch":6.25}, +{"type":"node","id":"909","patch":6.25}, {"type":"node","id":"91","patch":0.0}, +{"type":"node","id":"910","patch":6.25}, +{"type":"node","id":"911","patch":6.25}, +{"type":"node","id":"912","patch":6.25}, +{"type":"node","id":"913","patch":6.25}, +{"type":"node","id":"914","patch":6.25}, {"type":"node","id":"92","patch":0.0}, {"type":"node","id":"93","patch":0.0}, {"type":"node","id":"94","patch":0.0}, @@ -101655,6 +101843,34 @@ {"type":"npc","id":"1042521","patch":6.15}, {"type":"npc","id":"1042522","patch":6.15}, {"type":"npc","id":"1042523","patch":6.15}, +{"type":"npc","id":"1042524","patch":6.25}, +{"type":"npc","id":"1042525","patch":6.25}, +{"type":"npc","id":"1042526","patch":6.25}, +{"type":"npc","id":"1042527","patch":6.25}, +{"type":"npc","id":"1042528","patch":6.25}, +{"type":"npc","id":"1042529","patch":6.25}, +{"type":"npc","id":"1042530","patch":6.25}, +{"type":"npc","id":"1042531","patch":6.25}, +{"type":"npc","id":"1042532","patch":6.25}, +{"type":"npc","id":"1042533","patch":6.25}, +{"type":"npc","id":"1042534","patch":6.25}, +{"type":"npc","id":"1042535","patch":6.25}, +{"type":"npc","id":"1042536","patch":6.25}, +{"type":"npc","id":"1042537","patch":6.25}, +{"type":"npc","id":"1042544","patch":6.25}, +{"type":"npc","id":"1042545","patch":6.25}, +{"type":"npc","id":"1042546","patch":6.25}, +{"type":"npc","id":"1042547","patch":6.25}, +{"type":"npc","id":"1042548","patch":6.25}, +{"type":"npc","id":"1042549","patch":6.25}, +{"type":"npc","id":"1042550","patch":6.25}, +{"type":"npc","id":"1042551","patch":6.25}, +{"type":"npc","id":"1042552","patch":6.25}, +{"type":"npc","id":"1042555","patch":6.25}, +{"type":"npc","id":"1042556","patch":6.25}, +{"type":"npc","id":"1042557","patch":6.25}, +{"type":"npc","id":"1042558","patch":6.25}, +{"type":"npc","id":"1042559","patch":6.25}, {"type":"npc","id":"1042576","patch":6.15}, {"type":"npc","id":"1042577","patch":6.1}, {"type":"npc","id":"1042578","patch":6.15}, @@ -101874,6 +102090,13 @@ {"type":"npc","id":"1043414","patch":6.2}, {"type":"npc","id":"1043415","patch":6.2}, {"type":"npc","id":"1043416","patch":6.2}, +{"type":"npc","id":"1043417","patch":6.25}, +{"type":"npc","id":"1043418","patch":6.25}, +{"type":"npc","id":"1043419","patch":6.25}, +{"type":"npc","id":"1043421","patch":6.25}, +{"type":"npc","id":"1043422","patch":6.25}, +{"type":"npc","id":"1043423","patch":6.25}, +{"type":"npc","id":"1043424","patch":6.25}, {"type":"npc","id":"1043452","patch":6.2}, {"type":"npc","id":"1043453","patch":6.2}, {"type":"npc","id":"1043454","patch":6.2}, @@ -101921,6 +102144,57 @@ {"type":"npc","id":"1043511","patch":6.2}, {"type":"npc","id":"1043512","patch":6.2}, {"type":"npc","id":"1043513","patch":6.2}, +{"type":"npc","id":"1043514","patch":6.25}, +{"type":"npc","id":"1043515","patch":6.25}, +{"type":"npc","id":"1043516","patch":6.25}, +{"type":"npc","id":"1043517","patch":6.25}, +{"type":"npc","id":"1043518","patch":6.25}, +{"type":"npc","id":"1043519","patch":6.25}, +{"type":"npc","id":"1043520","patch":6.25}, +{"type":"npc","id":"1043521","patch":6.25}, +{"type":"npc","id":"1043523","patch":6.25}, +{"type":"npc","id":"1043524","patch":6.25}, +{"type":"npc","id":"1043525","patch":6.25}, +{"type":"npc","id":"1043526","patch":6.25}, +{"type":"npc","id":"1043527","patch":6.25}, +{"type":"npc","id":"1043528","patch":6.25}, +{"type":"npc","id":"1043529","patch":6.25}, +{"type":"npc","id":"1043530","patch":6.25}, +{"type":"npc","id":"1043531","patch":6.25}, +{"type":"npc","id":"1043532","patch":6.25}, +{"type":"npc","id":"1043533","patch":6.25}, +{"type":"npc","id":"1043534","patch":6.25}, +{"type":"npc","id":"1043535","patch":6.25}, +{"type":"npc","id":"1043536","patch":6.25}, +{"type":"npc","id":"1043537","patch":6.25}, +{"type":"npc","id":"1043538","patch":6.25}, +{"type":"npc","id":"1043539","patch":6.25}, +{"type":"npc","id":"1043540","patch":6.25}, +{"type":"npc","id":"1043545","patch":6.25}, +{"type":"npc","id":"1043546","patch":6.25}, +{"type":"npc","id":"1043547","patch":6.25}, +{"type":"npc","id":"1043548","patch":6.25}, +{"type":"npc","id":"1043549","patch":6.25}, +{"type":"npc","id":"1043550","patch":6.25}, +{"type":"npc","id":"1043551","patch":6.25}, +{"type":"npc","id":"1043552","patch":6.25}, +{"type":"npc","id":"1043553","patch":6.25}, +{"type":"npc","id":"1043555","patch":6.25}, +{"type":"npc","id":"1043556","patch":6.25}, +{"type":"npc","id":"1043557","patch":6.25}, +{"type":"npc","id":"1043559","patch":6.25}, +{"type":"npc","id":"1043560","patch":6.25}, +{"type":"npc","id":"1043561","patch":6.25}, +{"type":"npc","id":"1043562","patch":6.25}, +{"type":"npc","id":"1043563","patch":6.25}, +{"type":"npc","id":"1043584","patch":6.25}, +{"type":"npc","id":"1043585","patch":6.25}, +{"type":"npc","id":"1043586","patch":6.25}, +{"type":"npc","id":"1043587","patch":6.25}, +{"type":"npc","id":"1043588","patch":6.25}, +{"type":"npc","id":"1043590","patch":6.25}, +{"type":"npc","id":"1043592","patch":6.25}, +{"type":"npc","id":"1043593","patch":6.25}, {"type":"npc","id":"1043611","patch":6.2}, {"type":"npc","id":"1043612","patch":6.2}, {"type":"npc","id":"1043613","patch":6.2}, @@ -101928,9 +102202,15 @@ {"type":"npc","id":"1043616","patch":6.2}, {"type":"npc","id":"1043617","patch":6.2}, {"type":"npc","id":"1043618","patch":6.2}, +{"type":"npc","id":"1043619","patch":6.25}, {"type":"npc","id":"1043621","patch":6.2}, {"type":"npc","id":"1043622","patch":6.2}, {"type":"npc","id":"1043623","patch":6.2}, +{"type":"npc","id":"1043624","patch":6.25}, +{"type":"npc","id":"1043625","patch":6.25}, +{"type":"npc","id":"1043626","patch":6.25}, +{"type":"npc","id":"1043630","patch":6.25}, +{"type":"npc","id":"1043631","patch":6.25}, {"type":"npc","id":"1043634","patch":6.2}, {"type":"npc","id":"1043635","patch":6.2}, {"type":"npc","id":"1043636","patch":6.2}, @@ -101942,6 +102222,17 @@ {"type":"npc","id":"1043646","patch":6.2}, {"type":"npc","id":"1043647","patch":6.2}, {"type":"npc","id":"1043648","patch":6.2}, +{"type":"npc","id":"1043655","patch":6.25}, +{"type":"npc","id":"1043656","patch":6.25}, +{"type":"npc","id":"1043657","patch":6.25}, +{"type":"npc","id":"1043658","patch":6.25}, +{"type":"npc","id":"1043659","patch":6.25}, +{"type":"npc","id":"1043660","patch":6.25}, +{"type":"npc","id":"1043661","patch":6.25}, +{"type":"npc","id":"1043662","patch":6.25}, +{"type":"npc","id":"1043663","patch":6.25}, +{"type":"npc","id":"1043664","patch":6.25}, +{"type":"npc","id":"1043665","patch":6.25}, {"type":"npc","id":"1043674","patch":6.2}, {"type":"npc","id":"1043675","patch":6.2}, {"type":"npc","id":"1043676","patch":6.2}, @@ -101958,6 +102249,11 @@ {"type":"npc","id":"1043687","patch":6.2}, {"type":"npc","id":"1043688","patch":6.2}, {"type":"npc","id":"1043689","patch":6.2}, +{"type":"npc","id":"1043690","patch":6.25}, +{"type":"npc","id":"1043691","patch":6.25}, +{"type":"npc","id":"1043692","patch":6.25}, +{"type":"npc","id":"1043693","patch":6.25}, +{"type":"npc","id":"1043694","patch":6.25}, {"type":"npc","id":"1043695","patch":6.2}, {"type":"npc","id":"1043696","patch":6.2}, {"type":"npc","id":"1043697","patch":6.2}, @@ -101977,6 +102273,8 @@ {"type":"npc","id":"1043713","patch":6.2}, {"type":"npc","id":"1043714","patch":6.2}, {"type":"npc","id":"1043715","patch":6.2}, +{"type":"npc","id":"1043716","patch":6.25}, +{"type":"npc","id":"1043717","patch":6.25}, {"type":"npc","id":"1043720","patch":6.2}, {"type":"npc","id":"1043721","patch":6.2}, {"type":"npc","id":"1043722","patch":6.2}, @@ -101986,12 +102284,14 @@ {"type":"npc","id":"1043727","patch":6.2}, {"type":"npc","id":"1043728","patch":6.2}, {"type":"npc","id":"1043729","patch":6.2}, +{"type":"npc","id":"1043730","patch":6.25}, {"type":"npc","id":"1043731","patch":6.2}, {"type":"npc","id":"1043732","patch":6.2}, {"type":"npc","id":"1043733","patch":6.2}, {"type":"npc","id":"1043734","patch":6.2}, {"type":"npc","id":"1043735","patch":6.2}, {"type":"npc","id":"1043736","patch":6.2}, +{"type":"npc","id":"1043738","patch":6.25}, {"type":"npc","id":"1043740","patch":6.2}, {"type":"npc","id":"1043741","patch":6.2}, {"type":"npc","id":"1043742","patch":6.2}, @@ -101999,12 +102299,22 @@ {"type":"npc","id":"1043744","patch":6.2}, {"type":"npc","id":"1043745","patch":6.2}, {"type":"npc","id":"1043751","patch":6.2}, +{"type":"npc","id":"1043752","patch":6.25}, {"type":"npc","id":"1043753","patch":6.2}, +{"type":"npc","id":"1043758","patch":6.25}, {"type":"npc","id":"1043759","patch":6.2}, {"type":"npc","id":"1043760","patch":6.2}, {"type":"npc","id":"1043761","patch":6.2}, {"type":"npc","id":"1043762","patch":6.2}, {"type":"npc","id":"1043763","patch":6.2}, +{"type":"npc","id":"1043770","patch":6.25}, +{"type":"npc","id":"1043771","patch":6.25}, +{"type":"npc","id":"1043772","patch":6.25}, +{"type":"npc","id":"1043773","patch":6.25}, +{"type":"npc","id":"1043774","patch":6.25}, +{"type":"npc","id":"1043775","patch":6.25}, +{"type":"npc","id":"1043777","patch":6.25}, +{"type":"npc","id":"1043778","patch":6.25}, {"type":"npc","id":"1043779","patch":6.2}, {"type":"npc","id":"1043783","patch":6.2}, {"type":"npc","id":"1043784","patch":6.2}, @@ -102082,6 +102392,8 @@ {"type":"npc","id":"1043860","patch":6.2}, {"type":"npc","id":"1043861","patch":6.2}, {"type":"npc","id":"1043862","patch":6.2}, +{"type":"npc","id":"1043864","patch":6.25}, +{"type":"npc","id":"1043865","patch":6.25}, {"type":"npc","id":"1043882","patch":6.2}, {"type":"npc","id":"1043883","patch":6.2}, {"type":"npc","id":"1043884","patch":6.2}, @@ -102090,6 +102402,9 @@ {"type":"npc","id":"1043887","patch":6.2}, {"type":"npc","id":"1043888","patch":6.2}, {"type":"npc","id":"1043889","patch":6.2}, +{"type":"npc","id":"1043890","patch":6.25}, +{"type":"npc","id":"1043891","patch":6.25}, +{"type":"npc","id":"1043892","patch":6.25}, {"type":"npc","id":"1043904","patch":6.2}, {"type":"npc","id":"1043905","patch":6.2}, {"type":"npc","id":"1043906","patch":6.2}, @@ -102114,7 +102429,14 @@ {"type":"npc","id":"1043929","patch":6.2}, {"type":"npc","id":"1043930","patch":6.2}, {"type":"npc","id":"1043933","patch":6.2}, +{"type":"npc","id":"1043936","patch":6.25}, +{"type":"npc","id":"1043940","patch":6.25}, {"type":"npc","id":"1043944","patch":6.2}, +{"type":"npc","id":"1043949","patch":6.25}, +{"type":"npc","id":"1043950","patch":6.25}, +{"type":"npc","id":"1043951","patch":6.25}, +{"type":"npc","id":"1043952","patch":6.25}, +{"type":"npc","id":"1043954","patch":6.25}, {"type":"npc","id":"1043955","patch":6.2}, {"type":"npc","id":"1043970","patch":6.2}, {"type":"npc","id":"1043971","patch":6.2}, @@ -102154,10 +102476,47 @@ {"type":"npc","id":"1044008","patch":6.2}, {"type":"npc","id":"1044009","patch":6.2}, {"type":"npc","id":"1044010","patch":6.2}, +{"type":"npc","id":"1044013","patch":6.25}, {"type":"npc","id":"1044018","patch":6.2}, {"type":"npc","id":"1044019","patch":6.2}, {"type":"npc","id":"1044020","patch":6.2}, {"type":"npc","id":"1044021","patch":6.2}, +{"type":"npc","id":"1044042","patch":6.25}, +{"type":"npc","id":"1044043","patch":6.25}, +{"type":"npc","id":"1044044","patch":6.25}, +{"type":"npc","id":"1044045","patch":6.25}, +{"type":"npc","id":"1044046","patch":6.25}, +{"type":"npc","id":"1044047","patch":6.25}, +{"type":"npc","id":"1044048","patch":6.25}, +{"type":"npc","id":"1044049","patch":6.25}, +{"type":"npc","id":"1044050","patch":6.25}, +{"type":"npc","id":"1044051","patch":6.25}, +{"type":"npc","id":"1044052","patch":6.25}, +{"type":"npc","id":"1044053","patch":6.25}, +{"type":"npc","id":"1044054","patch":6.25}, +{"type":"npc","id":"1044055","patch":6.25}, +{"type":"npc","id":"1044056","patch":6.25}, +{"type":"npc","id":"1044057","patch":6.25}, +{"type":"npc","id":"1044058","patch":6.25}, +{"type":"npc","id":"1044059","patch":6.25}, +{"type":"npc","id":"1044060","patch":6.25}, +{"type":"npc","id":"1044062","patch":6.25}, +{"type":"npc","id":"1044063","patch":6.25}, +{"type":"npc","id":"1044064","patch":6.25}, +{"type":"npc","id":"1044065","patch":6.25}, +{"type":"npc","id":"1044066","patch":6.25}, +{"type":"npc","id":"1044068","patch":6.25}, +{"type":"npc","id":"1044069","patch":6.25}, +{"type":"npc","id":"1044070","patch":6.25}, +{"type":"npc","id":"1044071","patch":6.25}, +{"type":"npc","id":"1044072","patch":6.25}, +{"type":"npc","id":"1044074","patch":6.25}, +{"type":"npc","id":"1044075","patch":6.25}, +{"type":"npc","id":"1044076","patch":6.25}, +{"type":"npc","id":"1044077","patch":6.25}, +{"type":"npc","id":"1044078","patch":6.25}, +{"type":"npc","id":"1044079","patch":6.25}, +{"type":"npc","id":"1044081","patch":6.25}, {"type":"npc","id":"1044082","patch":6.2}, {"type":"npc","id":"1044085","patch":6.2}, {"type":"npc","id":"1044099","patch":6.2}, @@ -102171,6 +102530,7 @@ {"type":"npc","id":"1044119","patch":6.2}, {"type":"npc","id":"1044120","patch":6.2}, {"type":"npc","id":"1044122","patch":6.2}, +{"type":"npc","id":"1044127","patch":6.25}, {"type":"npc","id":"1044129","patch":6.2}, {"type":"npc","id":"1044130","patch":6.2}, {"type":"npc","id":"1044131","patch":6.2}, @@ -102189,12 +102549,18 @@ {"type":"npc","id":"1044152","patch":6.2}, {"type":"npc","id":"1044156","patch":6.2}, {"type":"npc","id":"1044157","patch":6.2}, +{"type":"npc","id":"1044158","patch":6.25}, {"type":"npc","id":"1044159","patch":6.2}, {"type":"npc","id":"1044160","patch":6.2}, {"type":"npc","id":"1044161","patch":6.2}, {"type":"npc","id":"1044162","patch":6.2}, {"type":"npc","id":"1044163","patch":6.2}, +{"type":"npc","id":"1044170","patch":6.25}, +{"type":"npc","id":"1044171","patch":6.25}, +{"type":"npc","id":"1044172","patch":6.25}, {"type":"npc","id":"1044176","patch":6.2}, +{"type":"npc","id":"1044190","patch":6.25}, +{"type":"npc","id":"1044227","patch":6.25}, {"type":"quest","id":"65537","patch":2.0}, {"type":"quest","id":"65539","patch":2.0}, {"type":"quest","id":"65540","patch":2.0}, @@ -106687,16 +107053,57 @@ {"type":"quest","id":"70134","patch":6.2}, {"type":"quest","id":"70135","patch":6.2}, {"type":"quest","id":"70136","patch":6.2}, +{"type":"quest","id":"70137","patch":6.25}, +{"type":"quest","id":"70138","patch":6.25}, +{"type":"quest","id":"70139","patch":6.25}, +{"type":"quest","id":"70140","patch":6.25}, +{"type":"quest","id":"70141","patch":6.25}, +{"type":"quest","id":"70142","patch":6.25}, +{"type":"quest","id":"70143","patch":6.25}, +{"type":"quest","id":"70144","patch":6.25}, +{"type":"quest","id":"70145","patch":6.25}, +{"type":"quest","id":"70146","patch":6.25}, +{"type":"quest","id":"70147","patch":6.25}, +{"type":"quest","id":"70148","patch":6.25}, +{"type":"quest","id":"70149","patch":6.25}, +{"type":"quest","id":"70150","patch":6.25}, +{"type":"quest","id":"70151","patch":6.25}, +{"type":"quest","id":"70152","patch":6.25}, +{"type":"quest","id":"70153","patch":6.25}, +{"type":"quest","id":"70154","patch":6.25}, +{"type":"quest","id":"70155","patch":6.25}, +{"type":"quest","id":"70156","patch":6.25}, +{"type":"quest","id":"70157","patch":6.25}, +{"type":"quest","id":"70158","patch":6.25}, +{"type":"quest","id":"70159","patch":6.25}, +{"type":"quest","id":"70160","patch":6.25}, +{"type":"quest","id":"70161","patch":6.25}, +{"type":"quest","id":"70162","patch":6.25}, +{"type":"quest","id":"70163","patch":6.25}, +{"type":"quest","id":"70164","patch":6.25}, +{"type":"quest","id":"70165","patch":6.25}, +{"type":"quest","id":"70166","patch":6.25}, +{"type":"quest","id":"70167","patch":6.25}, +{"type":"quest","id":"70168","patch":6.25}, +{"type":"quest","id":"70169","patch":6.25}, +{"type":"quest","id":"70170","patch":6.25}, {"type":"quest","id":"70171","patch":6.2}, {"type":"quest","id":"70172","patch":6.2}, {"type":"quest","id":"70173","patch":6.2}, {"type":"quest","id":"70174","patch":6.2}, {"type":"quest","id":"70175","patch":6.2}, {"type":"quest","id":"70176","patch":6.2}, +{"type":"quest","id":"70177","patch":6.25}, +{"type":"quest","id":"70178","patch":6.25}, {"type":"quest","id":"70179","patch":6.2}, {"type":"quest","id":"70180","patch":6.2}, {"type":"quest","id":"70181","patch":6.2}, +{"type":"quest","id":"70182","patch":6.25}, +{"type":"quest","id":"70185","patch":6.25}, {"type":"quest","id":"70186","patch":6.2}, +{"type":"quest","id":"70187","patch":6.25}, +{"type":"quest","id":"70188","patch":6.25}, +{"type":"quest","id":"70189","patch":6.25}, {"type":"quest","id":"70190","patch":6.2}, {"type":"quest","id":"70191","patch":6.2}, {"type":"quest","id":"70192","patch":6.2}, diff --git a/lib/SaintCoinach b/lib/SaintCoinach index c5972261..2b60041e 160000 --- a/lib/SaintCoinach +++ b/lib/SaintCoinach @@ -1 +1 @@ -Subproject commit c59722619b2c28be6d0b23a78d7d26e2c7c06b83 +Subproject commit 2b60041ec0dcd228665239ce59d909cae55a2225