diff --git a/Data/Map001.rxdata b/Data/Map001.rxdata index 7b3e971ca..601110838 100644 Binary files a/Data/Map001.rxdata and b/Data/Map001.rxdata differ diff --git a/Data/Map008.rxdata b/Data/Map008.rxdata index be03adc38..40cba172e 100644 Binary files a/Data/Map008.rxdata and b/Data/Map008.rxdata differ diff --git a/Data/Map009.rxdata b/Data/Map009.rxdata index 43861883c..0be688d1d 100644 Binary files a/Data/Map009.rxdata and b/Data/Map009.rxdata differ diff --git a/Data/Map011.rxdata b/Data/Map011.rxdata index 23d44d152..43af54cae 100644 Binary files a/Data/Map011.rxdata and b/Data/Map011.rxdata differ diff --git a/Data/Map012.rxdata b/Data/Map012.rxdata index 437a5ccda..9bc6ca203 100644 Binary files a/Data/Map012.rxdata and b/Data/Map012.rxdata differ diff --git a/Data/Map013.rxdata b/Data/Map013.rxdata index 42f9c4793..079232763 100644 Binary files a/Data/Map013.rxdata and b/Data/Map013.rxdata differ diff --git a/Data/Map017.rxdata b/Data/Map017.rxdata index 4b60febe4..b034d090d 100644 Binary files a/Data/Map017.rxdata and b/Data/Map017.rxdata differ diff --git a/Data/Map019.rxdata b/Data/Map019.rxdata index d048dbbeb..7d746dcde 100644 Binary files a/Data/Map019.rxdata and b/Data/Map019.rxdata differ diff --git a/Data/Map020.rxdata b/Data/Map020.rxdata index 510c83655..bd932d101 100644 Binary files a/Data/Map020.rxdata and b/Data/Map020.rxdata differ diff --git a/Data/Map021.rxdata b/Data/Map021.rxdata index 44ce9abe3..29dcd2f56 100644 Binary files a/Data/Map021.rxdata and b/Data/Map021.rxdata differ diff --git a/Data/Map025.rxdata b/Data/Map025.rxdata index 970e3c9c3..7903ead4d 100644 Binary files a/Data/Map025.rxdata and b/Data/Map025.rxdata differ diff --git a/Data/Map030.rxdata b/Data/Map030.rxdata index 7cf6972db..08e02ab42 100644 Binary files a/Data/Map030.rxdata and b/Data/Map030.rxdata differ diff --git a/Data/Map031.rxdata b/Data/Map031.rxdata index e3e47aec4..3274206bd 100644 Binary files a/Data/Map031.rxdata and b/Data/Map031.rxdata differ diff --git a/Data/Map035.rxdata b/Data/Map035.rxdata index e04a52619..f1e5dcf38 100644 Binary files a/Data/Map035.rxdata and b/Data/Map035.rxdata differ diff --git a/Data/Map037.rxdata b/Data/Map037.rxdata index c92053ec9..9a4ec37ef 100644 Binary files a/Data/Map037.rxdata and b/Data/Map037.rxdata differ diff --git a/Data/Map042.rxdata b/Data/Map042.rxdata index 10c681c13..e72d47d0c 100644 Binary files a/Data/Map042.rxdata and b/Data/Map042.rxdata differ diff --git a/Data/Map057.rxdata b/Data/Map057.rxdata index 13856a136..6df25df4b 100644 Binary files a/Data/Map057.rxdata and b/Data/Map057.rxdata differ diff --git a/Data/Map062.rxdata b/Data/Map062.rxdata index 7e56e3da5..893f1d364 100644 Binary files a/Data/Map062.rxdata and b/Data/Map062.rxdata differ diff --git a/Data/Map063.rxdata b/Data/Map063.rxdata index 4906bfcfe..6b931c218 100644 Binary files a/Data/Map063.rxdata and b/Data/Map063.rxdata differ diff --git a/Data/Map064.rxdata b/Data/Map064.rxdata index a0c312fcf..17954bd6f 100644 Binary files a/Data/Map064.rxdata and b/Data/Map064.rxdata differ diff --git a/Data/Map065.rxdata b/Data/Map065.rxdata index 4841c0e5d..6ce9387bb 100644 Binary files a/Data/Map065.rxdata and b/Data/Map065.rxdata differ diff --git a/Data/Map079.rxdata b/Data/Map079.rxdata index b1b69bf46..dea4b45e0 100644 Binary files a/Data/Map079.rxdata and b/Data/Map079.rxdata differ diff --git a/Data/Map080.rxdata b/Data/Map080.rxdata index 0e0f7a96d..47804f54f 100644 Binary files a/Data/Map080.rxdata and b/Data/Map080.rxdata differ diff --git a/Data/Map081.rxdata b/Data/Map081.rxdata index 070fa39dd..6a8548768 100644 Binary files a/Data/Map081.rxdata and b/Data/Map081.rxdata differ diff --git a/Data/Map091.rxdata b/Data/Map091.rxdata index b994b0a11..5430f0a7a 100644 Binary files a/Data/Map091.rxdata and b/Data/Map091.rxdata differ diff --git a/Data/Map096.rxdata b/Data/Map096.rxdata index e435b0e3e..9edd3a99d 100644 Binary files a/Data/Map096.rxdata and b/Data/Map096.rxdata differ diff --git a/Data/Map098.rxdata b/Data/Map098.rxdata index 9576e06c1..f6727090c 100644 Binary files a/Data/Map098.rxdata and b/Data/Map098.rxdata differ diff --git a/Data/Map106.rxdata b/Data/Map106.rxdata index a303eed83..b336278f3 100644 Binary files a/Data/Map106.rxdata and b/Data/Map106.rxdata differ diff --git a/Data/Map108.rxdata b/Data/Map108.rxdata index 1d5507bc5..b2852d25a 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map113.rxdata b/Data/Map113.rxdata index 464cb2b7f..6048e8beb 100644 Binary files a/Data/Map113.rxdata and b/Data/Map113.rxdata differ diff --git a/Data/Map125.rxdata b/Data/Map125.rxdata index 804dfa8fa..6625e57dc 100644 Binary files a/Data/Map125.rxdata and b/Data/Map125.rxdata differ diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata index a445e8bc8..f8d5d8df5 100644 Binary files a/Data/Map129.rxdata and b/Data/Map129.rxdata differ diff --git a/Data/Map130.rxdata b/Data/Map130.rxdata index e648b0bee..2690e7f90 100644 Binary files a/Data/Map130.rxdata and b/Data/Map130.rxdata differ diff --git a/Data/Map140.rxdata b/Data/Map140.rxdata index 8b85a2a19..b81e37f17 100644 Binary files a/Data/Map140.rxdata and b/Data/Map140.rxdata differ diff --git a/Data/Map141.rxdata b/Data/Map141.rxdata index 7db71ff44..f4949c57c 100644 Binary files a/Data/Map141.rxdata and b/Data/Map141.rxdata differ diff --git a/Data/Map143.rxdata b/Data/Map143.rxdata index 09c57e215..bdce692f9 100644 Binary files a/Data/Map143.rxdata and b/Data/Map143.rxdata differ diff --git a/Data/Map146.rxdata b/Data/Map146.rxdata index 5e55a1a2f..c9d772ca4 100644 Binary files a/Data/Map146.rxdata and b/Data/Map146.rxdata differ diff --git a/Data/Map147.rxdata b/Data/Map147.rxdata index 4e0f707ff..1f7b5a815 100644 Binary files a/Data/Map147.rxdata and b/Data/Map147.rxdata differ diff --git a/Data/Map153.rxdata b/Data/Map153.rxdata index 9a76c3432..384a2425f 100644 Binary files a/Data/Map153.rxdata and b/Data/Map153.rxdata differ diff --git a/Data/Map154.rxdata b/Data/Map154.rxdata index eabf97f58..ae6e07955 100644 Binary files a/Data/Map154.rxdata and b/Data/Map154.rxdata differ diff --git a/Data/Map159.rxdata b/Data/Map159.rxdata index ce4ef1d2d..309798492 100644 Binary files a/Data/Map159.rxdata and b/Data/Map159.rxdata differ diff --git a/Data/Map167.rxdata b/Data/Map167.rxdata index 620dff508..27e20a06e 100644 Binary files a/Data/Map167.rxdata and b/Data/Map167.rxdata differ diff --git a/Data/Map168.rxdata b/Data/Map168.rxdata index e2b980b6f..cac5c5716 100644 Binary files a/Data/Map168.rxdata and b/Data/Map168.rxdata differ diff --git a/Data/Map169.rxdata b/Data/Map169.rxdata index 5b97d2238..6d6ae8bfa 100644 Binary files a/Data/Map169.rxdata and b/Data/Map169.rxdata differ diff --git a/Data/Map170.rxdata b/Data/Map170.rxdata index 6453e560d..d5ce37a6d 100644 Binary files a/Data/Map170.rxdata and b/Data/Map170.rxdata differ diff --git a/Data/Map171.rxdata b/Data/Map171.rxdata index 2b68acb23..1c325a151 100644 Binary files a/Data/Map171.rxdata and b/Data/Map171.rxdata differ diff --git a/Data/Map174.rxdata b/Data/Map174.rxdata index 02795b9a7..cedbf026c 100644 Binary files a/Data/Map174.rxdata and b/Data/Map174.rxdata differ diff --git a/Data/Map176.rxdata b/Data/Map176.rxdata index 58c14386e..cf2168f84 100644 Binary files a/Data/Map176.rxdata and b/Data/Map176.rxdata differ diff --git a/Data/Map179.rxdata b/Data/Map179.rxdata index 9f223970d..3bd0bc6cb 100644 Binary files a/Data/Map179.rxdata and b/Data/Map179.rxdata differ diff --git a/Data/Map180.rxdata b/Data/Map180.rxdata index 18f10ab63..ebb732ec3 100644 Binary files a/Data/Map180.rxdata and b/Data/Map180.rxdata differ diff --git a/Data/Map182.rxdata b/Data/Map182.rxdata index fcf943d1b..108d7bb91 100644 Binary files a/Data/Map182.rxdata and b/Data/Map182.rxdata differ diff --git a/Data/Map183.rxdata b/Data/Map183.rxdata index 957872e6c..dd9b73cd9 100644 Binary files a/Data/Map183.rxdata and b/Data/Map183.rxdata differ diff --git a/Data/Map184.rxdata b/Data/Map184.rxdata index ae1adee55..10ca4fe3a 100644 Binary files a/Data/Map184.rxdata and b/Data/Map184.rxdata differ diff --git a/Data/Map187.rxdata b/Data/Map187.rxdata index bf30e0f24..d76a94d6e 100644 Binary files a/Data/Map187.rxdata and b/Data/Map187.rxdata differ diff --git a/Data/Map192.rxdata b/Data/Map192.rxdata index 555baac82..8ad3d279b 100644 Binary files a/Data/Map192.rxdata and b/Data/Map192.rxdata differ diff --git a/Data/Map194.rxdata b/Data/Map194.rxdata index 04a9a0d65..4e9e1a8be 100644 Binary files a/Data/Map194.rxdata and b/Data/Map194.rxdata differ diff --git a/Data/Map195.rxdata b/Data/Map195.rxdata index 8b977f80e..102204f56 100644 Binary files a/Data/Map195.rxdata and b/Data/Map195.rxdata differ diff --git a/Data/Map197.rxdata b/Data/Map197.rxdata index 726768cf4..9fe7c3493 100644 Binary files a/Data/Map197.rxdata and b/Data/Map197.rxdata differ diff --git a/Data/Map200.rxdata b/Data/Map200.rxdata index 9058d4bc0..4efe0cffd 100644 Binary files a/Data/Map200.rxdata and b/Data/Map200.rxdata differ diff --git a/Data/Map204.rxdata b/Data/Map204.rxdata index 93b9398f9..6ad043292 100644 Binary files a/Data/Map204.rxdata and b/Data/Map204.rxdata differ diff --git a/Data/Map214.rxdata b/Data/Map214.rxdata index cf9cd1319..54758d669 100644 Binary files a/Data/Map214.rxdata and b/Data/Map214.rxdata differ diff --git a/Data/Map222.rxdata b/Data/Map222.rxdata index 25d0c6004..6466a91e8 100644 Binary files a/Data/Map222.rxdata and b/Data/Map222.rxdata differ diff --git a/Data/Map230.rxdata b/Data/Map230.rxdata index 8bc0fd5f1..284225c73 100644 Binary files a/Data/Map230.rxdata and b/Data/Map230.rxdata differ diff --git a/Data/Map237.rxdata b/Data/Map237.rxdata index 16cdfe3b3..8e5a22812 100644 Binary files a/Data/Map237.rxdata and b/Data/Map237.rxdata differ diff --git a/Data/Map239.rxdata b/Data/Map239.rxdata index c2543130d..e6c5a7359 100644 Binary files a/Data/Map239.rxdata and b/Data/Map239.rxdata differ diff --git a/Data/Map240.rxdata b/Data/Map240.rxdata index b38c45ddb..2f92cd44a 100644 Binary files a/Data/Map240.rxdata and b/Data/Map240.rxdata differ diff --git a/Data/Map241.rxdata b/Data/Map241.rxdata index 89212fc73..a5d4d7302 100644 Binary files a/Data/Map241.rxdata and b/Data/Map241.rxdata differ diff --git a/Data/Map247.rxdata b/Data/Map247.rxdata index 0f85abc86..34916a696 100644 Binary files a/Data/Map247.rxdata and b/Data/Map247.rxdata differ diff --git a/Data/Map248.rxdata b/Data/Map248.rxdata index 16c817ae9..5980a68a3 100644 Binary files a/Data/Map248.rxdata and b/Data/Map248.rxdata differ diff --git a/Data/Map249.rxdata b/Data/Map249.rxdata index 1b612373f..f2e0371d7 100644 Binary files a/Data/Map249.rxdata and b/Data/Map249.rxdata differ diff --git a/Data/Map250.rxdata b/Data/Map250.rxdata index d6a246ec4..094a217db 100644 Binary files a/Data/Map250.rxdata and b/Data/Map250.rxdata differ diff --git a/Data/Map256.rxdata b/Data/Map256.rxdata index 6d9643c90..6a134bc7a 100644 Binary files a/Data/Map256.rxdata and b/Data/Map256.rxdata differ diff --git a/Data/Map264.rxdata b/Data/Map264.rxdata index 552275b1c..999f0ff09 100644 Binary files a/Data/Map264.rxdata and b/Data/Map264.rxdata differ diff --git a/Data/Map266.rxdata b/Data/Map266.rxdata index 332f4325b..394f8026e 100644 Binary files a/Data/Map266.rxdata and b/Data/Map266.rxdata differ diff --git a/Data/Map269.rxdata b/Data/Map269.rxdata index fda446f55..fc17faff2 100644 Binary files a/Data/Map269.rxdata and b/Data/Map269.rxdata differ diff --git a/Data/Map270.rxdata b/Data/Map270.rxdata index 8b48f6cbb..db0390d7c 100644 Binary files a/Data/Map270.rxdata and b/Data/Map270.rxdata differ diff --git a/Data/Map274.rxdata b/Data/Map274.rxdata index ed6e3d906..2251c1e13 100644 Binary files a/Data/Map274.rxdata and b/Data/Map274.rxdata differ diff --git a/Data/Map288.rxdata b/Data/Map288.rxdata index 2bb99b124..9e9604795 100644 Binary files a/Data/Map288.rxdata and b/Data/Map288.rxdata differ diff --git a/Data/Map297.rxdata b/Data/Map297.rxdata index 64856e5a1..b1a1eb6c4 100644 Binary files a/Data/Map297.rxdata and b/Data/Map297.rxdata differ diff --git a/Data/Map300.rxdata b/Data/Map300.rxdata index ec8754db8..675b669b7 100644 Binary files a/Data/Map300.rxdata and b/Data/Map300.rxdata differ diff --git a/Data/Map308.rxdata b/Data/Map308.rxdata index e8f4e0645..1385e518e 100644 Binary files a/Data/Map308.rxdata and b/Data/Map308.rxdata differ diff --git a/Data/Map309.rxdata b/Data/Map309.rxdata index c2c1db039..496a7c7bb 100644 Binary files a/Data/Map309.rxdata and b/Data/Map309.rxdata differ diff --git a/Data/Map314.rxdata b/Data/Map314.rxdata index 8b36f8ed2..dd97fa595 100644 Binary files a/Data/Map314.rxdata and b/Data/Map314.rxdata differ diff --git a/Data/Map321.rxdata b/Data/Map321.rxdata index f40ce8b36..3b1ae0881 100644 Binary files a/Data/Map321.rxdata and b/Data/Map321.rxdata differ diff --git a/Data/Map329.rxdata b/Data/Map329.rxdata index 075bd6e6d..ff38c05f9 100644 Binary files a/Data/Map329.rxdata and b/Data/Map329.rxdata differ diff --git a/Data/Map330.rxdata b/Data/Map330.rxdata index 55cffd96d..ba4d4691a 100644 Binary files a/Data/Map330.rxdata and b/Data/Map330.rxdata differ diff --git a/Data/Map334.rxdata b/Data/Map334.rxdata index cdd5f07f2..efbb6c5c5 100644 Binary files a/Data/Map334.rxdata and b/Data/Map334.rxdata differ diff --git a/Data/Map336.rxdata b/Data/Map336.rxdata index c9e45dfa0..4972ef00e 100644 Binary files a/Data/Map336.rxdata and b/Data/Map336.rxdata differ diff --git a/Data/Map338.rxdata b/Data/Map338.rxdata index 8ca627265..5cf1cb0d3 100644 Binary files a/Data/Map338.rxdata and b/Data/Map338.rxdata differ diff --git a/Data/Map342.rxdata b/Data/Map342.rxdata index 5c17ad19a..1ccd627e6 100644 Binary files a/Data/Map342.rxdata and b/Data/Map342.rxdata differ diff --git a/Data/Map351.rxdata b/Data/Map351.rxdata index 7a528a49d..87d582d23 100644 Binary files a/Data/Map351.rxdata and b/Data/Map351.rxdata differ diff --git a/Data/Map354.rxdata b/Data/Map354.rxdata index 7270e5a3d..25084c5af 100644 Binary files a/Data/Map354.rxdata and b/Data/Map354.rxdata differ diff --git a/Data/Map357.rxdata b/Data/Map357.rxdata index 31ef8a430..787d0f290 100644 Binary files a/Data/Map357.rxdata and b/Data/Map357.rxdata differ diff --git a/Data/Map360.rxdata b/Data/Map360.rxdata index 7b72e164f..a3baeac5b 100644 Binary files a/Data/Map360.rxdata and b/Data/Map360.rxdata differ diff --git a/Data/Map364.rxdata b/Data/Map364.rxdata index abe9ccabc..3c1f541d0 100644 Binary files a/Data/Map364.rxdata and b/Data/Map364.rxdata differ diff --git a/Data/Map366.rxdata b/Data/Map366.rxdata index f7495fe34..b5b17a815 100644 Binary files a/Data/Map366.rxdata and b/Data/Map366.rxdata differ diff --git a/Data/Map367.rxdata b/Data/Map367.rxdata index d573a4c95..da73fa609 100644 Binary files a/Data/Map367.rxdata and b/Data/Map367.rxdata differ diff --git a/Data/Map368.rxdata b/Data/Map368.rxdata index 564d3cccf..eb445cc14 100644 Binary files a/Data/Map368.rxdata and b/Data/Map368.rxdata differ diff --git a/Data/Map379.rxdata b/Data/Map379.rxdata index a7e16cd5f..6e270111a 100644 Binary files a/Data/Map379.rxdata and b/Data/Map379.rxdata differ diff --git a/Data/Map380.rxdata b/Data/Map380.rxdata index a2f5e73df..af1a63b28 100644 Binary files a/Data/Map380.rxdata and b/Data/Map380.rxdata differ diff --git a/Data/Map392.rxdata b/Data/Map392.rxdata index 589f10740..8bb715443 100644 Binary files a/Data/Map392.rxdata and b/Data/Map392.rxdata differ diff --git a/Data/Map394.rxdata b/Data/Map394.rxdata index 2b70f6008..8a6b38251 100644 Binary files a/Data/Map394.rxdata and b/Data/Map394.rxdata differ diff --git a/Data/Map395.rxdata b/Data/Map395.rxdata index 961c9f449..923fb44f1 100644 Binary files a/Data/Map395.rxdata and b/Data/Map395.rxdata differ diff --git a/Data/Map406.rxdata b/Data/Map406.rxdata index c9576d669..1b8270504 100644 Binary files a/Data/Map406.rxdata and b/Data/Map406.rxdata differ diff --git a/Data/Map408.rxdata b/Data/Map408.rxdata index 5279792b6..7903cbcd9 100644 Binary files a/Data/Map408.rxdata and b/Data/Map408.rxdata differ diff --git a/Data/Map409.rxdata b/Data/Map409.rxdata index a71a421ec..bdf8dbceb 100644 Binary files a/Data/Map409.rxdata and b/Data/Map409.rxdata differ diff --git a/Data/Map413.rxdata b/Data/Map413.rxdata index 9cc71e98b..85d4bc4fe 100644 Binary files a/Data/Map413.rxdata and b/Data/Map413.rxdata differ diff --git a/Data/Map416.rxdata b/Data/Map416.rxdata index 1f2276b33..cc847f2fb 100644 Binary files a/Data/Map416.rxdata and b/Data/Map416.rxdata differ diff --git a/Data/Map419.rxdata b/Data/Map419.rxdata index a65c695e2..6d99efe32 100644 Binary files a/Data/Map419.rxdata and b/Data/Map419.rxdata differ diff --git a/Data/Map432.rxdata b/Data/Map432.rxdata index e11950826..82b7bda68 100644 Binary files a/Data/Map432.rxdata and b/Data/Map432.rxdata differ diff --git a/Data/Map434.rxdata b/Data/Map434.rxdata index 533bd7b56..f0f7345e5 100644 Binary files a/Data/Map434.rxdata and b/Data/Map434.rxdata differ diff --git a/Data/Map436.rxdata b/Data/Map436.rxdata index e089478f4..ecb2032f0 100644 Binary files a/Data/Map436.rxdata and b/Data/Map436.rxdata differ diff --git a/Data/Map437.rxdata b/Data/Map437.rxdata index 636b2c102..445207d81 100644 Binary files a/Data/Map437.rxdata and b/Data/Map437.rxdata differ diff --git a/Data/Map439.rxdata b/Data/Map439.rxdata index 770be993f..1d2376232 100644 Binary files a/Data/Map439.rxdata and b/Data/Map439.rxdata differ diff --git a/Data/Map451.rxdata b/Data/Map451.rxdata index 87e2b71e9..485204724 100644 Binary files a/Data/Map451.rxdata and b/Data/Map451.rxdata differ diff --git a/Data/Map453.rxdata b/Data/Map453.rxdata index 868e88b88..3590d19e0 100644 Binary files a/Data/Map453.rxdata and b/Data/Map453.rxdata differ diff --git a/Data/Map454.rxdata b/Data/Map454.rxdata index 538d3df0d..203bebb6b 100644 Binary files a/Data/Map454.rxdata and b/Data/Map454.rxdata differ diff --git a/Data/Map458.rxdata b/Data/Map458.rxdata index 893c6c7c8..d0f184cc2 100644 Binary files a/Data/Map458.rxdata and b/Data/Map458.rxdata differ diff --git a/Data/Map460.rxdata b/Data/Map460.rxdata index 37ff531c5..bff22a09c 100644 Binary files a/Data/Map460.rxdata and b/Data/Map460.rxdata differ diff --git a/Data/Map463.rxdata b/Data/Map463.rxdata index d061fd0c9..f0472a866 100644 Binary files a/Data/Map463.rxdata and b/Data/Map463.rxdata differ diff --git a/Data/Map469.rxdata b/Data/Map469.rxdata index 976b5c242..398266359 100644 Binary files a/Data/Map469.rxdata and b/Data/Map469.rxdata differ diff --git a/Data/Map472.rxdata b/Data/Map472.rxdata index 866daf20c..24784d26a 100644 Binary files a/Data/Map472.rxdata and b/Data/Map472.rxdata differ diff --git a/Data/Map475.rxdata b/Data/Map475.rxdata index 77954caa6..999c2e995 100644 Binary files a/Data/Map475.rxdata and b/Data/Map475.rxdata differ diff --git a/Data/Map476.rxdata b/Data/Map476.rxdata index 8bb1998f1..0ec2b23d6 100644 Binary files a/Data/Map476.rxdata and b/Data/Map476.rxdata differ diff --git a/Data/Map481.rxdata b/Data/Map481.rxdata index 948de1784..4a1548ef8 100644 Binary files a/Data/Map481.rxdata and b/Data/Map481.rxdata differ diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata index 93f6e4555..f101effcb 100644 Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ diff --git a/Data/Map491.rxdata b/Data/Map491.rxdata index 0edd9b455..dd2b1249f 100644 Binary files a/Data/Map491.rxdata and b/Data/Map491.rxdata differ diff --git a/Data/Map494.rxdata b/Data/Map494.rxdata index f0e0a1002..856357114 100644 Binary files a/Data/Map494.rxdata and b/Data/Map494.rxdata differ diff --git a/Data/Map498.rxdata b/Data/Map498.rxdata index 6e1706d25..b4ef30a60 100644 Binary files a/Data/Map498.rxdata and b/Data/Map498.rxdata differ diff --git a/Data/Map501.rxdata b/Data/Map501.rxdata index 083bade05..9a16f9955 100644 Binary files a/Data/Map501.rxdata and b/Data/Map501.rxdata differ diff --git a/Data/Map502.rxdata b/Data/Map502.rxdata index 384053fc6..e8dd66149 100644 Binary files a/Data/Map502.rxdata and b/Data/Map502.rxdata differ diff --git a/Data/Map503.rxdata b/Data/Map503.rxdata index cc14c235a..abb56e986 100644 Binary files a/Data/Map503.rxdata and b/Data/Map503.rxdata differ diff --git a/Data/Map513.rxdata b/Data/Map513.rxdata index 42c6c9250..faababfaa 100644 Binary files a/Data/Map513.rxdata and b/Data/Map513.rxdata differ diff --git a/Data/Map517.rxdata b/Data/Map517.rxdata index bb9c1a168..d7172816f 100644 Binary files a/Data/Map517.rxdata and b/Data/Map517.rxdata differ diff --git a/Data/Map520.rxdata b/Data/Map520.rxdata index efeb82d7a..0e5ad6340 100644 Binary files a/Data/Map520.rxdata and b/Data/Map520.rxdata differ diff --git a/Data/Map532.rxdata b/Data/Map532.rxdata index 4bb710b92..f06567f4f 100644 Binary files a/Data/Map532.rxdata and b/Data/Map532.rxdata differ diff --git a/Data/Map533.rxdata b/Data/Map533.rxdata index 764686d1b..8240c5b93 100644 Binary files a/Data/Map533.rxdata and b/Data/Map533.rxdata differ diff --git a/Data/Map545.rxdata b/Data/Map545.rxdata index 637e0e8ed..7a3b24348 100644 Binary files a/Data/Map545.rxdata and b/Data/Map545.rxdata differ diff --git a/Data/Map567.rxdata b/Data/Map567.rxdata index ae7080bd3..7f4637b05 100644 Binary files a/Data/Map567.rxdata and b/Data/Map567.rxdata differ diff --git a/Data/Map568.rxdata b/Data/Map568.rxdata index 42a2fc085..8eadcdd8f 100644 Binary files a/Data/Map568.rxdata and b/Data/Map568.rxdata differ diff --git a/Data/Map579.rxdata b/Data/Map579.rxdata index d3ef6fa46..57c19f84c 100644 Binary files a/Data/Map579.rxdata and b/Data/Map579.rxdata differ diff --git a/Data/Map600.rxdata b/Data/Map600.rxdata index c7facd118..3f4074930 100644 Binary files a/Data/Map600.rxdata and b/Data/Map600.rxdata differ diff --git a/Data/Map612.rxdata b/Data/Map612.rxdata index 0b44fbd30..06d61ce13 100644 Binary files a/Data/Map612.rxdata and b/Data/Map612.rxdata differ diff --git a/Data/Map617.rxdata b/Data/Map617.rxdata index 598ef30a6..5031de8bb 100644 Binary files a/Data/Map617.rxdata and b/Data/Map617.rxdata differ diff --git a/Data/Map618.rxdata b/Data/Map618.rxdata index 05cd4cbd1..95e6f4ede 100644 Binary files a/Data/Map618.rxdata and b/Data/Map618.rxdata differ diff --git a/Data/Map619.rxdata b/Data/Map619.rxdata index 12973550c..9d5187958 100644 Binary files a/Data/Map619.rxdata and b/Data/Map619.rxdata differ diff --git a/Data/Map624.rxdata b/Data/Map624.rxdata index 74e50c9ee..a5c8665e8 100644 Binary files a/Data/Map624.rxdata and b/Data/Map624.rxdata differ diff --git a/Data/Map625.rxdata b/Data/Map625.rxdata index 67c6408b8..f9c008911 100644 Binary files a/Data/Map625.rxdata and b/Data/Map625.rxdata differ diff --git a/Data/Map626.rxdata b/Data/Map626.rxdata index 61a1e67f7..54d4142dc 100644 Binary files a/Data/Map626.rxdata and b/Data/Map626.rxdata differ diff --git a/Data/Map627.rxdata b/Data/Map627.rxdata index 46d8f986b..00a7a9f5c 100644 Binary files a/Data/Map627.rxdata and b/Data/Map627.rxdata differ diff --git a/Data/Map628.rxdata b/Data/Map628.rxdata index 9e5c7bcf3..a6a2d7288 100644 Binary files a/Data/Map628.rxdata and b/Data/Map628.rxdata differ diff --git a/Data/Map629.rxdata b/Data/Map629.rxdata index 86eb0774c..b1036a78e 100644 Binary files a/Data/Map629.rxdata and b/Data/Map629.rxdata differ diff --git a/Data/Map630.rxdata b/Data/Map630.rxdata index d9357921e..3ac8b4c60 100644 Binary files a/Data/Map630.rxdata and b/Data/Map630.rxdata differ diff --git a/Data/Map638.rxdata b/Data/Map638.rxdata index 0a7712fff..647551419 100644 Binary files a/Data/Map638.rxdata and b/Data/Map638.rxdata differ diff --git a/Data/Map670.rxdata b/Data/Map670.rxdata index e351f763b..795f86dc7 100644 Binary files a/Data/Map670.rxdata and b/Data/Map670.rxdata differ diff --git a/Data/Map731.rxdata b/Data/Map731.rxdata index a6c1c9720..cffeb1481 100644 Binary files a/Data/Map731.rxdata and b/Data/Map731.rxdata differ diff --git a/Data/Map744.rxdata b/Data/Map744.rxdata index 99db27a15..85e01c7f2 100644 Binary files a/Data/Map744.rxdata and b/Data/Map744.rxdata differ diff --git a/Data/Map765.rxdata b/Data/Map765.rxdata index f673e30de..40f5c73c6 100644 Binary files a/Data/Map765.rxdata and b/Data/Map765.rxdata differ diff --git a/Data/Map766.rxdata b/Data/Map766.rxdata index 020409f18..541c402f1 100644 Binary files a/Data/Map766.rxdata and b/Data/Map766.rxdata differ diff --git a/Data/Map788.rxdata b/Data/Map788.rxdata index cbc7dec75..1768b303e 100644 Binary files a/Data/Map788.rxdata and b/Data/Map788.rxdata differ diff --git a/Data/Map808.rxdata b/Data/Map808.rxdata index 1bd1f17c0..b07ba0aca 100644 Binary files a/Data/Map808.rxdata and b/Data/Map808.rxdata differ diff --git a/Data/Map825.rxdata b/Data/Map825.rxdata index ee0fabb7f..e435445f0 100644 Binary files a/Data/Map825.rxdata and b/Data/Map825.rxdata differ diff --git a/Data/Map826.rxdata b/Data/Map826.rxdata index a9bf28fbe..67d3d8594 100644 Binary files a/Data/Map826.rxdata and b/Data/Map826.rxdata differ diff --git a/Data/Map827.rxdata b/Data/Map827.rxdata index 16e9fa5b4..c40c9bb62 100644 Binary files a/Data/Map827.rxdata and b/Data/Map827.rxdata differ diff --git a/Data/Map828.rxdata b/Data/Map828.rxdata index 044770a31..3eb49a1e0 100644 Binary files a/Data/Map828.rxdata and b/Data/Map828.rxdata differ diff --git a/Data/Map832.rxdata b/Data/Map832.rxdata index 0498efd84..c6e72a7ab 100644 Binary files a/Data/Map832.rxdata and b/Data/Map832.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 7194e9ee1..d1c471a4d 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/052_AddOns/QuestIcons.rb b/Data/Scripts/052_AddOns/QuestIcons.rb index ceb2b87b5..95f2d0802 100644 --- a/Data/Scripts/052_AddOns/QuestIcons.rb +++ b/Data/Scripts/052_AddOns/QuestIcons.rb @@ -1,23 +1,118 @@ -class Sprite_Character +def setDialogIconOff(eventId=nil) + eventId = @event_id if !eventId + event = $game_map.events[eventId] + event.setDialogIconManualOffValue(true) +end + +def setDialogIconOn(eventId=nil) + eventId = @event_id if !eventId + event = $game_map.events[eventId] + event.setDialogIconManualOffValue(false) +end +class Game_Event < Game_Character + #set from analyzing the event's content at load + attr_accessor :show_quest_icon + attr_accessor :show_dialog_icon + + #set manually from inside the event when triggered + attr_accessor :quest_icon_manual_off + attr_accessor :dialog_icon_manual_off + QUEST_NPC_TRIGGER = "questNPC" + MAPS_WITH_NO_ICONS = [] #Maps in which the game shouldn't try to look for quest icons(e.g. maps with a lot of events - mostly for possible performance issues) + DIALOG_ICON_COMMENT_TRIGGER=["dialogIcon"] - QUEST_ICON_FOLDER = "Graphics/Pictures/Quests/" + alias eventQuestIcon_init initialize + def initialize(map_id, event, map=nil) + eventQuestIcon_init(map_id, event, map) + addQuestMarkersToSprite unless MAPS_WITH_NO_ICONS.include?($game_map.map_id) + end + + def setDialogIconManualOffValue(value) + @dialog_icon_manual_off=value + @show_dialog_icon = !@dialog_icon_manual_off + end + def setQuestIconManualOffValue(value) + @quest_icon_manual_off=value + @show_quest_icon = !@quest_icon_manual_off + end + + def addQuestMarkersToSprite() + @show_quest_icon = detectQuestSwitch(self) && !@quest_icon_manual_off + @show_dialog_icon = detectDialogueIcon(self) && !@dialog_icon_manual_off + end + + def detectDialogueIcon(event) + return nil if !validateEventIsCompatibleWithIcons(event) + page = pbGetActiveEventPage(event) + first_command = page.list[0] + return nil if !(first_command.code == 108 || first_command.code == 408) + comments = first_command.parameters + return comments.any? { |str| DIALOG_ICON_COMMENT_TRIGGER.include?(str) } + end + + def detectQuestSwitch(event) + return nil if !validateEventIsCompatibleWithIcons(event) + name = event.name.clone + match = name.match(/#{Regexp.escape(QUEST_NPC_TRIGGER)}\(([^)]+)\)/) # Capture anything inside parentheses + return nil unless match + quest_id = match[1] + quest_id = quest_id.gsub(/^['"]|['"]$/, '') # Remove quotes if they exist + echoln "MATCH" + echoln quest_id + return nil if isQuestAlreadyAccepted?(quest_id) + return quest_id + end + + def validateEventIsCompatibleWithIcons(event) + return false if event.is_a?(Game_Player) + return false if event.erased + return false unless pbGetActiveEventPage(event) + return true + end + +end + + + +class Sprite_Character + + DIALOGUE_ICON_NAME = "Graphics/Pictures/Quests/dialogIcon" QUEST_ICON_NAME = "Graphics/Pictures/Quests/questIcon" - attr_accessor :questIcon - alias questIcon_init initialize def initialize(viewport, character = nil, is_follower=nil) questIcon_init(viewport,character) - quest_id = detectQuestSwitch(character) - addQuestMarkerToSprite if quest_id + if character.is_a?(Game_Event) && character.show_dialog_icon + addQuestMarkerToSprite(:DIALOG_ICON) + end + if character.is_a?(Game_Event) && character.show_quest_icon + addQuestMarkerToSprite(:QUEST_ICON) + end + #addQuestMarkersToSprite(character) unless MAPS_WITH_NO_ICONS.include?($game_map.map_id) end + + + # def addQuestMarkersToSprite(character) + # quest_id = detectQuestSwitch(character) + # if quest_id + # addQuestMarkerToSprite(:QUEST_ICON) + # else + # addQuestMarkerToSprite(:DIALOG_ICON) if detectDialogueIcon(character) + # end + # end + + alias questIcon_update update def update questIcon_update + updateGameEvent if @character.is_a?(Game_Event) + end + + def updateGameEvent + removeQuestIcon if !@character.show_dialog_icon && !@character.show_quest_icon positionQuestIndicator if @questIcon - #removeQuestIcon if @questIcon && isQuestAlreadyAccepted?(@quest_switch) end alias questIcon_dispose dispose @@ -25,31 +120,37 @@ class Sprite_Character questIcon_dispose removeQuestIcon end + + + + # Event name must contain questNPC(x) for a quest icon to be displayed # Where x is the quest ID # if the quest has not already been accepted, the quest marker will be shown - def detectQuestSwitch(event) - return nil if event.is_a?(Game_Player) - return nil if event.erased - return nil unless pbGetActiveEventPage(event) - name = event.name.clone - match = name.match(/#{Regexp.escape(QUEST_NPC_TRIGGER)}\(([^)]+)\)/) # Capture anything inside parentheses - return nil unless match - quest_id = match[1] - quest_id = quest_id.gsub(/^['"]|['"]$/, '') # Remove quotes if they exist - return nil if isQuestAlreadyAccepted?(quest_id) - return quest_id - end - def addQuestMarkerToSprite() + + + #type: :QUEST_ICON, :DIALOG_ICON + def addQuestMarkerToSprite(iconType) removeQuestIcon if @questIcon @questIcon = Sprite.new(@viewport) - @questIcon.bmp(QUEST_ICON_NAME) - positionQuestIndicator + case iconType + when :QUEST_ICON + iconPath = QUEST_ICON_NAME + when :DIALOG_ICON + iconPath = DIALOGUE_ICON_NAME + end + return if !iconPath + @questIcon.bmp(iconPath) + echoln @questIcon.bitmap + positionQuestIndicator if @questIcon end def positionQuestIndicator() + return if !@questIcon + return if !@questIcon.bitmap + y_offset =-70 @questIcon.ox = @questIcon.bitmap.width / 2.0 @@ -63,7 +164,6 @@ class Sprite_Character end def removeQuestIcon() - echoln "REMOVAL for #{self}" @questIcon.dispose if @questIcon @questIcon = nil end diff --git a/Data/System.rxdata b/Data/System.rxdata index 58068d404..661218484 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Graphics/Pictures/Quests/questIcon.png b/Graphics/Pictures/Quests/questIcon.png index 5145039d9..d8b208e28 100644 Binary files a/Graphics/Pictures/Quests/questIcon.png and b/Graphics/Pictures/Quests/questIcon.png differ