XML,SQL: Castle Area separate tax and changes for castle items and shops

datapack_development/data/MerchantPriceConfig.xml

@@ -18,6 +18,15 @@
 	<priceConfig id="16" name="Schuttgart Town" baseTax="20" castleId="9" zoneId="11035" />
 	<priceConfig id="17" name="Floran Village" baseTax="50" castleId="2" zoneId="11036" />
 	<priceConfig id="18" name="Neutral Territory" baseTax="50"/>
+	<priceConfig id="19" name="Gludio Castle" baseTax="10" castleId="1" zoneId="11200"/>
+	<priceConfig id="20" name="Dion Castle" baseTax="10" castleId="2" zoneId="11201"/>
+	<priceConfig id="21" name="Giran Castle" baseTax="10" castleId="3" zoneId="11202"/>
+	<priceConfig id="22" name="Oren Castle" baseTax="10" castleId="4" zoneId="11203"/>
+	<priceConfig id="23" name="Aden Castle" baseTax="10" castleId="5" zoneId="11204"/>
+	<priceConfig id="24" name="Innadril Castle" baseTax="10" castleId="6" zoneId="11205"/>
+	<priceConfig id="25" name="Goddard Castle" baseTax="10" castleId="7" zoneId="11206"/>
+	<priceConfig id="26" name="Rune Castle" baseTax="10" castleId="8" zoneId="11207"/>
+	<priceConfig id="27" name="Schuttgart Castle" baseTax="10" castleId="9" zoneId="11208"/>
 </merchantPriceConfig>
 
 <!-- Documentation

datapack_development/sql/armor.sql

@@ -823,13 +823,13 @@ INSERT INTO `armor` VALUES
 (6724,'Sealed Tateossian Earring','rear,lear','true','none',150,'silver','s',0,-1,0,68,0,3700000,185,'true','true','true','true','0-0;'),
 (6725,'Sealed Tateossian Ring','rfinger,lfinger','true','none',150,'gold','s',0,-1,0,46,0,2470000,123,'true','true','true','true','0-0;'),
 (6726,'Sealed Tateossian Necklace','neck','true','none',150,'silver','s',0,-1,0,91,0,4940000,247,'true','true','true','true','0-0;'),
