Skip to content
This repository was archived by the owner on Dec 4, 2020. It is now read-only.

Commit a1399fd

Browse files
zach2goodzach2good
committed
Merge branch 'release' into feature/thick-thieves
2 parents ff9357a + 77063b0 commit a1399fd

File tree

60 files changed

+833
-538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+833
-538
lines changed

‎scripts/globals/chocobo_digging.lua‎

Lines changed: 91 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -121,30 +121,30 @@ local digInfo =
121121
},
122122
[tpz.zone.WAJAOM_WOODLANDS] = -- 51
123123
{
124-
{ 770, 50, digReq.NONE },
125-
{ 2150, 60, digReq.NONE },
126-
{ 622, 197, digReq.NONE },
127-
{ 2155, 23, digReq.NONE },
128-
{ 739, 5, digReq.NONE },
129-
{17296, 133, digReq.NONE },
130-
{ 703, 69, digReq.NONE },
131-
{ 2213, 135, digReq.NONE },
132-
{ 838, 21, digReq.NONE },
124+
{ 646, 3, digReq.NONE },
125+
{ 845, 75, digReq.NONE },
126+
{ 770, 31, digReq.NONE },
127+
{ 702, 52, digReq.NONE },
128+
{ 833, 190, digReq.NONE },
129+
{17296, 147, digReq.NONE },
130+
{ 2164, 17, digReq.NONE },
131+
{ 2213, 152, digReq.NONE },
132+
{ 838, 4, digReq.NONE },
133133
{ 4096, 100, digReq.NONE }, -- all crystals
134134
{ 1255, 10, digReq.NONE }, -- all ores
135-
{ 688, 144, digReq.BURROW },
136-
{ 702, 14, digReq.BURROW },
137-
{ 690, 23, digReq.BURROW },
138-
{ 1446, 3, digReq.BURROW },
139-
{ 700, 14, digReq.BURROW },
140-
{ 699, 37, digReq.BURROW },
141-
{ 701, 28, digReq.BURROW },
142-
{ 696, 23, digReq.BURROW },
143-
{ 678, 9, digReq.BORE },
144-
{ 645, 3, digReq.BORE },
145-
{ 768, 193, digReq.BORE },
135+
{ 688, 137, digReq.BURROW },
136+
{ 690, 10, digReq.BURROW },
137+
{ 1446, 1, digReq.BURROW },
138+
{ 700, 4, digReq.BURROW },
139+
{ 699, 31, digReq.BURROW },
140+
{ 701, 4, digReq.BURROW },
141+
{ 696, 35, digReq.BURROW },
142+
{ 678, 1, digReq.BORE },
143+
{ 645, 1, digReq.BORE },
144+
{ 768, 98, digReq.BORE },
146145
{ 737, 22, digReq.BORE },
147146
{ 2475, 3, digReq.BORE },
147+
{ 739, 1, digReq.BORE },
148148
{ 738, 3, digReq.BORE },
149149
{ 4570, 10, digReq.MODIFIER},
150150
{ 4487, 11, digReq.MODIFIER},
@@ -187,13 +187,13 @@ local digInfo =
187187
},
188188
[tpz.zone.WEST_RONFAURE] = -- 100
189189
{
190-
{ 4504, 167, digReq.NONE },
191-
{ 688, 15, digReq.NONE },
192-
{17396, 20, digReq.NONE },
193-
{ 698, 5, digReq.NONE },
194-
{ 840, 117, digReq.NONE },
195-
{ 691, 83, digReq.NONE },
196-
{ 833, 83, digReq.NONE },
190+
{ 4504, 120, digReq.NONE },
191+
{ 688, 111, digReq.NONE },
192+
{17396, 148, digReq.NONE },
193+
{ 698, 28, digReq.NONE },
194+
{ 840, 74, digReq.NONE },
195+
{ 691, 46, digReq.NONE },
196+
{ 833, 56, digReq.NONE },
197197
{ 639, 10, digReq.NONE },
198198
{ 694, 63, digReq.NONE },
199199
{ 918, 12, digReq.NONE },
@@ -262,31 +262,30 @@ local digInfo =
262262
},
263263
[tpz.zone.VALKURM_DUNES] = -- 103
264264
{
265-
{ 880, 224, digReq.NONE },
266-
{ 887, 39, digReq.NONE },
267-
{ 645, 14, digReq.NONE },
268-
{ 893, 105, digReq.NONE },
265+
{ 770, 1, digReq.NONE },
266+
{ 880, 166, digReq.NONE },
267+
{ 864, 96, digReq.NONE },
268+
{ 893, 26, digReq.NONE },
269269
{ 737, 17, digReq.NONE },
270-
{ 643, 64, digReq.NONE },
271-
{17296, 122, digReq.NONE },
272-
{ 942, 6, digReq.NONE },
273-
{ 642, 58, digReq.NONE },
274-
{ 864, 22, digReq.NONE },
275-
{ 843, 4, digReq.NONE },
270+
{ 869, 110, digReq.NONE },
271+
{17395, 111, digReq.NONE },
272+
{ 888, 215, digReq.NONE },
273+
{ 4484, 32, digReq.NONE },
274+
{17397, 21, digReq.NONE },
275+
{ 885, 10, digReq.NONE },
276276
{ 4096, 100, digReq.NONE }, -- all crystals
277277
{ 1255, 10, digReq.NONE }, -- all ores
278-
{ 845, 122, digReq.BURROW },
279-
{ 844, 71, digReq.BURROW },
280-
{ 1845, 33, digReq.BURROW },
281-
{ 838, 11, digReq.BURROW },
278+
{ 845, 125, digReq.BURROW },
279+
{ 843, 10, digReq.BURROW },
280+
{ 844, 40, digReq.BURROW },
281+
{ 1845, 24, digReq.BURROW },
282+
{ 838, 4, digReq.BURROW },
282283
{ 902, 6, digReq.BORE },
283284
{ 886, 3, digReq.BORE },
284-
{ 867, 3, digReq.BORE },
285-
{ 1587, 19, digReq.BORE },
286-
{ 888, 25, digReq.BORE },
287-
{ 1586, 8, digReq.BORE },
288-
{ 885, 10, digReq.BORE },
289-
{ 866, 3, digReq.BORE },
285+
{ 867, 1, digReq.BORE },
286+
{ 1587, 11, digReq.BORE },
287+
{ 1586, 4, digReq.BORE },
288+
{ 866, 1, digReq.BORE },
290289
{ 4570, 10, digReq.MODIFIER},
291290
{ 4487, 11, digReq.MODIFIER},
292291
{ 4409, 12, digReq.MODIFIER},
@@ -503,15 +502,15 @@ local digInfo =
503502
},
504503
[tpz.zone.WEST_SARUTABARUTA] = -- 115
505504
{
506-
{ 689, 132, digReq.NONE },
507-
{ 938, 79, digReq.NONE },
508-
{17296, 132, digReq.NONE },
509-
{ 847, 100, digReq.NONE },
510-
{ 846, 53, digReq.NONE },
511-
{ 833, 100, digReq.NONE },
512-
{ 841, 53, digReq.NONE },
513-
{ 834, 26, digReq.NONE },
514-
{ 772, 50, digReq.NONE },
505+
{ 689, 205, digReq.NONE },
506+
{17396, 295, digReq.NONE },
507+
{17296, 341, digReq.NONE },
508+
{ 4545, 50, digReq.NONE },
509+
{ 847, 50, digReq.NONE },
510+
{ 846, 68, digReq.NONE },
511+
{ 833, 68, digReq.NONE },
512+
{ 841, 23, digReq.NONE },
513+
{ 834, 50, digReq.NONE },
515514
{ 701, 50, digReq.NONE },
516515
{ 702, 3, digReq.NONE },
517516
{ 4096, 100, digReq.NONE }, -- all crystals
@@ -552,30 +551,29 @@ local digInfo =
552551
},
553552
[tpz.zone.TAHRONGI_CANYON] = -- 117
554553
{
555-
{ 880, 224, digReq.NONE },
556-
{ 887, 39, digReq.NONE },
557-
{ 645, 14, digReq.NONE },
558-
{ 893, 105, digReq.NONE },
559-
{ 737, 17, digReq.NONE },
560-
{ 643, 64, digReq.NONE },
561-
{17296, 122, digReq.NONE },
562-
{ 942, 6, digReq.NONE },
563-
{ 642, 58, digReq.NONE },
564-
{ 864, 22, digReq.NONE },
554+
{ 880, 118, digReq.NONE },
555+
{ 893, 121, digReq.NONE },
556+
{ 748, 5, digReq.NONE },
557+
{ 737, 2, digReq.NONE },
558+
{ 846, 45, digReq.NONE },
559+
{17296, 134, digReq.NONE },
560+
{ 769, 10, digReq.NONE },
561+
{ 888, 175, digReq.NONE },
562+
{ 641, 100, digReq.NONE },
563+
{ 841, 45, digReq.NONE },
565564
{ 843, 4, digReq.NONE },
566565
{ 4096, 100, digReq.NONE }, -- all crystals
567566
{ 1255, 10, digReq.NONE }, -- all ores
568-
{ 656, 95, digReq.BURROW },
569-
{ 749, 26, digReq.BURROW },
570-
{ 751, 33, digReq.BURROW },
571-
{ 750, 89, digReq.BURROW },
572-
{ 902, 6, digReq.BORE },
573-
{ 886, 3, digReq.BORE },
567+
{ 656, 148, digReq.BURROW },
568+
{ 749, 25, digReq.BURROW },
569+
{ 751, 1, digReq.BURROW },
570+
{ 750, 86, digReq.BURROW },
571+
{ 902, 2, digReq.BORE },
572+
{ 886, 1, digReq.BORE },
574573
{ 867, 3, digReq.BORE },
575-
{ 1587, 19, digReq.BORE },
576-
{ 888, 25, digReq.BORE },
577-
{ 1586, 8, digReq.BORE },
578-
{ 885, 10, digReq.BORE },
574+
{ 1587, 8, digReq.BORE },
575+
{ 1586, 2, digReq.BORE },
576+
{ 885, 8, digReq.BORE },
579577
{ 866, 3, digReq.BORE },
580578
{ 4570, 10, digReq.MODIFIER},
581579
{ 4487, 11, digReq.MODIFIER},
@@ -650,31 +648,32 @@ local digInfo =
650648
},
651649
[tpz.zone.SAUROMUGUE_CHAMPAIGN] = -- 120
652650
{
653-
{ 880, 224, digReq.NONE },
654-
{ 887, 39, digReq.NONE },
655-
{ 645, 14, digReq.NONE },
656-
{ 893, 105, digReq.NONE },
651+
{ 845, 8, digReq.NONE },
652+
{ 880, 126, digReq.NONE },
653+
{ 768, 130, digReq.NONE },
654+
{ 748, 55, digReq.NONE },
657655
{ 737, 17, digReq.NONE },
658-
{ 643, 64, digReq.NONE },
659-
{17296, 122, digReq.NONE },
660-
{ 942, 6, digReq.NONE },
656+
{ 846, 91, digReq.NONE },
657+
{ 643, 75, digReq.NONE },
658+
{ 869, 87, digReq.NONE },
661659
{ 642, 58, digReq.NONE },
662-
{ 864, 22, digReq.NONE },
663-
{ 843, 4, digReq.NONE },
660+
{17296, 168, digReq.NONE },
661+
{ 106, 32, digReq.NONE },
662+
{ 773, 50, digReq.NONE },
664663
{ 4096, 100, digReq.NONE }, -- all crystals
665664
{ 1255, 10, digReq.NONE }, -- all ores
666665
{ 656, 95, digReq.BURROW },
667666
{ 749, 26, digReq.BURROW },
668667
{ 751, 33, digReq.BURROW },
669668
{ 750, 89, digReq.BURROW },
670-
{ 902, 6, digReq.BORE },
669+
{ 902, 27, digReq.BORE },
671670
{ 886, 3, digReq.BORE },
672-
{ 867, 3, digReq.BORE },
673-
{ 1587, 19, digReq.BORE },
674-
{ 888, 25, digReq.BORE },
675-
{ 1586, 8, digReq.BORE },
676-
{ 885, 10, digReq.BORE },
677-
{ 866, 3, digReq.BORE },
671+
{ 864, 41, digReq.BORE },
672+
{ 1587, 54, digReq.BORE },
673+
{ 888, 68, digReq.BORE },
674+
{ 1586, 14, digReq.BORE },
675+
{ 885, 14, digReq.BORE },
676+
{ 866, 14, digReq.BORE },
678677
{ 4570, 10, digReq.MODIFIER},
679678
{ 4487, 11, digReq.MODIFIER},
680679
{ 4409, 12, digReq.MODIFIER},

‎scripts/globals/conquest.lua‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,25 @@ end
6060

6161
local outposts =
6262
{
63-
[tpz.region.RONFAURE] = {zone = 100, ki = tpz.ki.RONFAURE_SUPPLIES, cp = 10, lvl = 10, fee = 100},
64-
[tpz.region.ZULKHEIM] = {zone = 103, ki = tpz.ki.ZULKHEIM_SUPPLIES, cp = 30, lvl = 10, fee = 100},
65-
[tpz.region.NORVALLEN] = {zone = 104, ki = tpz.ki.NORVALLEN_SUPPLIES, cp = 40, lvl = 15, fee = 150},
66-
[tpz.region.GUSTABERG] = {zone = 106, ki = tpz.ki.GUSTABERG_SUPPLIES, cp = 10, lvl = 10, fee = 100},
67-
[tpz.region.DERFLAND] = {zone = 109, ki = tpz.ki.DERFLAND_SUPPLIES, cp = 40, lvl = 15, fee = 150},
68-
[tpz.region.SARUTABARUTA] = {zone = 115, ki = tpz.ki.SARUTABARUTA_SUPPLIES, cp = 10, lvl = 10, fee = 100},
69-
[tpz.region.KOLSHUSHU] = {zone = 118, ki = tpz.ki.KOLSHUSHU_SUPPLIES, cp = 40, lvl = 10, fee = 100},
70-
[tpz.region.ARAGONEU] = {zone = 119, ki = tpz.ki.ARAGONEU_SUPPLIES, cp = 40, lvl = 15, fee = 150},
71-
[tpz.region.FAUREGANDI] = {zone = 111, ki = tpz.ki.FAUREGANDI_SUPPLIES, cp = 70, lvl = 35, fee = 350},
72-
[tpz.region.VALDEAUNIA] = {zone = 112, ki = tpz.ki.VALDEAUNIA_SUPPLIES, cp = 50, lvl = 40, fee = 400},
73-
[tpz.region.QUFIMISLAND] = {zone = 126, ki = tpz.ki.QUFIM_SUPPLIES, cp = 60, lvl = 15, fee = 150},
74-
[tpz.region.LITELOR] = {zone = 121, ki = tpz.ki.LITELOR_SUPPLIES, cp = 40, lvl = 25, fee = 250},
75-
[tpz.region.KUZOTZ] = {zone = 114, ki = tpz.ki.KUZOTZ_SUPPLIES, cp = 70, lvl = 30, fee = 300},
76-
[tpz.region.VOLLBOW] = {zone = 113, ki = tpz.ki.VOLLBOW_SUPPLIES, cp = 70, lvl = 50, fee = 500},
77-
[tpz.region.ELSHIMOLOWLANDS] = {zone = 123, ki = tpz.ki.ELSHIMO_LOWLANDS_SUPPLIES, cp = 70, lvl = 25, fee = 250},
78-
[tpz.region.ELSHIMOUPLANDS] = {zone = 124, ki = tpz.ki.ELSHIMO_UPLANDS_SUPPLIES, cp = 70, lvl = 35, fee = 350},
79-
[tpz.region.TULIA] = {zone = 130, cp = 0, lvl = 70, fee = 500},
80-
[tpz.region.MOVALPOLOS] = {zone = 11, cp = 40, lvl = 25, fee = 250},
81-
[tpz.region.TAVNAZIANARCH] = {zone = 24, ki = tpz.ki.TAVNAZIAN_ARCHIPELAGO_SUPPLIES, cp = 70, lvl = 30, fee = 300},
63+
[tpz.region.RONFAURE] = {zone = 100, ki = tpz.ki.RONFAURE_SUPPLIES, lvl = 10, fee = 100},
64+
[tpz.region.ZULKHEIM] = {zone = 103, ki = tpz.ki.ZULKHEIM_SUPPLIES, lvl = 10, fee = 100},
65+
[tpz.region.NORVALLEN] = {zone = 104, ki = tpz.ki.NORVALLEN_SUPPLIES, lvl = 15, fee = 150},
66+
[tpz.region.GUSTABERG] = {zone = 106, ki = tpz.ki.GUSTABERG_SUPPLIES, lvl = 10, fee = 100},
67+
[tpz.region.DERFLAND] = {zone = 109, ki = tpz.ki.DERFLAND_SUPPLIES, lvl = 15, fee = 150},
68+
[tpz.region.SARUTABARUTA] = {zone = 115, ki = tpz.ki.SARUTABARUTA_SUPPLIES, lvl = 10, fee = 100},
69+
[tpz.region.KOLSHUSHU] = {zone = 118, ki = tpz.ki.KOLSHUSHU_SUPPLIES, lvl = 10, fee = 100},
70+
[tpz.region.ARAGONEU] = {zone = 119, ki = tpz.ki.ARAGONEU_SUPPLIES, lvl = 15, fee = 150},
71+
[tpz.region.FAUREGANDI] = {zone = 111, ki = tpz.ki.FAUREGANDI_SUPPLIES, lvl = 35, fee = 350},
72+
[tpz.region.VALDEAUNIA] = {zone = 112, ki = tpz.ki.VALDEAUNIA_SUPPLIES, lvl = 40, fee = 400},
73+
[tpz.region.QUFIMISLAND] = {zone = 126, ki = tpz.ki.QUFIM_SUPPLIES, lvl = 15, fee = 150},
74+
[tpz.region.LITELOR] = {zone = 121, ki = tpz.ki.LITELOR_SUPPLIES, lvl = 25, fee = 250},
75+
[tpz.region.KUZOTZ] = {zone = 114, ki = tpz.ki.KUZOTZ_SUPPLIES, lvl = 30, fee = 300},
76+
[tpz.region.VOLLBOW] = {zone = 113, ki = tpz.ki.VOLLBOW_SUPPLIES, lvl = 50, fee = 500},
77+
[tpz.region.ELSHIMOLOWLANDS] = {zone = 123, ki = tpz.ki.ELSHIMO_LOWLANDS_SUPPLIES, lvl = 25, fee = 250},
78+
[tpz.region.ELSHIMOUPLANDS] = {zone = 124, ki = tpz.ki.ELSHIMO_UPLANDS_SUPPLIES, lvl = 35, fee = 350},
79+
[tpz.region.TULIA] = {zone = 130, lvl = 70, fee = 500},
80+
[tpz.region.MOVALPOLOS] = {zone = 11, lvl = 25, fee = 250},
81+
[tpz.region.TAVNAZIANARCH] = {zone = 24, ki = tpz.ki.TAVNAZIAN_ARCHIPELAGO_SUPPLIES, lvl = 30, fee = 300},
8282
}
8383

8484
local function hasOutpost(player, region)
@@ -1234,7 +1234,9 @@ tpz.conquest.teleporterOnEventUpdate = function(player, csid, option, teleporter
12341234
if csid == teleporterEvent then
12351235
local region = option - 1073741829
12361236
local fee = tpz.conquest.outpostFee(player, region)
1237-
player:updateEvent(player:getGil(), fee, 0, fee, player:getCP())
1237+
local cpFee = fee/10
1238+
1239+
player:updateEvent(player:getGil(), fee, 0, cpFee, player:getCP())
12381240
end
12391241
end
12401242

@@ -1252,10 +1254,10 @@ tpz.conquest.teleporterOnEventFinish = function(player, csid, option, teleporter
12521254
-- TELEPORT WITH CP
12531255
elseif option >= 1029 and option <= 1047 then
12541256
local region = option - 1029
1255-
local fee = tpz.conquest.outpostFee(player, region)
1257+
local cpFee = tpz.conquest.outpostFee(player, region)/10
12561258

1257-
if tpz.conquest.canTeleportToOutpost(player, region) and player:getCP() >= fee then
1258-
player:delCP(fee)
1259+
if tpz.conquest.canTeleportToOutpost(player, region) and player:getCP() >= cpFee then
1260+
player:delCP(cpFee)
12591261
player:addStatusEffectEx(tpz.effect.TELEPORT, 0, tpz.teleport.id.OUTPOST, 0, 1, 0, region)
12601262
end
12611263
end

0 commit comments

Comments
 (0)