Skip to content

Commit

Permalink
Merge pull request LandSandBoat#4547 from TeoTwawki/base
Browse files Browse the repository at this point in the history
correct settings paths in comments
  • Loading branch information
claywar authored Sep 25, 2023
2 parents 2f031e8 + e04469c commit 5635aea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/globals/regimes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ xi.regime.checkRegime = function(player, mob, regimeId, index, regimeType)
return
end

-- people in alliance get no fields credit unless FOV_REWARD_ALLIANCE is 1 in scripts/globals/settings.lua
-- people in alliance get no fields credit unless FOV_REWARD_ALLIANCE is 1 in settings/main.lua
if
xi.settings.main.FOV_REWARD_ALLIANCE ~= 1 and
regimeType == xi.regime.type.FIELDS and
Expand All @@ -1389,7 +1389,7 @@ xi.regime.checkRegime = function(player, mob, regimeId, index, regimeType)
return
end

-- people in alliance get no grounds credit unless GOV_REWARD_ALLIANCE is 1 in scripts/globals/settings.lua
-- people in alliance get no grounds credit unless GOV_REWARD_ALLIANCE is 1 in settings/main.lua
if
xi.settings.main.GOV_REWARD_ALLIANCE ~= 1 and
regimeType == xi.regime.type.GROUNDS and
Expand Down
2 changes: 1 addition & 1 deletion scripts/missions/cop/1_1_The_Rites_of_Life.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- Promathia 1-1
-----------------------------------
-- NOTE: xi.mission.id.cop.THE_RITES_OF_LIFE is set when zoning into Lower Delkfutt's Tower from Qufim
-- ENABLE_COP must be set to 1 in scripts/globals/settings.lua
-- ENABLE_COP must be set to 1 in settings/main.lua
-- 1. Enter Lower Delkfutt: !pos -286 -20 320 126
-- 2. Enter Upper Jeuno: !pos 2.2 -3.2 58.4 245
-- 3. Talk to Monberaux: !pos -43 0 -1 244
Expand Down

0 comments on commit 5635aea

Please sign in to comment.