-(6834,'Circlet of Innadril','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-1;'),
-(6835,'Circlet of Dion','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-1;'),
-(6836,'Circlet of Goddard','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-2;'),
-(6837,'Circlet of Oren','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-1;'),
-(6838,'Circlet of Gludio','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-1;'),
-(6839,'Circlet of Giran','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-1;'),
-(6840,'Circlet of Aden','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-2;'),
+(6834,'Circlet of Innadril','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-1;'),
+(6835,'Circlet of Dion','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-1;'),
+(6836,'Circlet of Goddard','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-2;'),
+(6837,'Circlet of Oren','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-1;'),
+(6838,'Circlet of Gludio','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-1;'),
+(6839,'Circlet of Giran','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-1;'),
+(6840,'Circlet of Aden','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-2;'),
 (6841,'The Lord\'s Crown','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-1;'),
 (6842,'Wings of Destiny Circlet','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','0-0;'),
 (6843,'Cat Ear','hair','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'true','true','true','true','0-0;'),
@@ -893,8 +893,8 @@ INSERT INTO `armor` VALUES
 (8179,'Raid Master\'s Circlet','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true','0-0;'),
 (8180,'Circlet of Ice Fairy Sirra','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true','0-0;'),
 (8181,'Academy Circlet','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','0-0;'),
-(8182,'Circlet of Rune','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-2;'),
-(8183,'Circlet of Schuttgart','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false','3633-2;'),
+(8182,'Circlet of Rune','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-2;'),
+(8183,'Circlet of Schuttgart','face','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'false','false','false','false','3633-2;'),
 (8184,'Party Hat','dhair','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true','0-0;'),
 (8185,'Feathered Hat','dhair','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true','0-0;'),
 (8186,'Artisan\'s Goggles','dhair','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true','0-0;'),
@@ -1156,16 +1156,16 @@ INSERT INTO `armor` VALUES
 (9591,'Steel Bracelet','rbracelet','true','none',150,'wood','a',0,-1,0,0,0,0,0,'true','true','true','true','0-0;'),
 (9592,'Mithril Bracelet','rbracelet','true','none',150,'wood','s',0,-1,0,0,0,0,0,'true','true','true','true','0-0;'),
 (9605,'Agathion Seal Bracelet - Rainbow Clan Hall','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3269-1;5414-1;'),
-(9606,'Agathion Seal Bracelet - Wild Beast Reserve','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3270-1;5413-1;'),
-(9607,'Agathion Seal Bracelet - Gludio','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
-(9608,'Agathion Seal Bracelet - Dion','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
-(9609,'Agathion Seal Bracelet - Giran','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
-(9610,'Agathion Seal Bracelet - Oren','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
-(9611,'Agathion Seal Bracelet - Aden','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
-(9612,'Agathion Seal Bracelet - Innadril','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
-(9613,'Agathion Seal Bracelet - Goddard','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
-(9614,'Agathion Seal Bracelet - Rune','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
-(9615,'Agathion Seal Bracelet - Schuttgart','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9606,'Agathion Seal Bracelet - Wild Beast Reserve','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3270-1;5413-1;'),
+(9607,'Agathion Seal Bracelet - Gludio','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9608,'Agathion Seal Bracelet - Dion','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9609,'Agathion Seal Bracelet - Giran','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9610,'Agathion Seal Bracelet - Oren','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9611,'Agathion Seal Bracelet - Aden','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9612,'Agathion Seal Bracelet - Innadril','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9613,'Agathion Seal Bracelet - Goddard','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9614,'Agathion Seal Bracelet - Rune','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
+(9615,'Agathion Seal Bracelet - Schuttgart','lbracelet','true','none',150,'wood','none',0,-1,0,0,0,30000000,0,'false','false','true','false','3267-1;3268-1;5415-1;'),
 (9662,'Black Hair Wolf Scale Armor','wolf','true','none',160,'wood','none',0,-1,112,14,0,1877000,0,'true','true','true','true','0-0;'),
 (9663,'Black Hair Wolf Bronze Armor','wolf','true','none',160,'wood','none',0,-1,124,14,0,3620000,0,'true','true','true','true','0-0;'),
 (9664,'Black Hair Wolf Plate Armor','wolf','true','none',160,'wood','none',0,-1,136,14,0,7126000,0,'true','true','true','true','0-0;'),

datapack_development/sql/merchant_buylists.sql

@@ -19360,42 +19360,42 @@ INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`,`count`,tim
 -- Castles Item Creation
 --
 INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`) VALUES 
-(6316,300,351001,1),
-(6838,500000,351001,2),
-(7015,12900,351001,3),
-(9607,30000000,351001,4),
-(6316,300,351421,1),
-(6835,500000,351421,2),
-(7015,12900,351421,3),
-(9608,30000000,351421,4),
-(6316,300,351841,1),
-(6839,500000,351841,2),
-(7015,12900,351841,3),
-(9609,30000000,351841,4),
-(6316,300,352261,1),
-(6837,500000,352261,2),
-(7015,12900,352261,3),
-(9610,30000000,352261,4),
-(6316,300,352741,1),
-(6840,500000,352741,2),
-(7015,12900,352741,3),
-(9611,30000000,352741,4),
-(6316,300,353161,1),
-(6834,500000,353161,2),
-(7015,12900,353161,3),
-(9612,30000000,353161,4),
-(6316,300,353631,1),
-(6836,500000,353631,2),
-(7015,12900,353631,3),
-(9613,30000000,353631,4),
-(6316,300,355091,1),
-(8182,500000,355091,2),
-(7015,12900,355091,3),
-(9614,30000000,355091,4),
-(6316,300,355551,1),
-(8183,500000,355551,2),
-(7015,12900,355551,3),
-(9615,30000000,355551,4);
+(6316,-1,351001,1),
+(6838,-1,351001,2),
+(7015,-1,351001,3),
+(9607,-1,351001,4),
+(6316,-1,351421,1),
+(6835,-1,351421,2),
+(7015,-1,351421,3),
+(9608,-1,351421,4),
+(6316,-1,351841,1),
+(6839,-1,351841,2),
+(7015,-1,351841,3),
+(9609,-1,351841,4),
+(6316,-1,352261,1),
+(6837,-1,352261,2),
+(7015,-1,352261,3),
+(9610,-1,352261,4),
+(6316,-1,352741,1),
+(6840,-1,352741,2),
+(7015,-1,352741,3),
+(9611,-1,352741,4),
+(6316,-1,353161,1),
+(6834,-1,353161,2),
+(7015,-1,353161,3),
+(9612,-1,353161,4),
+(6316,-1,353631,1),
+(6836,-1,353631,2),
+(7015,-1,353631,3),
+(9613,-1,353631,4),
+(6316,-1,355091,1),
+(8182,-1,355091,2),
+(7015,-1,355091,3),
+(9614,-1,355091,4),
+(6316,-1,355551,1),
+(8183,-1,355551,2),
+(7015,-1,355551,3),
+(9615,-1,355551,4);
 --
 -- Harvester
 --