Merge branch 'release' into feature/deoffset-ability

# Conflicts:
#	scripts/globals/abilities/double-up.lua
#	src/map/ability.h

.gitignore

@@ -142,6 +142,7 @@ UpgradeLog*.XML
 /depcomp
 /missing
 /install-sh
+/tools/config.yaml
 
 src/common/config.h
 src/common/config.h.in

conf/default/map.conf

@@ -74,7 +74,6 @@ ah_list_limit: 7
 exp_rate: 1.0
 exp_loss_rate: 1.0
 exp_party_gap_penalties: 1
-fov_allow_alliance: 1
 
 #Determines Vana'diel time epoch (886/1/1 Firesday)
 # current timestamp - vanadiel_time_epoch = vana'diel time

conf/default/version.conf

@@ -1,7 +1,7 @@
 #Topaz Version Info
 
 #Expected Client version (wrong version cannot log in)
-CLIENT_VER: 30200702_1
+CLIENT_VER: 30200731_2
 
 #WE STRONGLY ADVISE AGAINST LOCKING THE SERVER TO OLDER VERSIONS. IT IS A UNIVERSALLY BAD IDEA.
 
@@ -11,4 +11,4 @@ CLIENT_VER: 30200702_1
 VER_LOCK: 2
 
 #Current Server Version.
-#TOPAZ_VER: R202007-03
+#TOPAZ_VER: R202008-01

scripts/commands/addallmaps.lua

@@ -43,5 +43,5 @@ function onTrigger(player, target)
     for _, v in ipairs( keyIds ) do
         targ:addKeyItem( v )
     end
-    player:PrintToPlayer(string.format("%s now has all maps.",targ:getName()))
+    player:PrintToPlayer(string.format("%s now has all maps.", targ:getName()))
 end

scripts/commands/addallspells.lua

@@ -17,38 +17,38 @@ end
 function onTrigger(player, target)
     local ValidSpells =
      {
-        1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,
-        38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,
-        72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,
-        105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,
-        131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,
-        157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,
-        183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,
-        209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,
-        235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,
-        261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,
-        287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,
-        313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,
-        339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,
-        365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,
-        391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,
-        417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,
-        443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,
-        469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,
-        495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,515,517,519,521,522,524,527,
-        529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,547,548,549,551,554,555,557,560,561,
-        563,564,565,567,569,570,572,573,574,575,576,577,578,579,581,582,584,585,587,588,589,591,592,593,594,595,
-        596,597,598,599,603,604,605,606,608,610,611,612,613,614,615,616,617,618,620,621,622,623,626,628,629,631,
-        632,633,634,636,637,638,640,641,642,643,644,645,646,647,648,649,650,651,652,653,654,655,656,657,658,659,
-        660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685,
-        686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,
-        712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,736,737,738,739,740,741,742,743,744,
-        745,746,747,748,749,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,
-        789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,
-        815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,
-        841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,
-        867,868,869,870,871,872,873,874,875,876,877,878,879,880,881,882,883,884,885,886,887,888,889,890,891,892,
-        893,894,895
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+        38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+        72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+        105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+        131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+        157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182,
+        183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+        209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
+        235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260,
+        261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
+        287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312,
+        313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
+        339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
+        365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
+        391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
+        417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442,
+        443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468,
+        469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494,
+        495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 515, 517, 519, 521, 522, 524, 527,
+        529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 547, 548, 549, 551, 554, 555, 557, 560, 561,
+        563, 564, 565, 567, 569, 570, 572, 573, 574, 575, 576, 577, 578, 579, 581, 582, 584, 585, 587, 588, 589, 591, 592, 593, 594, 595,
+        596, 597, 598, 599, 603, 604, 605, 606, 608, 610, 611, 612, 613, 614, 615, 616, 617, 618, 620, 621, 622, 623, 626, 628, 629, 631,
+        632, 633, 634, 636, 637, 638, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659,
+        660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685,
+        686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+        712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 736, 737, 738, 739, 740, 741, 742, 743, 744,
+        745, 746, 747, 748, 749, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788,
+        789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814,
+        815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840,
+        841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866,
+        867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892,
+        893, 894, 895
 
         -- Trust spells are in their own command.
     }

scripts/commands/addalltrusts.lua

@@ -17,11 +17,11 @@ end
 function onTrigger(player, target)
     local ValidSpells =
     {
-        896,897,898,899,900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,915,916,917,918,919,920,
-        921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,
-        946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,
-        971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,1004,1005,1006,1007,1008,1009,
-        1010,1011,1012,1013,1014,1015,1016
+        896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 920,
+        921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945,
+        946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970,
+        971, 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 1004, 1005, 1006, 1007, 1008, 1009,
+        1010, 1011, 1012, 1013, 1014, 1015, 1016
     }
 
     -- validate target

scripts/commands/addcurrency.lua

@@ -14,7 +14,7 @@ function error(player, msg)
     player:PrintToPlayer("!addcurrency <currency type> <amount> {player}")
 end
 
-function onTrigger(player,currency,amount,target)
+function onTrigger(player, currency, amount, target)
     -- validate target
     local targ
     if (target == nil) then
@@ -41,7 +41,7 @@ function onTrigger(player,currency,amount,target)
     end
 
     -- add currency
-    targ:addCurrency(currency,amount)
+    targ:addCurrency(currency, amount)
     local newAmount = targ:getCurrency(currency)
-    player:PrintToPlayer(string.format("%s was given %i %s, for a total of %i.",targ:getName(),amount,currency,newAmount))
+    player:PrintToPlayer(string.format("%s was given %i %s, for a total of %i.", targ:getName(), amount, currency, newAmount))
 end

scripts/commands/addspell.lua

@@ -37,5 +37,5 @@ function onTrigger(player, spellId, target)
     local save = true
     local silent = false
     targ:addSpell(spellId, silent, save)
-    player:PrintToPlayer(string.format("Added spell %i to %s.",spellId,targ:getName()))
+    player:PrintToPlayer(string.format("Added spell %i to %s.", spellId, targ:getName()))
 end

scripts/commands/animatenpc.lua

@@ -32,11 +32,11 @@ function onTrigger(player, arg1, arg2)
 
     -- validate target
     if (targ == nil) then
-        error(player,"You must either enter a valid npcID or target an NPC.")
+        error(player, "You must either enter a valid npcID or target an NPC.")
         return
     end
     if (not targ:isNPC()) then
-        error(player,"Targeted entity is not an NPC.")
+        error(player, "Targeted entity is not an NPC.")
         return
     end
 
@@ -45,7 +45,7 @@ function onTrigger(player, arg1, arg2)
         animationId = tonumber(animationId) or tpz.anim[string.upper(animationId)]
     end
     if (animationId == nil) then
-        error(player,"Invalid animationID.")
+        error(player, "Invalid animationID.")
         return
     end
 

scripts/commands/animatesubnpc.lua

@@ -32,11 +32,11 @@ function onTrigger(player, arg1, arg2)
 
     -- validate target
     if (targ == nil) then
-        error(player,"You must either enter a valid npcID or target an NPC.")
+        error(player, "You must either enter a valid npcID or target an NPC.")
         return
     end
     if (not targ:isNPC()) then
-        error(player,"Targeted entity is not an NPC.")
+        error(player, "Targeted entity is not an NPC.")
         return
     end
 
@@ -45,7 +45,7 @@ function onTrigger(player, arg1, arg2)
         animationId = tonumber(animationId) or tpz.anim[string.upper(animationId)]
     end
     if (animationId == nil) then
-        error(player,"Invalid animationID.")
+        error(player, "Invalid animationID.")
         return
     end