Merge pull request #6069 from Cryptexx/Conquest

Fix Issue #6068 - Allow Multiple Supply Runs
DarkstarProject · Jun 9, 2019 · 253a4ef · 253a4ef
2 parents add11a0 + 086fba1
commit 253a4ef
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/scripts/globals/conquest.lua b/scripts/globals/conquest.lua
@@ -1092,17 +1092,19 @@ dsp.conquest.overseerOnEventFinish = function(player, csid, option, guardNation,
         sRegion == guardRegion and
         sOutpost ~= nil and
         player:hasKeyItem(sOutpost.ki) and
-        guardNation == pNation and
-        not hasOutpost(player, sRegion)
+        guardNation == pNation
     then
         player:delKeyItem(sOutpost.ki)
         player:addCP(sOutpost.cp)
         player:messageSpecial(mOffset) -- "You've earned conquest points!"
-        player:addNationTeleport(guardNation, math.pow(2, sRegion + 5))
         player:setVar("supplyQuest_started", 0)
         player:setVar("supplyQuest_region", 0)
         player:setVar("supplyQuest_fresh", 0)
 
+        if not hasOutpost(player, sRegion) then
+            player:addNationTeleport(guardNation, math.pow(2, sRegion + 5))
+        end
+
     -- SET HOMEPOINT
     elseif option == 4 then
         if player:delGil(setHomepointFee(player, guardNation)) then