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

Commit 5fe409a

Browse files
authored
Merge pull request #1020 from tankfest/outpost-extortion-fix
Fixes outpost teleport conquest point cost to be retail accurate
2 parents b9780f1 + a6ffc6a commit 5fe409a

File tree

1 file changed

+25
-23
lines changed

1 file changed

+25
-23
lines changed

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)